From 920f7fc623ecad4f1338ab68326f2817c12c4610 Mon Sep 17 00:00:00 2001
From: Mark Pemberton <mpemberton5@gmail.com>
Date: Tue, 17 May 2011 00:24:43 -0400
Subject: Updated PrivateKey to include Tag searches

---
 src/SemanticScuttle/Service/Bookmark.php     | 37 ++++++++++++++++++----------
 src/SemanticScuttle/Service/Bookmark2Tag.php |  2 +-
 src/SemanticScuttle/Service/Tag.php          |  4 +--
 3 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
index 9a075be..232f9d0 100644
--- a/src/SemanticScuttle/Service/Bookmark.php
+++ b/src/SemanticScuttle/Service/Bookmark.php
@@ -821,23 +821,34 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
 
         // Handle the parts of the query that depend on any tags that are present.
         $query_4 = '';
-        for ($i = 0; $i < $tagcount; $i ++) {
-            $query_2 .= ', '. $b2tservice->getTableName() .' AS T'. $i;
+        if ($tagcount > 0) {
+            $query_2 .= ', '. $b2tservice->getTableName() .' AS T0';
             $query_4 .= ' AND (';
+            
+            $tagArray = array();
+            for ($i = 0; $i < $tagcount; $i ++) {
+                $tmpTag = $this->db->sql_escape($tags[$i]);
+                $allLinkedTags = $tag2tagservice->getAllLinkedTags(
+                    $tmpTag, '>', $user
+                );
 
-            $allLinkedTags = $tag2tagservice->getAllLinkedTags(
-                $this->db->sql_escape($tags[$i]), '>', $user
-            );
+                while (is_array($allLinkedTags) && count($allLinkedTags)>0) {
+                    $tmpValue = array_pop($allLinkedTags);
+                    if (in_array($tmpValue, $tagArray) == false) {
+                        $tagArray[] = $tmpValue;
+                    }
+                }
 
-            while (is_array($allLinkedTags) && count($allLinkedTags)>0) {
-                $query_4 .= ' T'. $i .'.tag = "'. array_pop($allLinkedTags) .'"';
-                $query_4 .= ' OR';
+                if (in_array($tmpTag, $tagArray) == false) {
+                    $tagArray[] = $tmpTag;
+                }
             }
-
-            $query_4 .= ' T'. $i .'.tag = "'. $this->db->sql_escape($tags[$i]) .'"';
-
-            $query_4 .= ') AND T'. $i .'.bId = B.bId';
-            //die($query_4);
+            // loop through array of possible tags
+            foreach ($tagArray as $k => $v) {
+                $query_4 .= ' T0.tag = "'. $v .'" OR';
+            }
+            $query_4 = substr($query_4,0,-3);
+            $query_4 .= ') AND T0.bId = B.bId';
         }
 
         // Search terms
diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php
index a10cb61..fc59a1c 100644
--- a/src/SemanticScuttle/Service/Bookmark2Tag.php
+++ b/src/SemanticScuttle/Service/Bookmark2Tag.php
@@ -99,7 +99,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
         $tags_count = is_array($tags)?count($tags):0;
 
         for ($i = 0; $i < $tags_count; $i++) {
-            $tags[$i] = trim(strtolower($tags[$i]));
+            $tags[$i] = trim(utf8_strtolower($tags[$i]));
             if ($fromApi) {
                 include_once 'SemanticScuttle/functions.php';
                 $tags[$i] = convertTag($tags[$i], 'in');
diff --git a/src/SemanticScuttle/Service/Tag.php b/src/SemanticScuttle/Service/Tag.php
index 25d3888..8325285 100644
--- a/src/SemanticScuttle/Service/Tag.php
+++ b/src/SemanticScuttle/Service/Tag.php
@@ -141,10 +141,10 @@ class SemanticScuttle_Service_Tag extends SemanticScuttle_DbService
 
         //normalize
         if(!is_array($tags)) {
-            $tags = strtolower(trim($tags));
+            $tags = utf8_strtolower(trim($tags));
         } else {
             for($i=0; $i<count($tags); $i++) {
-                $tags[$i] = strtolower(trim($tags[$i]));
+                $tags[$i] = utf8_strtolower(trim($tags[$i]));
             }
         }
         return $tags;
-- 
cgit v1.2.3