[rhmessaging-commits] rhmessaging commits: r3370 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-05-08 11:02:55 -0400 (Fri, 08 May 2009)
New Revision: 3370

Modified:
   mgmt/trunk/cumin/python/cumin/grid/job.py
   mgmt/trunk/cumin/python/cumin/util.py
Log:
Moved strip_string_quotes to util.
Get job Output and UserLog from job properties.
Get job Error output from job.Ad (if it exists).

Modified: mgmt/trunk/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/job.py	2009-05-08 14:33:27 UTC (rev 3369)
+++ mgmt/trunk/cumin/python/cumin/grid/job.py	2009-05-08 15:02:55 UTC (rev 3370)
@@ -655,7 +655,7 @@
         idict["orig"] = value
         idict["type"] = dtype
         if dtype == "string":
-            idict["value"] = self.strip_string_quotes(value)
+            idict["value"] = strip_string_quotes(value)
         if orig:
             idict["orig"] = orig
         if error:
@@ -668,13 +668,6 @@
             idict["path"] = path
         return idict
 
-    def strip_string_quotes(self, value):
-        dvalue = value
-        if value:
-            if value[:1] == "\"" and value[-1:] ==  "\"":
-                dvalue = value[1:-1]
-        return dvalue
-
 class JobPropertyRenderer(TemplateRenderer):
     def render_title(self, session, item):
         title = item["name"]
@@ -872,18 +865,6 @@
         self.__fetch = self.FetchButton(app, "refresh")
         self.add_child(self.__fetch)
 
-        self.ads = JobAdsSet(app, "ads")
-        self.add_child(self.ads)
-
-        self.out_file = Parameter(app, "out")
-        self.add_parameter(self.out_file)
-
-        self.err_file = Parameter(app, "err")
-        self.add_parameter(self.err_file)
-
-        self.user_file = Parameter(app, "user")
-        self.add_parameter(self.user_file)
-
         self.output = self.OutputFile(app, "job_output")
         self.add_child(self.output)
 
@@ -893,31 +874,20 @@
     def render_title(self, session, *args):
         return "Output"
 
-    def render(self, session, *args):
-        out_file = self.out_file.get(session)
-        err_file = self.err_file.get(session)
-        user_file = self.user_file.get(session)
-        if not out_file:
-            job = self.frame.get_args(session)[0]
-            items = self.ads.get_raw_ads(session, job)
-            out_file = err_file = user_file = None
-            if "Out" in items:
-                out_file = items["Out"]["VALUE"]
-            if "Err" in items:
-                err_file = items["Err"]["VALUE"]
-            if "UserLog" in items:
-                user_file = items["UserLog"]["VALUE"]
+    def do_render(self, session, *args):
+        job = args[0]
+        out_file = job.Out
+        user_file = job.UserLog
+        # get err_file from JobAd
+        err_file = None
+        if job.Ad:
+            try:
+                if "Err" in job.Ad:
+                    err_file = job.Ad["Err"]["VALUE"]
+                    err_file = strip_string_quotes(err_file)
+            except Exception, e:
+                pass
 
-            # strip any double quotes surrounding file names
-            out_file = self.ads.strip_string_quotes(out_file)
-            err_file = self.ads.strip_string_quotes(err_file)
-            user_file = self.ads.strip_string_quotes(user_file)
-
-            # remember the file names so we don't need to reget them
-            self.out_file.set(session, out_file)
-            self.err_file.set(session, err_file)
-            self.user_file.set(session, user_file)
-
         # set title for radiotab so mouseover will display file name
         self.which_file.set_file_name(session, "o", out_file)
         self.which_file.set_file_name(session,"e", err_file)
@@ -930,7 +900,7 @@
         if self.which_file.is_bad(user_file):
             self.which_file.disable(session, "u")
 
-        return super(JobOutput, self).render(session, *args)
+        return super(JobOutput, self).do_render(session, *args)
 
     def render_loading(self, session, *args):
         file = self.which_file.get_current_file_name(session)

Modified: mgmt/trunk/cumin/python/cumin/util.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/util.py	2009-05-08 14:33:27 UTC (rev 3369)
+++ mgmt/trunk/cumin/python/cumin/util.py	2009-05-08 15:02:55 UTC (rev 3370)
@@ -120,3 +120,10 @@
                 end = ocurly
 
     return strings
+
+def strip_string_quotes(value):
+    dvalue = value
+    if value:
+        if value[:1] == "\"" and value[-1:] ==  "\"":
+            dvalue = value[1:-1]
+    return dvalue