Changeset 7650:bc80ecdd8c32

Timestamp:

11/08/07 15:19:32 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Click to download result.sobj

Location:

sage/dsage

Files:

• misc/constants.py (modified) (1 diff)
• scripts/dsage_worker.py (modified) (2 diffs)
• web/web_server.py (modified) (3 diffs)

sage/dsage/misc/constants.py

@@ -3 +3 @@
 DELIMITER = '-' * 50
 DSAGE_DIR = os.path.join(os.getenv('DOT_SAGE'), 'dsage')
+TMP_WORKER_FILES = os.path.join(DSAGE_DIR, 'tmp_worker_files')
+

sage/dsage/scripts/dsage_worker.py

@@ -49 +49 @@
 from sage.dsage.misc.constants import DELIMITER
 from sage.dsage.misc.constants import DSAGE_DIR
+from sage.dsage.misc.constants import TMP_WORKER_FILES
 from sage.dsage.misc.misc import random_str
 
@@ -195 +196 @@
         
         cur_dir = os.getcwd() # keep a reference to the current directory
-        tmp_dir = os.path.join(DSAGE_DIR, 'tmp_worker_files')
-        tmp_job_dir = os.path.join(tmp_dir, job.job_id)
-        if not os.path.isdir(tmp_dir):
-            os.mkdir(tmp_dir)
+        tmp_job_dir = os.path.join(TMP_WORKER_FILES, job.job_id)
+        if not os.path.isdir(TMP_WORKER_FILES):
+            os.mkdir(TMP_WORKER_FILES)
         if not os.path.isdir(tmp_job_dir):
             os.mkdir(tmp_job_dir)

sage/dsage/web/web_server.py

@@ -23 +23 @@
 from twisted.web2 import http, resource
 from twisted.web2 import static, http_headers, responsecode
+
+from sage.dsage.misc.constants import TMP_WORKER_FILES
 
 SAGE_ROOT  = os.environ['SAGE_ROOT']
@@ -94 +96 @@
     def child_get_help(self, ctx):
         return GetHelp()
+    
+    def child_worker_files(self, ctx):
+        return static.File(TMP_WORKER_FILES)
         
     def render(self, ctx):
@@ -192 +197 @@
             for i, (k, v) in enumerate(jdict.iteritems()):
                 # if k == 'code': # We will display the code below the table
-                #     continue
+                #     continue        
+                if k == 'result': # result is an .sobj, link to the file
+                    v = "<a href='worker_files/%s'>result.sobj (Click to download.)</a>" % (jdict['job_id'] + '/' + 'result.sobj')
                 html += """
                 <tr class='tr%s'>
-                """ % (i % 2)
+                """ % (i % 2)                    
                 html += """
                 <td>%s</td>