svn commit: r437671 - in /maven/continuum/trunk: continuum-sandbox/continuum-python/continuum.py continuum-web/src/main/resources/templates/screens/ProjectBuild.vm

[jv...@apache.org]

Author: jvanzyl
Date: Mon Aug 28 04:35:41 2006
New Revision: 437671

URL: http://svn.apache.org/viewvc?rev=437671&view=rev
Log:
[CONTINUUM-753] fix build number info in xmlrpc interface
[CONTINUUM-754] fix build number on the build details page (now obsolete with WW stuff)
[CONTINUUM-808] fix local time use in xmlrpc interface
Submitted by: Andrew Williams


Modified:
    maven/continuum/trunk/continuum-sandbox/continuum-python/continuum.py
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm

Modified: maven/continuum/trunk/continuum-sandbox/continuum-python/continuum.py
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-sandbox/continuum-python/continuum.py?rev=437671&r1=437670&r2=437671&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-sandbox/continuum-python/continuum.py (original)
+++ maven/continuum/trunk/continuum-sandbox/continuum-python/continuum.py Mon Aug 28 04:35:41 2006
@@ -1,5 +1,5 @@
 import os
-from time import strftime, gmtime
+from time import strftime, localtime
 import xmlrpclib
 
 class XmlRpcException:
@@ -327,10 +327,10 @@
         map[ "totalTime" ] = int( map[ "endTime" ] )/ 1000 - int( map[ "startTime" ] ) / 1000
 
         self.id = map[ "id" ]
+        self.state = int( map[ "state" ] )
         self.buildNumber = map[ "buildNumber" ]
-        if self.buildNumber == '0':
+        if ( self.state != Continuum.STATE_OK ):
             self.buildNumber = ''
-        self.state = int( map[ "state" ] )
         if ( map.has_key( "trigger" ) ):
             self.forced = map[ "trigger" ] == Continuum.TRIGGER_FORCED
             self.trigger = int( map[ "trigger" ] )
@@ -338,8 +338,8 @@
             self.forced = False
             self.trigger = 0
 
-        self.startTime = gmtime( int( map[ "startTime" ] ) / 1000 )
-        self.endTime = gmtime( int( map[ "endTime" ] ) / 1000 )
+        self.startTime = localtime( int( map[ "startTime" ] ) / 1000 )
+        self.endTime = localtime( int( map[ "endTime" ] ) / 1000 )
         self.totalTime = map[ "totalTime" ]
         self.error = map.get( "error" )
         self.map = map
@@ -412,7 +412,7 @@
         self.map = map
         self.author = map[ "author" ]
         self.comment = map[ "comment" ]
-        self.date = gmtime( int( map[ "date" ] ) / 1000 )
+        self.date = localtime( int( map[ "date" ] ) / 1000 )
 
         self.files = list()
         for f in map[ "files" ]:

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm?rev=437671&r1=437670&r2=437671&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm Mon Aug 28 04:35:41 2006
@@ -61,9 +61,9 @@
         <td>$state.generate($build)</td>
       </tr>
       <tr class="b">
-        <th>Build#</th>
+        <th>Build #</th>
         <td>
-        #if ( $build.buildNumber != 0 )
+        #if ( $build.state == 2 )
           $build.buildNumber
         #else
           &nbsp;