Changeset 6923


Ignore:
Timestamp:
02/06/10 22:40:12 (9 years ago)
Author:
astephen
Message:

fixing

Location:
cows_wps/trunk/cows_wps
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cows_wps/trunk/cows_wps/controllers/jobviewer.py

    r6910 r6923  
    3535    def index(self): 
    3636        status_url = str(request.params.getone("status_url")) 
    37 #        job_id = str(request.params.getone("job_id")) 
    3837        getter = urllib.urlopen(status_url) 
    3938        job_xml = getter.read() 
     
    121120 
    122121        resp = "<h2>DETAILS</h2>" 
    123         resp += "Need to realise that in costonly response we have JobCompletionTimeDate empty because it hasn't run yet!<br><br>" 
    124122 
    125123        self.job_id = job_details.find("{" + self.namespace + "}JobID").text 
     
    135133        if self.status == "complete": 
    136134 
    137             resp += "<h2>OUTPUTS</h2>The following file outputs are available from your job.<br>" 
     135            resp += "<h2>OUTPUT FILES</h2>" 
     136 
     137            if len(file_set_list) > 0: 
     138                resp += "The following file outputs are available from your job.<br>" 
     139            else: 
     140                resp += 'There are no output files associated with your job. Please click the "View as XML" link above to view your output.<br>' 
     141 
    138142            for fnode in file_set_list: 
    139143 
  • cows_wps/trunk/cows_wps/controllers/status.py

    r5615 r6923  
    2727            request = requestManager.getRequest(requestId) 
    2828        except ValueError: 
    29              
    3029            requestManager._logRequests() 
    31              
    3230            log.exception("Exception occurred in status controller:") 
    3331             
     
    3634            return render_ows_exception(InvalidParameterValue('Request %s not found' % requestId)) 
    3735             
    38  
     36#        return str(dir(request.job)) 
    3937        processDir = request.job.process_dir 
    40          
    4138        context = ProcessContext(processDir).open() 
    4239        #!FIXME: Remove hard-coded version 
  • cows_wps/trunk/cows_wps/controllers/submit.py

    r6896 r6923  
    5757        # remove comma 
    5858        wps_request = wps_request[:-1] 
    59  
    6059        submitter_url = url_for(controller='/submitter', wps_request_url = wps_request, 
    6160                                proc_id = proc_id) 
    62         #return redirect_to(wps_request)  
    63         #return "%s" % submitter_url 
    6461        return redirect_to(submitter_url) 
    6562 
  • cows_wps/trunk/cows_wps/controllers/submitter.py

    r6903 r6923  
    4040        # If quick process then just forward 
    4141        if async == False: 
     42#            return urllib.unquote(wps_request_url) 
    4243            return self._submitToWPSAndRedirectToJobViewer(wps_request_url) 
    4344 
  • cows_wps/trunk/cows_wps/lib/ui/proc_config.py

    r6922 r6923  
    214214 
    215215            resp += "</td><td>%s</td></tr>\n" % instruction 
    216        
    217         resp += '<tr><td></td><td><input type="submit" value="Submit" /> Click this button when you are happy with your selections.</td><td></td></table>\n</form>\n' 
     216      
     217        count += 1 
     218        row_style = ("even_row", "odd_row")[count % 2]  
     219        resp += '<tr class="%s"><td></td><td colspan="2"><input type="submit" value="Submit" /> Click this button when you are happy with your selections.</td></table>\n</form>\n' % row_style 
    218220        return  fm.htmlify(resp) 
  • cows_wps/trunk/cows_wps/templates/wps_execute_response.xml

    r6896 r6923  
    5050                                    value = input_dict[arg] 
    5151                                    if type(value) not in (unicode, str): 
    52                                         value = ','.join([str(i) for i in value]) 
     52                                        try: 
     53                                            value = ','.join([str(i) for i in value]) 
     54                                        except: 
     55                                            value = str(value) 
    5356                                ?> 
    5457                                <ows:Identifier>$arg</ows:Identifier> 
Note: See TracChangeset for help on using the changeset viewer.