BUG : Fixed profiler on chrome

midasplatform · Feb 28, 2011 · 6057bab · 6057bab
1 parent c8b0a6d
commit 6057bab
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/application/layouts/layout.phtml b/application/layouts/layout.phtml
@@ -28,6 +28,7 @@
     <![endif]-->
     <?php echo $this->headLink();  // import the css ?>
     <?php echo $this->headStyle(); // import the css ?>
+
   </head>
   <body>
     <div class="MainDialog" style="display:none;">

diff --git a/library/MIDAS/controller/GlobalController.php b/library/MIDAS/controller/GlobalController.php
@@ -67,12 +67,9 @@ public function postDispatch()
       $time_end = microtime(true);
       $writer = new Zend_Log_Writer_Firebug();
       $logger = new Zend_Log($writer);
-      $logger->info('---Timers---');
-      $logger->info("Controller timer:" . ($time_end - $this->_controllerTimer));
-      $logger->info("Global timer:" . ($time_end - START_TIME));
+      $logger->info("---Timers--- Controller timer:" . round(1000*($time_end - $this->_controllerTimer),3)." ms - Global timer:" . round(1000*($time_end - START_TIME),3)." ms");
 
-      $logger->info("---Memory Usage---");
-      $logger->info((memory_get_usage() / (1024 * 1024)) . " MB");
+      $logger->info("---Memory Usage---".round((memory_get_usage() / (1024 * 1024)),3) . " MB");
       }
 
     if (Zend_Registry::get("configDatabase")->database->profiler == 1)
@@ -140,7 +137,6 @@ public function showProfiler()
     {
     $writer = new Zend_Log_Writer_Firebug();
     $logger = new Zend_Log($writer);
-    $logger->log('---Profiler---', Zend_Log::INFO);
     $configDatabase = Zend_Registry::get('configDatabase');
     if ($configDatabase->database->profiler != '1')
       {
@@ -152,7 +148,6 @@ public function showProfiler()
     $queryCount = $profiler->getTotalNumQueries();
     if ($queryCount == 0)
       {
-      $logger->log('No query', Zend_Log::INFO);
       return;
       }
     $longestTime = 0;
@@ -166,18 +161,13 @@ public function showProfiler()
         }
       }
 
-    $logger->log('Executed ' . $queryCount . ' queries in ' . $totalTime .
-    ' seconds', Zend_Log::INFO);
-    $logger->log('Average query length: ' . $totalTime / $queryCount .
-    ' seconds', Zend_Log::INFO);
-    $logger->log('Queries per second: ' . $queryCount / $totalTime, Zend_Log::INFO);
-    $logger->log('Longest query length: ' . $longestTime, Zend_Log::INFO);
-    $logger->log("Longest query: " . $longestQuery, Zend_Log::INFO);
-    $logger->log("List:", Zend_Log::INFO);
+    $stats='--- Profiler --- Executed ' . $queryCount . ' queries in ' . round(1000*$totalTime,3) .' ms';
+    $stats.= ' Longest query length: ' . round(1000*$longestTime,3).' ms : '.$longestQuery;
+    $logger->log(str_replace("'","`",$stats), Zend_Log::INFO);
 
     foreach ($profiler->getQueryProfiles() as $query)
       {
-      $logger->log($query->getElapsedSecs() . " | " . $query->getQuery(), Zend_Log::INFO);
+      $logger->log(str_replace("'","`",round(1000*($query->getElapsedSecs()),3). " ms | " . $query->getQuery()), Zend_Log::INFO);
       }
     }
 

diff --git a/public/js/layout/jquery.treeTable.js b/public/js/layout/jquery.treeTable.js
@@ -236,6 +236,8 @@
     getElementsSize();
   }
 
+
+  var ajaxSizeRequest='';
   function getElementsSize()
   {
     var elements='';
@@ -250,7 +252,11 @@
       });
     if(elements!='')
       {
-        $.post(json.global.webroot+'/browse/getfolderssize',{folders: elements} , function(data) {
+        if(ajaxSizeRequest!='')
+          {        
+          ajaxSizeRequest.abort();
+          }
+        ajaxSizeRequest=$.post(json.global.webroot+'/browse/getfolderssize',{folders: elements} , function(data) {
           arrayElement=jQuery.parseJSON(data);
           $.each(arrayElement, function(index, value) { 
               var img=$('img.folderLoading[element='+value.id+']');

diff --git a/public/js/layout/main.js b/public/js/layout/main.js
@@ -1,6 +1,12 @@
 var json
 var itemselected = false;
 
+if (typeof console != "object") {
+	var console = {
+		'log':function(){}
+	};
+}
+
 $(function() { 
   json = jQuery.parseJSON($('div.jsonContent').html());
   if(!json.global.logged)