Changeset 6891 for extensions/AMetaData/amd_root.class.inc.php

Timestamp:

Sep 13, 2010, 8:40:44 PM (14 years ago)

Author:

grum

Message:

Implement metadata search, release 0.5.1
bug:1846, bug:1691

File:

• extensions/AMetaData/amd_root.class.inc.php (modified) (14 diffs)

extensions/AMetaData/amd_root.class.inc.php

@@ -23 +23 @@
 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php');
 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCCss.class.inc.php');
+include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php');
 
 include_once('amd_jpegmetadata.class.inc.php');
@@ -48 +49 @@
       'groups',
       'user_tags_label',
-      'user_tags_def');
+      'user_tags_def',
+      'tags_values');
     $this->setTablesList($tableList);
 
@@ -66 +68 @@
     //parent::__destruct();
   }
-
 
   /* ---------------------------------------------------------------------------
@@ -85 +86 @@
       'amd_FillDataBaseContinuously' => "y",
       'amd_FillDataBaseIgnoreSchemas' => array(),
+      'amd_UseMetaFromHD' => "y",
 
       // theses options can be set manually
@@ -178 +180 @@
   public function doRandomAnalyze()
   {
-    $sql="SELECT tai.imageId, ti.path FROM ".$this->tables['images']." tai
+    $sql="SELECT tai.imageId, ti.path, ti.has_high FROM ".$this->tables['images']." tai
             LEFT JOIN ".IMAGES_TABLE." ti ON tai.imageId = ti.id
           WHERE tai.analyzed = 'n'
@@ -190 +192 @@
       while($row=pwg_db_fetch_assoc($result))
       {
-        $this->analyzeImageFile($path."/".$row['path'], $row['imageId']);
+        if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
+        {
+          $this->analyzeImageFile($path."/".dirname($row['path'])."/pwg_high/".basename($row['path']), $row['imageId']);
+        }
+        else
+        {
+          $this->analyzeImageFile($path."/".$row['path'], $row['imageId']);
+        }
       }
 
@@ -234 +243 @@
     }
 
-    $sqlInsert="";
+    //$sqlInsert="";
     $massInsert=array();
     $nbTags=0;
@@ -272 +281 @@
         {
           $nbTags++;
-          if($sqlInsert!="") $sqlInsert.=", ";
-          $sqlInsert.="($imageId, '$numId', '".addslashes($value)."')";
+          //if($sqlInsert!="") $sqlInsert.=", ";
+          //$sqlInsert.="($imageId, '$numId', '".addslashes($value)."')";
           $massInsert[]="('$imageId', '$numId', '".addslashes($value)."') ";
         }
@@ -291 +300 @@
     pwg_query($sql);
 
+    unset($massInsert);
 
     return("$imageId=$nbTags;");
@@ -398 +408 @@
             if(!is_null($buildValue['value']))
             {
+              $buildValue['value']=addslashes($buildValue['value']);
               $inserts[]=$buildValue;
               $num++;
@@ -483 +494 @@
               if(isset($values[$rule['value']]) and
                  !preg_match('/'.$rule['conditionValue'].'/i', $values[$rule['value']])) $ok=true;
+              break;
+            case '^%':
+              if(isset($values[$rule['value']]) and
+                 preg_match('/^'.$rule['conditionValue'].'/i', $values[$rule['value']])) $ok=true;
+              break;
+            case '!^%':
+              if(isset($values[$rule['value']]) and
+                 !preg_match('/^'.$rule['conditionValue'].'/i', $values[$rule['value']])) $ok=true;
+              break;
+            case '$%':
+              if(isset($values[$rule['value']]) and
+                 preg_match('/'.$rule['conditionValue'].'$/i', $values[$rule['value']])) $ok=true;
+              break;
+            case '!$%':
+              if(isset($values[$rule['value']]) and
+                 !preg_match('/'.$rule['conditionValue'].'$/i', $values[$rule['value']])) $ok=true;
               break;
           }
@@ -557 +584 @@
   }
 
-
   /**
    * This function :
@@ -569 +595 @@
    * @return String               : the value prepared
    */
-  protected function prepareValueForDisplay($value, $translatable=true, $separator=", ")
+  static public function prepareValueForDisplay($value, $translatable=true, $separator=", ")
   {
     global $user;
@@ -720 +746 @@
   }
 
+
 } // amd_root  class
 
 
 
+Class AMD_functions {
+  /**
+   *  return all HTML&JS code necessary to display a dialogbox to choose
+   *  a metadata
+   */
+  static public function dialogBoxMetadata()
+  {
+    global $template, $prefixeTable;
+
+    $tables=array(
+        'used_tags' => $prefixeTable.'amd_used_tags',
+        'selected_tags' => $prefixeTable.'amd_selected_tags',
+    );
+
+    $template->set_filename('metadata_choose',
+                  dirname(__FILE__).'/templates/amd_dialog_metadata_choose.tpl');
+
+    $datas=array(
+      'urlRequest' => 'plugins/'.basename(dirname(__FILE__)).'/amd_ajax.php',
+      'tagList' => array(),
+    );
+
+    /*
+     * build tagList
+     */
+    $sql="SELECT ut.name, ut.numId, ut.tagId
+          FROM ".$tables['used_tags']." ut
+            JOIN ".$tables['selected_tags']." st ON st.tagId = ut.tagId
+          ORDER BY tagId";
+    $result=pwg_query($sql);
+    if($result)
+    {
+      while($row=pwg_db_fetch_assoc($result))
+      {
+        $datas['tagList'][]=Array(
+          'tagId' => $row['tagId'],
+          'name'  => L10n::get($row['name']),
+          'numId' => $row['numId']
+        );
+      }
+    }
+
+    $template->assign('datas', $datas);
+    unset($data);
+
+    return($template->parse('metadata_choose', true));
+  }
+}
+
+
+
 ?>