Changeset 2745 for TI05-delivery


Ignore:
Timestamp:
26/07/07 15:13:54 (12 years ago)
Author:
lawrence
Message:

Fixed the next/previous error in ticket:818. Slight improvement in
layout for user contributions on browe page.

Location:
TI05-delivery/ows_framework/trunk/ows_server/ows_server
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/discovery.py

    r2703 r2745  
    2626         
    2727        self.__setup() 
     28        print request.environ['QUERY_STRING'] 
     29        print self.inputs 
    2830        # parse the query string and hand off to a discovery engine 
    2931        if self.inputs=={}: return self.__advancedPrompt() 
     
    5355         
    5456        if len(self.inputs)==4: 
    55             response=self.doText(self.inputs['searchString'],self.inputs['textTarget'], 
    56                         self.inputs['start'],self.inputs['howmany']) 
     57             
     58            # now we add the defaults ... 
     59            # this is kind of historical ... 
     60            bbox=None 
     61            dateRange=None 
     62            scope=None 
     63         
    5764        else: 
     65         
    5866            #check advanced search options 
    5967            expected=['startDateDay','startDateMon','startDateYear', 
     
    8088                c.xml=self.message 
    8189                return render_response('content') 
    82  
     90     
    8391            # ------------- Handle Date Ranges --------------- 
    8492            try: 
    8593                dateRange=[(self.inputs['startDateDay'],iMonth(self.inputs['startDateMon']),self.inputs['startDateYear']), 
    86                            (self.inputs['endDateDay'],iMonth(self.inputs['endDateMon']),self.inputs['endDateYear'])] 
     94                            (self.inputs['endDateDay'],iMonth(self.inputs['endDateMon']),self.inputs['endDateYear'])] 
    8795                #default form has blanks, in which case we don't want to check for date range 
    8896                if dateRange<>[("","",""),("","","")]: 
    89                    self.__checkdates(dateRange) 
     97                    self.__checkdates(dateRange) 
    9098                else: dateRange=None            
    9199            except: 
     
    94102                c.xml=self.message 
    95103                return render_response('content') 
    96                          
    97             # ------------- ok, now go do the search ----------- 
    98             response=self.doText(self.inputs['searchString'],self.inputs['textTarget'], 
    99                  self.inputs['start'],self.inputs['howmany'],scope=scope,dateRange=dateRange,bbox=bbox) 
     104                 
     105        # ------------- ok, now go do the search ----------- 
     106        response=self.doText(self.inputs['searchString'],self.inputs['textTarget'], 
     107                self.inputs['start'],self.inputs['howmany'],scope=scope,dateRange=dateRange,bbox=bbox) 
    100108            
    101109        return response 
     
    227235            constraints+='Restricted to %s; '%scope[0] 
    228236        constraints=constraints[:-2] 
    229         logger.info(constraints) 
     237        logger.info('Constraints=%s'%constraints) 
    230238        return constraints 
    231239         
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DiscoveryState.py

    r2703 r2745  
    2828        q=q[0:-1] 
    2929        url=construct_url(self.environ, with_query_string=True, with_path_info=True, querystring=q) 
    30         url=cgi.escape(url) 
     30        #url=cgi.escape(url) 
    3131        return url 
    3232    def getNext(self): 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css

    r2703 r2745  
    7373/* This is the "metadata" css */ 
    7474.metadata {PADDING-LEFT: 20px; font-size:80%; padding-right:20px;} 
     75#Corrections {PADDING-LEFT:20px; font-size:80%; padding-right:20px;} 
    7576.metadata #keywords {COLOR: Blue; FONT-SIZE:120%; FONT-WEIGHT:bold;} 
    7677.metaentry {COLOR: Black} 
     
    151152.resultsBar {text-align:right; margin: 2px 10px 2px 10px; border:0;} 
    152153 
    153 #resultsTab thead {background-color: #075993; color:#FFFFFF; margin: 0px 10px 0px 10px;} */ 
     154#resultsTab thead {background-color: #075993; color:#FFFFFF; margin: 0px 10px 0px 10px;}  
    154155#resultsTab th { 
    155156        background-color: #075993; 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/correct.kid

    r2646 r2745  
    11<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"> 
    22 
    3 <div id="Corrections"> 
     3<div id="CorrectForm"> 
    44    <p> Please use this form to suggest changes (additions/corrections) to the metadata apearing in the record </p> 
    55    <form action='/correct/$c.uri.uri'> 
Note: See TracChangeset for help on using the changeset viewer.