Changeset 2786 for TI05-delivery/ows_framework/trunk

Timestamp:

08/08/07 15:02:35 (12 years ago)

Author:

lawrence

Message:

Sundry ticket fixes.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/discovery.py (modified) (1 diff)
• lib/ndgInterface.py (modified) (1 diff)
• models/DiscoveryState.py (modified) (1 diff)
• templates/results.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/discovery.py

@@ -206 +206 @@
             return 'Error, invalid configuration for search interface'
         #defaults
-        c.bbox='+90.0','-180.0','+180.0','-90.0'
+        c.bbox='90.0','-180.0','180.0','-90.0'
         c.startDateDay,c.startDateMon,c.startDateYear='','',''
         c.endDateDay,c.endDateMon,c.endDateYear='','',''

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/ndgInterface.py

@@ -129 +129 @@
                 status,xmlh=ndgRetrieve.ndgRetrieve(ndgO,request.environ['ndgConfig'],logger,format)
             if status: self.XMLHCache[uri]=xmlh
+            
+        if not status: return status,xmlh
         
         # valid values of the return objects SHOULD BE 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DiscoveryState.py

@@ -28 +28 @@
             c+='Including %s to %s; '%('%s,%s,%s'%dr[0],'%s,%s,%s'%dr[1])
         bbox=self.values['bbox']
-        if bbox is None or bbox==['+90.0','-180.0','+180.0','-90.0']:
+        if bbox is None or bbox==['90.0','-180.0','180.0','-90.0']:
             c+='Global; '
         else: c+='Bounding Box: %sN,%sW,%sE,%sS; '%tuple(bbox)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/results.kid

@@ -57 +57 @@
             </div>
             <div class="resultsBar">
-                <a href="${g.discoveryURL}?constraints=abc"> Refine search</a> 
+                <a href="${c.state.constrainedurl"> Refine search</a> 
                 | Found ${c.state.hits} | Showing ${c.state.offset}-$upper 
                   <span py:if="p!=[]"> | <a href="$purl"> Previous ${p[1]}</a> </span>