Revision: 3994
Author: jussi.ao.malinen
Date: Mon Aug 30 07:25:00 2010
Log: added helpers to Message
http://code.google.com/p/robotframework/source/detail?r=3994

Modified:
 /trunk/src/robot/output/loggerhelper.py
 /trunk/src/robot/serializing/logserializers.py

=======================================
--- /trunk/src/robot/output/loggerhelper.py     Mon Aug 30 07:07:24 2010
+++ /trunk/src/robot/output/loggerhelper.py     Mon Aug 30 07:25:00 2010
@@ -88,6 +88,15 @@
         return utils.get_timestamp(daysep='', daytimesep=' ',
                                    timesep=':', millissep='.')

+    def get_timestamp(self, sep=' '):
+        return self.timestamp.replace(' ', sep)
+
+    @property
+    def time(self):
+        if ' ' not in self.timestamp:
+            return self.timestamp
+        return self.timestamp.split()[1]
+

 class IsLogged:

=======================================
--- /trunk/src/robot/serializing/logserializers.py      Mon Aug 30 06:45:13 2010
+++ /trunk/src/robot/serializing/logserializers.py      Mon Aug 30 07:25:00 2010
@@ -74,8 +74,8 @@
         attrs = {'class': 'time'}
         if msg.level in ['WARN', 'ERROR']:
             # Allow linking from Test Execution Errors table
-            attrs['id'] = 'msg_%s' % msg.timestamp.replace(' ','_')
-        self._writer.element('td', msg.timestamp.split()[1], attrs)
+            attrs['id'] = 'msg_%s' % msg.get_timestamp(sep='_')
+        self._writer.element('td', msg.time, attrs)
         self._writer.element('td', msg.level,
                              {'class': '%s level' % msg.level.lower()})
         self._writer.element('td', msg.message, {'class': 'msg'},
@@ -291,11 +291,11 @@

     def _write_timestamp(self, msg):
         if msg.linkable:
-            attrs = {'href': "#msg_%s" % msg.timestamp.replace(' ','_'),
- 'onclick': "set_element_visible('msg_%s')" % msg.timestamp.replace(' ','_'),
+            attrs = {'href': "#msg_%s" % msg.get_timestamp(sep='_'),
+ 'onclick': "set_element_visible('msg_%s')" % msg.get_timestamp(sep='_'),
                      'title': 'Link to details.'}
             self._writer.start('a', attrs, newline=False)
- self._writer.content(msg.timestamp.replace(' ', ' '), escape=False)
+        self._writer.content(msg.get_timestamp(sep=' '), escape=False)
         if msg.linkable:
             self._writer.end('a', newline=False)

Reply via email to