Changeset 6891 for extensions/AMetaData/amd_install.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_install.class.inc.php (modified) (6 diffs)

extensions/AMetaData/amd_install.class.inc.php

@@ -19 +19 @@
  */
 
-  @include_once('amd_root.class.inc.php');
+  include_once('amd_root.class.inc.php');
   include_once(PHPWG_PLUGINS_PATH.'grum_plugins_classes-2/tables.class.inc.php');
 
@@ -66 +66 @@
   `imageId` mediumint(8) unsigned NOT NULL default '0',
   `numId` int(10) unsigned NOT NULL default '0',
-  `value` text default NULL,
-  PRIMARY KEY  USING BTREE (`imageId`,`numId`)
+  `value` text,
+  `numValue` decimal(10,8) default NULL,
+  PRIMARY KEY  USING BTREE (`imageId`,`numId`),
+  KEY `byNumId` (`numId`,`value`(35)),
+  KEY `byNumId2` (`numId`,`numValue`)
 );",
 "CREATE TABLE `".$this->tables['images']."` (
@@ -194 +197 @@
     {
       /*
-       * create new tables
+       * create new tables & alter existing tables
        */
       $tableDef=array(
@@ -215 +218 @@
   KEY `byTagParentId` USING BTREE (`numId`,`parentId`,`order`),
   KEY `byTagOrder` (`numId`,`order`)
-);"
+);",
+"ALTER TABLE `".$this->tables['images_tags']."`
+  ADD COLUMN `numValue` DECIMAL(10,8)  DEFAULT NULL AFTER `value`,
+  ADD INDEX `byNumId`(`numId`, `value`(35)),
+  ADD INDEX `byNumId2`(`numId`, `numValue`)
+;"
       );
       $tablesDef = create_table_add_character_set($tablesDef);
@@ -305 +313 @@
           $excludeList="";
         }
-        $sql="SELECT ti.id, ti.path
+        $sql="SELECT ti.id, ti.path, ti.has_high
               FROM ".IMAGES_TABLE." ti ".$excludeList."
               ORDER BY RAND() LIMIT ".(25-count($listToAnalyze[0])).";";
@@ -328 +336 @@
         foreach($listToAnalyze[0] as $val)
         {
-          $this->analyzeImageFile($path."/".$val['path'], $val['id']);
+          if($val['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
+          {
+            $this->analyzeImageFile($path."/".dirname($val['path'])."/pwg_high/".basename($val['path']), $val['id']);
+          }
+          else
+          {
+            $this->analyzeImageFile($path."/".$val['path'], $val['id']);
+          }
+
         }