Changeset 4917 for extensions/AMetaData

Timestamp:

Feb 19, 2010, 9:11:02 PM (14 years ago)

Author:

grum

Message:

Stat consolidations don't work : bug fixed

Location:

extensions/AMetaData

Files:

• admin/amd_database.tpl (modified) (1 diff)
• amd_aip.class.inc.php (modified) (3 diffs)

extensions/AMetaData/admin/amd_database.tpl

@@ -138 +138 @@
        }).responseText;
 
-      pct=100*(i+1)/(list.length+2);
+      pct=100*(i+1)/list.length;
       $("#iprogressbar_bg").css("width", pct+"%");
       $("#iprogressbar_fg").html(Math.round(pct)+"%");
     }
 
-    for(j=0;j<3;j++)
-    {
-      tmp = $.ajax({
-        type: "POST",
-        url: "{/literal}{$datas.urlRequest}{literal}",
-        async: false,
-        data: { ajaxfct:"makeStatsConsolidate", step:j }
-       }).responseText;
-
-      pct=100*(i+j+1)/(list.length+2);
-      $("#iprogressbar_bg").css("width", pct+"%");
-      $("#iprogressbar_fg").html(Math.round(pct)+"%");
-    }
+    tmp = $.ajax({
+      type: "POST",
+      url: "{/literal}{$datas.urlRequest}{literal}",
+      async: false,
+      data: { ajaxfct:"makeStatsConsolidation" }
+     }).responseText;
+
 
     timeEnd = new Date();

extensions/AMetaData/amd_aip.class.inc.php

@@ -149 +149 @@
         case 'makeStatsDoAnalyze':
           $result=$this->ajax_amd_makeStatsDoAnalyze($_REQUEST['imagesList']);
+          break;
+        case 'makeStatsConsolidation':
+          $result=$this->ajax_amd_makeStatsConsolidation();
           break;
         case 'makeStatsGetStatus':
@@ -834 +837 @@
       }
     }
-
-    $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).";");
   }
@@ -897 +891 @@
 
   /**
+   * do some consolidation on database to optimize other requests
+   *
+   */
+  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);
+
+    return($returned);
+  }
+
+  /**
    * returns a list of formated string, separated with a semi-colon :
    *  - number of current analyzed pictures + number of current analyzed tags