Changeset 4915 for extensions/AMetaData/amd_aip.class.inc.php

Timestamp:

Feb 19, 2010, 8:41:01 PM (14 years ago)

Author:

grum

Message:

Unable to analyze the gallery : bug fixed !
and other little bugs fixed

File:

• extensions/AMetaData/amd_aip.class.inc.php (modified) (7 diffs)

extensions/AMetaData/amd_aip.class.inc.php

@@ -149 +149 @@
         case 'makeStatsDoAnalyze':
           $result=$this->ajax_amd_makeStatsDoAnalyze($_REQUEST['imagesList']);
-          break;
-        case 'makeStatsConsolidate':
-          $result=$this->ajax_amd_makeStatsConsolidate($_REQUEST['step']);
           break;
         case 'makeStatsGetStatus':
@@ -477 +474 @@
   /**
    * display and manage the database page
-   */
-  private function displayDatabase()
-  {
-    global $template, $page;
-
-    $template->set_filename('body_page', dirname(__FILE__).'/admin/amd_database.tpl');
-
-    $datas=array(
-      'urlRequest' => $this->page_link,
-      'NumberOfItemsPerRequest' => $this->my_config['amd_NumberOfItemsPerRequest'],
-    );
-
-    $template->assign("datas", $datas);
-
-    $template->assign_var_from_handle('AMD_BODY_PAGE', 'body_page');
-  } // display_config
-
-
-  /**
-   * display and manage the status page on the stat page
    *
    * the function automatically update the AMD tables :
@@ -505 +482 @@
    * @return String : the content of the page
    */
-  protected function displayStatStatus()
-  {
-    $local_tpl = new Template(AMD_PATH."admin/", "");
-    $local_tpl->set_filename('body_page',
-                  dirname($this->filelocation).'/admin/amd_stat_status.tpl');
+  private function displayDatabase()
+  {
+    global $template, $page;
 
     /*
@@ -538 +513 @@
     pwg_query($sql);
 
+
+    $template->set_filename('body_page', dirname(__FILE__).'/admin/amd_database.tpl');
+
     $datas=array(
       'urlRequest' => $this->page_link,
+      'NumberOfItemsPerRequest' => $this->my_config['amd_NumberOfItemsPerRequest'],
     );
 
-    $local_tpl->assign('datas', $datas);
-
-    return($local_tpl->parse('body_page', true));
-  }
+    $template->assign("datas", $datas);
+
+    $template->assign_var_from_handle('AMD_BODY_PAGE', 'body_page');
+  } // displayDatabase
+
 
 
@@ -750 +730 @@
             'value' => addslashes($value)
           );
-
-          $sql="UPDATE ".$this->tables['used_tags']."
-                  SET numOfImg = numOfImg+1
-                  WHERE numId=$numId;";
-          pwg_query($sql);
         }
       }
@@ -859 +834 @@
       }
     }
+
+    $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);
 
     return(trim($returned).";");
@@ -970 +953 @@
 
   /**
-   * make some stat consolidation
-   *  "0" : consolidate "exif.%" tags
-   *  "1" : consolidate "iptc.%" tags
-   *  "2" : consolidate "xmp.%" tags
-   *
-   * @param String $step
-   */
-  private function ajax_amd_makeStatsConsolidate($step)
-  {/*
-    $sql="INSERT INTO ".$this->tables['used_tags']."
-            SELECT tagId, count(distinct imageId)
-              FROM ".$this->tables['images_tags']."
-              WHERE tagId LIKE '%s'
-              GROUP BY tagId";
-
-    switch($step)
-    {
-      case "0":
-        pwg_query("DELETE FROM ".$this->tables['used_tags']);
-        $sql=sprintf($sql, "exif.%");
-        pwg_query($sql);
-        break;
-      case "1":
-        $sql=sprintf($sql, "iptc.%");
-        pwg_query($sql);
-        break;
-      case "2":
-        $sql=sprintf($sql, "xmp.%");
-        pwg_query($sql);
-        break;
-    }*/
-  }
-
-
-  /**
    * return a formatted <table> (using the template "amd_stat_show_iListTags")
    * of used tag with, for each tag, the number and the percentage of pictures