Changeset 15343 for extensions/AMetaData/amd_pip.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_pip.class.inc.php (modified) (4 diffs)

extensions/AMetaData/amd_pip.class.inc.php

@@ -67 +67 @@
     $this->pictureProperties['id']=$page['image_id'];
 
-    $sql="SELECT ti.path, tai.analyzed, ti.has_high FROM ".IMAGES_TABLE." ti
+    $sql="SELECT ti.path, tai.analyzed FROM ".IMAGES_TABLE." ti
             LEFT JOIN ".$this->tables['images']." tai ON tai.imageId = ti.id
           WHERE ti.id=".$page['image_id'].";";
@@ -73 +73 @@
     if($result)
     {
-      $hasHigh='';
       while($row=pwg_db_fetch_assoc($result))
       {
         $filename=$row['path'];
-        $hasHigh=$row['has_high'];
         $this->pictureProperties['analyzed']=$row['analyzed'];
       }
       $filename=$path."/".$filename;
-
-      if($hasHigh==='true' and $this->config['amd_UseMetaFromHD']=='y')
-      {
-        $filename=dirname($filename)."/pwg_high/".basename($filename);
-      }
     }
 
@@ -220 +213 @@
       {
         $group=$tagProperties['gName'];
-        if(!is_null($md))
-        {
-          $metadata[]=$md;
-          unset($md);
-        }
-        $md=Array(
-          'TITLE' => $tagProperties['gName'],
-          'lines' => Array()
-        );
+        if(!isset($metadata[$group]))
+        {
+          $metadata[$group]=Array(
+                              'TITLE' => $tagProperties['gName'],
+                              'lines' => Array()
+                            );
+        }
       }
 
@@ -249 +240 @@
         if($value!="")
         {
-          $md['lines'][L10n::get($picturesTags[$key]->getName())]=AMD_root::prepareValueForDisplay($value, $picturesTags[$key]->isTranslatable());
+          $metadata[$group]['lines'][L10n::get($picturesTags[$key]->getName())]=AMD_root::prepareValueForDisplay($value, $picturesTags[$key]->isTranslatable());
         }
       }
       elseif($userDefined and isset($userDefinedValues[$tagProperties['numId']]) and $userDefinedValues[$tagProperties['numId']]!='')
       {
-        $md['lines'][$tagProperties['name']]=$userDefinedValues[$tagProperties['numId']];
-      }
-    }
-
-    if(!is_null($md) and count($md['lines'])>0)
-    {
-      $metadata[]=$md;
+        $metadata[$group]['lines'][$tagProperties['name']]=$userDefinedValues[$tagProperties['numId']];
+      }
     }