Changeset 5183 for extensions/AMetaData/amd_aip.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_aip.class.inc.php (modified) (5 diffs)

extensions/AMetaData/amd_aip.class.inc.php

@@ -33 +33 @@
   protected $tabsheet;
   protected $ajax;
-  protected $jpegMD;
 
   /**
@@ -42 +41 @@
    * @param String $filelocation
    */
-  function __construct($prefixeTable, $filelocation)
+  public function __construct($prefixeTable, $filelocation)
   {
     parent::__construct($prefixeTable, $filelocation);
@@ -57 +56 @@
                           $this->page_link.'&fAMD_tabsheet=help');
     $this->ajax = new Ajax();
-    $this->jpegMD=new JpegMetaData();
-  }
-
-  function __destruct()
+  }
+
+  public function __destruct()
   {
     unset($this->tabsheet);
     unset($this->ajax);
-    unset($this->jpegMD);
+    parent::__destruct();
   }
 
@@ -681 +679 @@
 
 
-  /**
-   * this function analyze tags from a picture, and insert the result into the
-   * database
-   *
-   * NOTE : only implemented tags are analyzed and stored
-   *
-   * @param String $fileName : filename of picture to analyze
-   * @param Integer $imageId : id of image in piwigo's database
-   */
-  protected function analyzeImageFile($fileName, $imageId)
-  {
-    /*
-     * the JpegMetaData object is instancied in the constructor
-     */
-    $this->jpegMD->load($fileName, Array(
-      'filter' => JpegMetaData::TAGFILTER_IMPLEMENTED,
-      'optimizeIptcDateTime' => true)
-    );
-
-    $sqlInsert="";
-    $massInsert=array();
-    $nbTags=0;
-    foreach($this->jpegMD->getTags() as $key => $val)
-    {
-      $value=$val->getLabel();
-
-      if($val->isTranslatable())
-        $translatable="y";
-      else
-        $translatable="n";
-
-      if($value instanceof DateTime)
-      {
-        $value=$value->format("Y-m-d H:i:s");
-      }
-      elseif(is_array($value))
-      {
-        /*
-         * array values are stored in a serialized string
-         */
-        $value=serialize($value);
-      }
-
-      $sql="SELECT numId FROM ".$this->tables['used_tags']." WHERE tagId = '$key'";
-      $result=pwg_query($sql);
-      if($result)
-      {
-        $numId=-1;
-        while($row=mysql_fetch_assoc($result))
-        {
-          $numId=$row['numId'];
-        }
-
-        if($numId>0)
-        {
-          $nbTags++;
-          if($sqlInsert!="") $sqlInsert.=", ";
-          $sqlInsert.="($imageId, '$numId', '".addslashes($value)."')";
-          $massInsert[]="('$imageId', '$numId', '".addslashes($value)."') ";
-        }
-      }
-    }
-
-    $sql="REPLACE INTO ".$this->tables['images_tags']." (imageId, numId, value)
-          VALUES ".implode(", ", $massInsert);
-    pwg_query($sql);
-    //mass_inserts($this->tables['images_tags'], array('imageId', 'numId', 'value'), $massInsert);
-
-    $sql="UPDATE ".$this->tables['images']."
-            SET analyzed = 'y', nbTags=".$nbTags."
-            WHERE imageId=$imageId;";
-    pwg_query($sql);
-
-
-    return("$imageId=$nbTags;");
-  }
-
-
-  /**
-   * returns the number of pictures analyzed
-   *
-   * @return Integer
-   */
-  protected function getNumOfPictures()
-  {
-    $numOfPictures=0;
-    $sql="SELECT COUNT(imageId) FROM ".$this->tables['images']."
-            WHERE analyzed='y';";
-    $result=pwg_query($sql);
-    if($result)
-    {
-      while($row=mysql_fetch_row($result))
-      {
-        $numOfPictures=$row[0];
-      }
-    }
-    return($numOfPictures);
-  }
 
 
@@ -910 +810 @@
   private function ajax_amd_makeStatsConsolidation()
   {
-    $sql="UPDATE ".$this->tables['used_tags']." ut,
-            (SELECT COUNT(imageId) AS nb, numId
-              FROM ".$this->tables['images_tags']."
-              GROUP BY numId) nb
-          SET ut.numOfImg = nb.nb
-          WHERE ut.numId = nb.numId;";
-    pwg_query($sql);
+    $this->makeStatsConsolidation();
   }