Changeset 7658:cbe5c5be060d

Timestamp:

11/11/07 21:35:57 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Begin refactoring xml stats.

Location:

sage/dsage

Files:

• server/stats.py (added)
• web/static/dsage_web.js (modified) (7 diffs)
• web/web_server.py (modified) (2 diffs)

sage/dsage/web/static/dsage_web.js

@@ -4 +4 @@
     $('#server_details').load('get_server_details', function() {
                                     $("#server_details").tablesorter(); });
-    showServer()
+    showServer();
 }
 
@@ -15 +15 @@
 }
 function getJobs (c) {
-    count = c // Set global variable count to the selected count. 
+    count = c; // Set global variable count to the selected count. 
     
     // Load jobs table with the given number of jobs.
@@ -22 +22 @@
             
     // Change current selected count to red 
-    $('#navigator > a').css('color', 'black')
-    $('#' + c).css('color', 'red')
+    $('#navigator > a').css('color', 'black');
+    $('#' + c).css('color', 'red');
 }
 
@@ -37 +37 @@
     $('#job_details').load('get_details', {'job_id': job_id}, function() {
                                         $("#job_details").tablesorter(); } );
-    showJobDetails()
+    showJobDetails();
 }
 
@@ -50 +50 @@
 function getHelp () {
     $('#help').load('get_help');
-    showHelp()
+    showHelp();
 }
 
@@ -71 +71 @@
                 // restore ajax loaded state
         if (hash=='jobs') {
-            showJobs()
+            showJobs();
         }
         else if (hash=='server') {
-            getServerDetails()
+            getServerDetails();
         }
         else if (hash=='help') {
-            getHelp()
+            getHelp();
         }
         } 
         else {
                 // start page
-                showJobs()
+                showJobs();
         }
 }
@@ -102 +102 @@
                 // set onlick event for buttons
                 $("a[@rel='history']").click(function() {gethash(this); });
-        getJobs(count) // Run it the first time
+        getJobs(count); // Run it the first time
         
         // Only show jobs if this.href is none or jobs
         if (this.href == '' || this.href == '#jobs') {
-            showJobs()
+            showJobs();
         }
         // setInterval('getJobs(count)', 5000); // Update it every 5 seconds.  

sage/dsage/web/web_server.py

@@ -27 +27 @@
 
 from sage.dsage.misc.constants import TMP_WORKER_FILES
+from sage.dsage.server.stats import XMLStats
 
 SAGE_ROOT  = os.environ['SAGE_ROOT']
@@ -294 +295 @@
         """
         
-        stats_xml = self.dsage_server.generate_xml_stats()
-        
-        html = self.gen_html(stats_xml)
-        
-        return http.Response(stream=html)
+        
+        stats_xml = XMLStats(self.dsage_server).gen_xml()
+        
+        # html = self.gen_html(stats_xml)
+        
+        return http.Response(stream=stats_xml)