Ignore:
Timestamp:
12/06/06 01:08:17 (14 years ago)
Author:
astephen
Message:

Latest version with javascript select all in the GUI, date/time
javascript checking (needs onsubmit), cleaned up selection by domain.

Location:
TI03-DataExtractor/trunk/dist
Files:
9 added
6 edited

Legend:

Unmodified
Added
Removed
  • TI03-DataExtractor/trunk/dist/cgi/dxui

    r1109 r1153  
    393393            action=self.args["action"] 
    394394            if action=="viewRequestSummary": 
    395                 summary=self.server.callServerMethod("summariseRequest", [self.sessionID, self.secureToken])[0] 
     395                summaryString=self.server.callServerMethod("summariseRequest", [self.sessionID, self.secureToken])[0][0][0] 
    396396                self.displayer._displayHTTPHeader()  
    397397                self.displayer._displayHTMLHeader() 
    398                 self.displayer._displayRequestSummaryTable(summary) 
     398                self.displayer._displayRequestSummaryTable(createSummaryDict(summaryString)) 
    399399                self.displayer._displayReturnLine(self.sessionID) 
    400400                return "Display footer then complete" 
     
    431431            tp=self.args["targetPage"] 
    432432            tp2catMap={"DatasetGroupPage":"datasetGroup", "DatasetPage":"dataset", 
    433                        "VariablesPage":"variable", "DomainPage":"horizontalDomain"} 
     433                       "VariablesPage":"variable", "DomainAndFormatPage":"domainAndFormat"} 
    434434            optionCategory=tp2catMap[tp] 
    435             response=self.server.callServerMethod("getOptions", [self.sessionID, self.secureToken, optionCategory]) 
    436         else:   
    437             response=self.server.callServerMethod("selectOptions", [self.sessionID, self._packArgsAsList(self.args)]) 
     435            self.args["optionCategoryRequested"]=optionCategory 
     436            # Need to delete targetPage otherwise it will stay forever 
     437            del self.args["targetPage"] 
     438        response=self.server.callServerMethod("selectOptions", [self.sessionID, self._packArgsAsList(self.args)]) 
    438439         
    439440        #self.displayer._displayHTTPHeader() 
     
    487488            self.displayer._displayDatasetSummaryLine(summaryString, optionCategories[0], self.sessionID) 
    488489            self.displayer._displayMainTableHeader(self.sessionID) 
    489             self.displayer._displayDomainOptions(summaryDict, optionCategories, options, optionStrings, self.sessionID)      
     490            self.displayer._displayDomainOptions(summaryDict, optionCategories, options, optionStrings, self.sessionID) 
    490491            self.displayer._displayMainTableFooter() 
    491492         
     
    536537                self.displayer._displayProcessingSection(estimatedDuration, estimatedVolume, self.sessionID) 
    537538                pathList, self.secureToken=self.server.callServerMethod("createOutput", [self.sessionID, self.secureToken])[0]           
     539                print "<P>", pathList, len(pathList) 
    538540                self.displayer._displayOutputFileList(pathList[0][0])    
    539541 
Note: See TracChangeset for help on using the changeset viewer.