Ignore:
Timestamp:
16/11/06 20:14:40 (14 years ago)
Author:
astephen
Message:

Latest titania bundle.

Location:
TI03-DataExtractor/branches/titania_install/pydxc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI03-DataExtractor/branches/titania_install/pydxc/DateTimeManager.py

    r1610 r1709  
    123123        (u,i)=("year", nsecs/60/60/24/365) 
    124124    return (u,i) 
     125 
     126 
     127def formatYear(fstring, dateTimeObj): 
     128    """ 
     129    Copes with year outside Unix time epoch. 
     130    """ 
     131    return fstring.replace("%Y", "%.4d" % dateTimeObj[0]) 
    125132 
    126133 
     
    340347        #    count=count+1           
    341348        #checkCount=0 
    342         formatstring=time.strftime(formatstring, tuple(list((itime))+[0,1,0])) 
     349        formatstring=formatYear(formatstring, itime) 
     350        # Note the year has been got now so the rest uses a fake year to avoid error outside unix time 
     351        formatstring=time.strftime(formatstring, tuple([2000]+list((itime[1:]))+[0,1,0])) 
    343352        #while formatstring.find("%")>-1:  # Keep in while loop just in case more than one occurrence of a field required 
    344353        #    checkCount=checkCount+1 
  • TI03-DataExtractor/branches/titania_install/pydxc/DisplayManager.py

    r1610 r1709  
    14831483        print "</TABLE>" 
    14841484         
    1485         if estimatedDuration>60:  
     1485        print "<P>Thank you for using the %s." % PACKAGE_NAME 
     1486 
     1487        if RESTRICTED_DATA:  
    14861488            try: 
    1487                 mailAddr=getUserEmail()  
    1488                 print "<P>You will be emailed at %s when the job has finished and the output is ready." % mailAddr         
     1489                print " You will be emailed when the job has finished." 
    14891490            except: 
    14901491                pass 
    14911492                 
    1492         print "<P>Thank you for using the %s." % PACKAGE_NAME 
    1493         
    14941493        print """<P><B>Click here to check the status of your request: </B> 
    14951494                 <FORM NAME="extract_info" method="POST" action="%s"> 
Note: See TracChangeset for help on using the changeset viewer.