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

Timestamp:

May 27, 2012, 1:31:32 PM (12 years ago)

Author:

grum

Message:

feature:2637 - Compatibility with Piwigo 2.4

File:

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

extensions/AMetaData/amd_root.class.inc.php

@@ -86 +86 @@
       'amd_FillDataBaseContinuously' => "y",
       'amd_FillDataBaseIgnoreSchemas' => array(),
-      'amd_UseMetaFromHD' => "y",
       'amd_InterfaceMode' => "advanced",    // 'advanced' or 'basic'
 
@@ -182 +181 @@
   public function doRandomAnalyze()
   {
-    $sql="SELECT tai.imageId, ti.path, ti.has_high FROM ".$this->tables['images']." tai
+    $sql="SELECT tai.imageId, ti.path FROM ".$this->tables['images']." tai
             LEFT JOIN ".IMAGES_TABLE." ti ON tai.imageId = ti.id
           WHERE tai.analyzed = 'n'
@@ -194 +193 @@
       while($row=pwg_db_fetch_assoc($result))
       {
-        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']);
-        }
+        $this->analyzeImageFile($path."/".$row['path'], $row['imageId']);
       }