issue82, read out F-Spot DB version to differ between different databases schemas

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 11b16fdb8604ebd24778666d628a3dfaf547f33d..6d357e5ad155902320f42b722de050868df2a744 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -32,6 +32,7 @@ class PHPFSPOT {
    var $tmpl;
    var $tags;
    var $avail_tags;
+   private $dbver;
 
    /**
     * class constructor
@@ -54,7 +55,13 @@ class PHPFSPOT {
       }
 
       $this->db  = new PHPFSPOT_DB($this, $this->cfg->fspot_db);
-      
+      if(!is_writeable($this->cfg->fspot_db)) {
+         print $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() ."\n";
+         exit(1);
+      }
+
+      $this->dbver = $this->getFspotDBVersion();
+
       if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
          print dirname($this->cfg->phpfspot_db) .": directory is not writeable!";
          exit(1);
@@ -79,8 +86,6 @@ class PHPFSPOT {
       /* check if all necessary indices exist */
       $this->checkDbIndices();
 
-      $this->get_tags();
-
       session_start();
 
       if(!isset($_SESSION['tag_condition']))
@@ -475,6 +480,8 @@ class PHPFSPOT {
     */
    public function getAvailableTags()
    {
+      $this->get_tags();
+
       $output = "";
 
       $result = $this->db->db_query("
@@ -544,6 +551,8 @@ class PHPFSPOT {
     */
    public function getSelectedTags()
    {
+      $this->get_tags();
+
       $output = "";
       foreach($this->avail_tags as $tag)
       {
@@ -674,19 +683,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))
@@ -706,15 +719,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 ." ";
@@ -726,6 +742,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) {
@@ -1037,6 +1054,7 @@ class PHPFSPOT {
    {
       $this->tmpl->assign('version', $this->cfg->version);
       $this->tmpl->assign('product', $this->cfg->product);
+      $this->tmpl->assign('db_version', $this->dbver);
       $this->tmpl->show("credits.tpl");
 
    } // showCredits()
@@ -1347,6 +1365,8 @@ class PHPFSPOT {
     */
    public function startSearch($searchfor, $sort_order, $from = 0, $to = 0)
    {
+      $this->get_tags();
+
       $_SESSION['searchfor'] = $searchfor;
       $_SESSION['sort_order'] = $sort_order;
       if($from != 0)
@@ -2086,6 +2106,26 @@ class PHPFSPOT {
 
    } // checkDbIndices()
 
-}
+   /**
+    * retrive F-Spot database version
+    *
+    * this function will return the F-Spot database version number
+    * It is stored within the sqlite3 database in the table meta
+    */
+   public function getFspotDBVersion()
+   {
+      if($result = $this->db->db_fetchSingleRow("
+         SELECT data as version
+         FROM meta
+         WHERE
+            name LIKE 'F-Spot Database Version'
+      "))
+         return $result['version'];
+
+      return null;
+
+   } // getFspotDBVersion()
+
+} // class PHPFSPOT
 
 ?>