Changeset 15343 for extensions/AMetaData/amd_ajax.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_ajax.php (modified) (4 diffs)

extensions/AMetaData/amd_ajax.php

@@ -455 +455 @@
       {
         // get a randomly picture...
-        $sql="SELECT pai.imageId, pi.path, pi.has_high
+        $sql="SELECT pai.imageId, pi.path
               FROM ".$this->tables['images']." pai
                 LEFT JOIN ".IMAGES_TABLE." pi ON pai.imageId=pi.id
@@ -475 +475 @@
         {
           $imageId=$row['imageId'];
-          if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y')
-          {
-            $filename=$path."/".dirname($row['path'])."/pwg_high/".basename($row['path']);
-          }
-          else
-          {
-            $filename=$path."/".$row['path'];
-          }
+          $filename=$path."/".$row['path'];
         }
 
@@ -609 +602 @@
         $path=dirname(dirname(dirname(__FILE__)));
 
-        $sql="SELECT id, path, has_high FROM ".IMAGES_TABLE." WHERE id IN (".implode(", ", $list).")";
+        $sql="SELECT id, path FROM ".IMAGES_TABLE." WHERE id IN (".implode(", ", $list).")";
         $result=pwg_query($sql);
         if($result)
@@ -627 +620 @@
             //$mem1=memory_get_usage();
             //echo "memory before analyze:".$mem1."\n";
-            if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y')
-            {
-              $returned.=$this->analyzeImageFile($path."/".dirname($row['path'])."/pwg_high/".basename($row['path']), $row['id']);
-            }
-            else
-            {
-              $returned.=$this->analyzeImageFile($path."/".$row['path'], $row['id']);
-            }
+            $returned.=$this->analyzeImageFile($path."/".$row['path'], $row['id']);
             //echo $returned."\n";
             //$mem2=memory_get_usage();