Changeset 7084

Timestamp:

11/26/08 01:46:56 (6 weeks ago)

Author:

creorix

Message:

refs #1146

• 지역로그 추천에서 depth가 고려되지 않은 문제 수정
  
• 지역로그, 태그 추천에서 조회에 raw SQL을 사용하는 문제 수정
  

Location:

trunk

Files:

• interface/blog/locationSuggest.php (modified) (1 diff)
• library/model/blog.locative.php (modified) (1 diff)
• library/model/blog.tag.php (modified) (1 diff)
• resources/script/generaltag.js (modified) (1 diff)
• resources/script/locationtag.js (modified) (3 diffs)

trunk/interface/blog/locationSuggest.php

@@ -24 +24 @@
 $tags = array();
 foreach (suggestLocatives($blogid, $filter) as $tag)
-    echo "<location>" . htmlspecialchars($tag) . "</location>\r\n";
+    echo "<location>" . htmlspecialchars(ltrim($tag, '/')) . "</location>\r\n";
 echo "</response>\r\n";
 ?>

trunk/library/model/blog.locative.php

@@ -11 +11 @@
     global $database;
     $locatives = array();
-    $result = POD::queryAll('SELECT DISTINCT location, COUNT(*) cnt FROM '.$database['prefix'].'Entries WHERE blogid = '.$blogid.' AND '.$filter.' GROUP BY location ORDER BY cnt DESC LIMIT 10');
+    $result = POD::queryAll('SELECT DISTINCT location, COUNT(*) cnt FROM '.$database['prefix'].'Entries WHERE blogid = '.$blogid.' AND location LIKE "'.POD::escapeString($filter).'%" GROUP BY location ORDER BY cnt DESC LIMIT 10');
     if ($result) {
         foreach ($result as $locative) {

trunk/library/model/blog.tag.php

@@ -182 +182 @@
         WHERE t.id = r.tag 
             AND r.blogid = $blogid
-            AND $filter 
+            AND name LIKE \"".POD::escapeString($filter)."%\" 
         GROUP BY tag 
         ORDER BY cnt 

trunk/resources/script/generaltag.js

@@ -380 +380 @@
 
     if(!instance.allowEolinSuggestion || (instance.getInput().value.trim() == "")) {
-        eolinTagFunction_showLocalSuggestion(instance.container.getAttribute("id"), instance.cursor, "name like '" + instance.getInput().value + "%'")
+        eolinTagFunction_showLocalSuggestion(instance.container.getAttribute("id"), instance.cursor, instance.getInput().value)
         return;
     }

trunk/resources/script/locationtag.js

@@ -73 +73 @@
                         }
 
-                        for(var i=0; i<locationItems.length; i++)
-                            locations[locations.length] = locationItems[i].lastChild.nodeValue;
+                        for(var i=0; i<locationItems.length; i++) {
+                            value = locationItems[i].lastChild.nodeValue.split('/');
+                            for (var j = 0; j != -1; j = filter.indexOf('/', j + 1)) {
+                                if (j == 0) {
+                                    continue;
+                                }
+                                value.shift();
+                            }
+                            locations[locations.length] = value.join('/');
+                        }
 
                         // 중복될 항목들을 미리 제거
@@ -81 +89 @@
                             for(var j=0; j<instance.suggestion.childNodes.length; j++)
                             {
-                                if(locations[i] == instance.suggestion.childNodes[j].innerHTML.replace(new RegExp("<\/?strong>", "gi"), ""))
+                                if(locations[i] == instance.suggestion.childNodes[j].innerHTML.replace(new RegExp("<\/?em>", "gi"), ""))
                                 {
                                     instance.suggestion.removeChild(instance.suggestion.childNodes[j]);
@@ -539 +547 @@
 
     if(!instance.allowEolinSuggestion || (instance.input.value.trim() == "")) {
-        eolinLocationFunction_showLocalSuggestion(instance.container.getAttribute("id"), instance.cursor, "location like '/" + instance.input.value + "%'");
+        eolinLocationFunction_showLocalSuggestion(instance.container.getAttribute("id"), instance.cursor, this.getPath());
         return;
     }