Changeset 5183 for extensions/AMetaData/amd_pip.class.inc.php

Timestamp:

Mar 18, 2010, 11:47:11 PM (14 years ago)

Author:

grum

Message:

database is partially filled during the install process, and fill database picture per picture each time a page is displayed (and until all the database is filled)

File:

• extensions/AMetaData/amd_pip.class.inc.php (modified) (4 diffs)

extensions/AMetaData/amd_pip.class.inc.php

@@ -64 +64 @@
     $path=dirname(dirname(dirname(__FILE__)));
     $filename="";
+    $analyzed='n';
 
-    $sql="SELECT path FROM ".IMAGES_TABLE." WHERE id=".$page['image_id'].";";
+    $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'].";";
     $result=pwg_query($sql);
     if($result)
@@ -72 +75 @@
       {
         $filename=$row['path'];
+        $analyzed=$row['analyzed'];
       }
       $filename=$path."/".$filename;
     }
 
-    $JpegMD = new JpegMetaData(
+    $this->jpegMD->load(
       $filename,
       Array(
@@ -113 +117 @@
     $group=null;
 
-    $picturesTags=$JpegMD->getTags();
+    $picturesTags=$this->jpegMD->getTags();
 
     foreach($tagsList as $key => $val)
@@ -160 +164 @@
     }
 
-    unset($JpegMD);
+
+    if($analyzed=='n' and
+       $this->my_config['amd_FillDataBaseContinuously']=='y' and
+       $this->my_config['amd_AllPicturesAreAnalyzed']=='n')
+    {
+      /* if picture is not analyzed, do analyze
+       *
+       * note : the $loaded parameter is set to true, in this case the function
+       *        analyzeImageFile uses data from the $this->jpegMD object which
+       *        have data already loaded => the picture is not analyzed twice,
+       *        the function only do the database update
+       */
+      $this->analyzeImageFile($filename, $page['image_id'], true);
+      $this->makeStatsConsolidation();
+    }
 
     $template->assign('metadata', $metadata);