Changeset 8515

Timestamp:

25 May 2012, 01:39:32 (12 years ago)

Author:

uli

Message:

Use new logfile search and shorten some overlong lines.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -680 +680 @@
         return
 
-    @action(_('Add session configuration'), validator=NullValidator, style='primary')
+    @action(_('Add session configuration'), validator=NullValidator,
+            style='primary')
     def addSubunit(self, **data):
         self.redirect(self.url(self.context, '@@add'))
@@ -691 +692 @@
             url = self.url(val)
             session_string = val.getSessionString()
-            title = _('Session ${a} Configuration', mapping = {'a':session_string})
+            title = _('Session ${a} Configuration',
+                      mapping = {'a':session_string})
             yield(dict(url=url, name=key, title=title))
 
@@ -1244 +1246 @@
         if search is None or not query:
             return
-        self.files = self.context.getLogFiles()
-        fullpath = os.path.join(self.context.storage, 'logs', logname)
         self.query = query
-        #self.filecontents = open(fullpath, 'rb').read()
-        popen = os.popen("grep '%s' %s" % (query,fullpath))
-        self.grepresult = popen.read()
-        popen.close()
+        try:
+            self.grepresult = ''.join(
+                self.context.queryLogfiles(logname, query))
+        except ValueError:
+            self.flash(_('Not a valid search expression.' ))
+        return
 
 class DatacenterSettings(KofaPage):