renamed search to tagsearch

issue16, matching tags are now placed into the selected-tags list

git-svn-id: file:///var/lib/svn/phpfspot/trunk@127 fa6a889d-dae6-447d-9e79-4ba9a3039384

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 6800da209794bd315979ec3f6926533491b4debb..0a59d96c6eb804fc29fce69bc27a486815b00ddb 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -679,11 +679,17 @@ class PHPFSPOT {
 
    } // setTagCondition()
 
 
    } // setTagCondition()
 

-   public function startSearch($searchfor)
+   public function startTagSearch($searchfor)

    {
       $_SESSION['searchfor'] = $searchfor;
    {
       $_SESSION['searchfor'] = $searchfor;

+      $_SESSION['selected_tags'] = Array();

 
 

-   } // startSearch()
+      foreach($this->avail_tags as $tag) {
+         if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+            array_push($_SESSION['selected_tags'], $tag);
+      }
+
+   } // startTagSearch()

 
    private function rotateImage($img, $degrees)
    {
 
    private function rotateImage($img, $degrees)
    {

diff --git a/phpfspot.js b/phpfspot.js
index fcc5766a2506f9b304bfb86c8d8d588bc4d9f06e..92c08b7ecd02e5ce9d820118b984357a54eb41fb 100644 (file)
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -95,9 +95,11 @@ function setCheckedValue(condition, value) {
    }
 }
 
    }
 }
 

-function startSearch(searchfor)
+function startTagSearch(searchfor)

 {
 {

-   HTML_AJAX.grab(encodeURI('rpc.php?action=search&for=' + searchfor));
+   HTML_AJAX.grab(encodeURI('rpc.php?action=tag_search&for=' + searchfor));
+   refreshAvailableTags();
+   refreshSelectedTags();

    showPhotoIndex();
 
 }
    showPhotoIndex();
 
 }

diff --git a/rpc.php b/rpc.php
index 6775647ca6acd84a1b8564bee1c204051ac39e3c..b5d5d357f162aa50568d05a84d4bc550077f5cee 100644 (file)
--- a/rpc.php
+++ b/rpc.php
@@ -94,9 +94,9 @@ class PHPFSPOT_RPC {
             $fspot->showCredits();
             break;
 
             $fspot->showCredits();
             break;
 

-         case 'search':
+         case 'tag_search':

 
 

-            $fspot->startSearch($_GET['for']);
+            $fspot->startTagSearch($_GET['for']);

             break;
 
       }
             break;
 
       }

diff --git a/templates/tags.tpl b/templates/tags.tpl
index 20d5c9be730edc3859c7c15eda18ba9c816ddb0e..3efcc31813de483e13f63d50a7f2330847f9db10 100644 (file)
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -6,7 +6,7 @@
  </tr>
  <tr>
   <td class="searchfor">
  </tr>
  <tr>
   <td class="searchfor">

-   <form action="" onsubmit="startSearch(document.getElementsByName('searchfor')[0].value); return false;">
+   <form action="" onsubmit="startTagSearch(document.getElementsByName('searchfor')[0].value); return false;">

     <input type="text" name="searchfor" value="{$searchfor}" size="15" />
     <input type="image" src="resources/doit.png" alt="Tag-Search" />
    </form>
     <input type="text" name="searchfor" value="{$searchfor}" size="15" />
     <input type="image" src="resources/doit.png" alt="Tag-Search" />
    </form>