Changeset 125

Show
Ignore:
Timestamp:
Thu Jul 6 21:34:59 2006
Author:
Brian
Message:

Script to deisplay server key information. Minor fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • server/trunk/update/test/test_update_server.py

    r92 r125  
    59 59     xpass = 1  
    60 60  
    61   def Result(s):  
      61 def Result(s, p=1):  
    61 61     global xpass  
    62 62     if xpass:  
    63 63         print "passed test"  
    64 64     else:  
    65           print "failed test", `s`  
      65         if p:  
      66             print "failed test", `s`  
      67         else:  
      68             print "failed test"  
    66 69     xpass = 1  
    67 70  
    …… 
    323 326     compare_dicts(big_test_data.update2[1], result[1])  
    324 327     compare_dd(big_test_data.update2[2], result[2])  
    325       Result(result)  
      328     Result(result, 0)  
    325 328  
    326 329     Test("client - send an invalid multi field change:")  
    …… 
    382 385     update_count += 1  
    383 386     changes = [   # IMPORTANT ReportType.Also is a foreign key <-- TO DO!!!  
      387         { "Table": "Other", "ID": 1, "WebName": "Test Database" },  
    384 388         { "Table": "Resource", "ID": 2, "Name": "Alexander", "WebEditKey": "alex" },  
    385 389         { "Table": "Measurement", "ID": 1, "Name": "TeamMemberCount", "Label": "Team Member\nCount", 'DataType': 'i' },  
    …… 
    400 404         { "Table": "ReportColumn", "ID": 14, 'ReportID': 5, 'ColumnTypeID': 52, 'NextColumn': 15 },  
    401 405         { "Table": "ReportColumn", "ID": 15, 'ReportID': 5, 'ColumnTypeID': 53, 'NextColumn': 0,  
    402             #'WebEditDateRule': "PriorBusinessDay",  
      406           'WebEditDateRule': "PriorBusinessDay",  
    402 406           #'WebEditDateRule': "Today",  
    403             'WebEditDateRule': "Past",  
      407           #'WebEditDateRule': "Past",  
    403 407           'Periods': 10, 'Web': "Yes" },  
    404 408         ]  

  • server/trunk/update/server/HTML.py

    r94 r125  
    393 393  
    394 394         firstindex = todayindex -1  # find the first work day before today  
    395           while Data.DateInfo[firstindex][1] == 0 and firstindex > worstcase:  
      395         while Data.DateInfo[firstindex][0] == 0 and firstindex > worstcase:  
    395 395             firstindex -= 1  
      396             if debug: print "Candidate: ", Data.DateIndex[firstindex], Data.DateInfo[firstindex]  
    396 397         firstday = Data.DateIndex[firstindex]  
    397 398