Changeset 6733:75d653c8b306 for sage/dsage/scripts/dsage_worker.py

Timestamp:

10/12/07 00:57:54 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Add the ability to attach files in eval.

File:

• sage/dsage/scripts/dsage_worker.py (modified) (5 diffs)

sage/dsage/scripts/dsage_worker.py

@@ -160 +160 @@
         
         if completed:
+            log.msg('[Worker %s] Finished job %s' % (self.id,
+                                                     self.job.job_id))
             self.restart()
         
@@ -203 +205 @@
         return tmp_job_dir
         
-    def extract_job_data(self, job):
+    def extract_and_load_job_data(self, job):
         """
         Extracts all the data that is in a job object.
@@ -221 +223 @@
                         continue
                     if kind == 'file':
+                        data = preparse_file(data, magic=True, do_time=False,
+                                             ignore_prompts=False)
                         f = open(var, 'wb')
                         f.write(data)
@@ -227 +231 @@
                             msg = 'Extracted %s' % f
                             log.msg(LOG_PREFIX % self.id + msg)
+                        self.sage.eval("execfile('%s')" % var)
                     if kind == 'object':
                         fname = var + '.sobj'
@@ -302 +307 @@
         
         self.tmp_job_dir = self.setup_tmp_dir(job)
-        self.extract_job_data(job)
+        self.extract_and_load_job_data(job)
         
         job_filename = self.write_job_file(job)