issue79, fixed a little bug introduced by arun's patches for showing only certain...

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 82722529e89790adf21ad110a5736b76f93c6d90..a2ef4661e8f60dcc0129df8e11f0a06d675b4416 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -76,6 +76,9 @@ class PHPFSPOT {
       require_once "phpfspot_tmpl.php";
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
+      /* check if all necessary indices exist */
+      $this->checkDbIndices();
+
       $this->get_tags();
 
       session_start();
@@ -199,7 +202,7 @@ class PHPFSPOT {
       if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
          $query_str="
             SELECT
-               DISTINCT t1.id,t1.name
+               DISTINCT t1.id as id, t1.name as name
             FROM  
                photo_tags pt1
             INNER JOIN photo_tags
@@ -209,11 +212,10 @@ class PHPFSPOT {
             INNER JOIN tags t2
                ON t2.id=pt2.tag_id
             WHERE
-               t2.name IN  ('
-                  ".implode("','",$this->cfg->show_tags)."
-               ')
+               t2.name IN  ('".implode("','",$this->cfg->show_tags)."')
             ORDER BY
                t1.sort_priority ASC";
+
          $result = $this->db->db_query($query_str);
       }
       else
@@ -672,19 +674,23 @@ class PHPFSPOT {
       /* return a search result */
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
          $query_str = "
-            SELECT DISTINCT photo_id
-               FROM photo_tags pt
+            SELECT DISTINCT pt1.photo_id
+               FROM photo_tags pt1
+            INNER JOIN photo_tags pt2
+               ON pt1.photo_id=pt2.photo_id
+            INNER JOIN tags t1
+               ON pt1.tag_id=t1.id
             INNER JOIN photos p
-               ON p.id=pt.photo_id
-            INNER JOIN tags t
-               ON pt.tag_id=t.id
-            WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'";
+               ON pt1.photo_id=p.id
+            INNER JOIN tags t2
+               ON pt2.tag_id=t2.id
+            WHERE t1.name LIKE '%". $_SESSION['searchfor'] ."%' ";
 
          if(isset($additional_where_cond))
             $query_str.= "AND ". $additional_where_cond ." ";
 
          if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
-            $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags)."')";
+            $query_str.= "AND t2.name IN ('".implode("','",$this->cfg->show_tags)."')";
          }
          
          if(isset($order_str))
@@ -704,15 +710,18 @@ class PHPFSPOT {
             $selected.= $tag .",";
          $selected = substr($selected, 0, strlen($selected)-1);
 
+         /* photo has to match at least on of the selected tags */
          if($_SESSION['tag_condition'] == 'or') {
             $query_str = "
-               SELECT DISTINCT pt.photo_id
-                  FROM photo_tags pt
-               INNER JOIN photos p
-                  ON p.id=pt.photo_id
+               SELECT DISTINCT pt1.photo_id
+                  FROM photo_tags pt1
+               INNER JOIN photo_tags pt2
+                  ON pt1.photo_id=pt2.photo_id
                INNER JOIN tags t
-                  ON pt.tag_id=t.id
-               WHERE pt.tag_id IN (". $selected .")
+                  ON pt2.tag_id=t.id
+               INNER JOIN photos p
+                  ON pt1.photo_id=p.id
+               WHERE pt1.tag_id IN (". $selected .")
             ";
             if(isset($additional_where_cond)) 
                $query_str.= "AND ". $additional_where_cond ." ";
@@ -724,6 +733,7 @@ class PHPFSPOT {
             if(isset($order_str))
                $query_str.= $order_str;
          }
+         /* photo has to match all selected tags */
          elseif($_SESSION['tag_condition'] == 'and') {
 
             if(count($_SESSION['selected_tags']) >= 32) {
@@ -2064,6 +2074,26 @@ class PHPFSPOT {
 
    } // check_readable()
 
+   /**
+    * check if all needed indices are present
+    *
+    * this function checks, if some needed indices are already
+    * present, or if not, create them on the fly. they are
+    * necessary to speed up some queries like that one look for
+    * all tags, when show_tags is specified in the configuration.
+    */
+   private function checkDbIndices()
+   {
+      $result = $this->db->db_exec("
+         CREATE INDEX IF NOT EXISTS
+            phototag
+         ON
+            photo_tags
+               (photo_id, tag_id)
+      ");
+
+   } // checkDbIndices()
+
 }
 
 ?>