Changeset 6920 for extensions/AMetaData

Timestamp:

Sep 14, 2010, 7:46:58 PM (14 years ago)

Author:

grum

Message:

Using metadata on HD picture (fix bug and forgotten files), release 0.5.1
bug:1846

Location:

extensions/AMetaData

Files:

• amd_aip_install.class.inc.php (modified) (1 diff)
• amd_ajax.php (modified) (2 diffs)
• amd_pip.class.inc.php (modified) (2 diffs)
• amd_root.class.inc.php (modified) (1 diff)

extensions/AMetaData/amd_aip_install.class.inc.php

@@ -381 +381 @@
       foreach($listToAnalyze[0] as $val)
       {
-        if($val['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
+        if($val['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y')
         {
           $this->analyzeImageFile($path."/".dirname($val['path'])."/pwg_high/".basename($val['path']), $val['id']);

extensions/AMetaData/amd_ajax.php

@@ -441 +441 @@
         {
           $imageId=$row['imageId'];
-          if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
+          if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y')
           {
             $filename=$path."/".dirname($row['path'])."/pwg_high/".basename($row['path']);
@@ -586 +586 @@
             //$mem1=memory_get_usage();
             //echo "memory before analyze:".$mem1."\n";
-            if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
+            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']);

extensions/AMetaData/amd_pip.class.inc.php

@@ -67 +67 @@
     $this->pictureProperties['id']=$page['image_id'];
 
-    $sql="SELECT ti.path, tai.analyzed FROM ".IMAGES_TABLE." ti
+    $sql="SELECT ti.path, tai.analyzed, ti.has_high 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);
+      }
+    }
+
+
 
     $this->jpegMD->load(

extensions/AMetaData/amd_root.class.inc.php

@@ -193 +193 @@
       while($row=pwg_db_fetch_assoc($result))
       {
-        if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
+        if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y')
         {
           $this->analyzeImageFile($path."/".dirname($row['path'])."/pwg_high/".basename($row['path']), $row['imageId']);