Changeset 2703

Timestamp:

04/07/07 14:27:06 (14 years ago)

Author:

lawrence

Message:

Look and feel of result set is now close to Kay's concepts.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/ndgMiddleware.py (modified) (1 diff)
• controllers/discovery.py (modified) (3 diffs)
• models/DiscoveryState.py (modified) (3 diffs)
• public/layout/ndg2.css (modified) (1 diff)
• templates/meta.kid (modified) (3 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgMiddleware.py

@@ -31 +31 @@
         self.globals.icons_A=cf.get('NDG_A_SERVICE','icon')
         self.globals.icons_B=cf.get('NDG_B_SERVICE','icon')
+        self.globals.icons_D=cf.get('DISCOVERY','icon')
+        self.globals.icons_R=cf.get('RELATED','icon')
         
         self.globals.discoveryURL=cf.get('SEARCH','discoveryURL')

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

@@ -166 +166 @@
                         c.xml+='Internal sending of mail failed with error [%s]</p>'%message
                     return render_response('content')
-                c.xml=renderDiscoverySet(difs,state,self.cf)
-                f=file('debug-dif.xml','w')
-                f.write(c.xml)
-                f.close()
-                return render_response('content')
+                if 0:
+                    c.xml=renderDiscoverySet(difs,state,self.cf)
+                    f=file('debug-dif.xml','w')
+                    f.write(c.xml)
+                    f.close()
+                    return render_response('content')
+                else:
+                    c.state=state
+                    c.difs=difs
+                    return render_response('results')
+                
         except ValueError,e:
             if debug: 
@@ -212 +218 @@
     def __buildconstraints(self,dateRange,bbox,scope):
         ''' Just build a constraint string '''
-        constraints=' ('
+        constraints=''
         if dateRange is not None: 
             constraints+='Including&nbsp;%s&nbsp;to&nbsp;%s; '%('%s,%s,%s'%dateRange[0],'%s,%s,%s'%dateRange[1])
@@ -220 +226 @@
         if scope is not None:
             constraints+='Restricted to %s; '%scope[0]
-        constraints=constraints[:-2]+')'
+        constraints=constraints[:-2]
         logger.info(constraints)
         return constraints

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

@@ -16 +16 @@
         self.stride=stride
         self.searchString=searchString
+        self.alternatives=None
     def geturl(self,**kw):
         ''' Get a url from the wsgi environment, modified by the keyword arguments offset and stride 
@@ -29 +30 @@
         url=cgi.escape(url)
         return url
+    def getNext(self):
+        ''' Get the next slice '''
+        result=[]
+        defStride=10
+        if self.offset+self.stride<self.hits:
+            #there are more to look at
+            r=[self.offset+self.stride,self.stride]
+            if r[0]+r[1]-1>self.hits: r[1]=self.hits+1-r[0]
+            result.append(r)
+        else:result.append([])
+        if self.offset>1:
+            #there are previous records
+            b=max(self.stride,defStride)
+            r=[self.offset-b,b]
+            if r[0]<1: r[0]=1
+            if r[1]>self.hits: r[1]=self.hits
+            result.append(r)
+        else: result.append([])
+        return result
+        
     def __str__(self):
         return ''' 
@@ -41 +62 @@
 '''%(self.searchString,self.constraints,self.sessID,self.hits,self.offset,self.stride,self.environ)
         
-import unittest
+if __name__=="__main__":
+    
+    import unittest
+    DummyEnviron={'QUERY_STRING':'start=10&howmany=10','HTTP_HOST':'example.ndg',
+                      'PATH_INFO':'/discovery','wsgi.url_scheme':'http','SERVER_PORT':'80'}
 
-class TestCase(unittest.TestCase):
+    class TestCase(unittest.TestCase):
+        
+        def testDiscoveryState(self):
+            ''' Test creation of a discovery state variable '''
+            d=DiscoveryState('123','blah',DummyEnviron,12,'(none)')
+            self.assertEqual(d.geturl(offset='11',stride='20'),
+                            'http://example.ndg/discovery?start=11&amp;howmany=20')
+            print d
     
-    def testDiscoveryState(self):
-        ''' Test creation of a discovery state variable '''
-        DummyEnviron={'QUERY_STRING':'start=10&howmany=10','HTTP_HOST':'example.ndg',
-                      'PATH_INFO':'/discovery','wsgi.url_scheme':'http','SERVER_PORT':'80'}
-        d=DiscoveryState('123','blah',DummyEnviron,12,'(none)')
-        self.assertEqual(d.geturl(offset='11',stride='20'),
-                         'http://example.ndg/discovery?start=11&howmany=20')
-        print d
- 
-        
-if __name__=="__main__":
+        def testStrideself(self):
+            ''' Test striding through a dataset '''
+            
+            s=DiscoveryState('123','blah',DummyEnviron,15,'(none)',1,10)
+            res=s.getNext()
+            self.assertEqual([[11,5],[]],res)
+            
+            s=DiscoveryState('123','blah',DummyEnviron,15,'(none)',11,5)
+            res=s.getNext()
+            self.assertEqual([[],[1,10]],res)
+            
+            s=DiscoveryState('123','blah',DummyEnviron,50,'(none)',11,10)
+            res=s.getNext()
+            self.assertEqual([[21,10],[1,10]],res) 
+
+               
     unittest.main()
-               
-
                       
         

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css

@@ -143 +143 @@
 .helptxt {font-size:smaller; background-color:yellow;}
 
+/* Results Page */
+
+
+#context { margin: 0 10px 0 10px; border:0; color:#571512;} 
+#synonyms { margin: 0 10px 0 10px; border:0; color:#571512;} 
+.syno {}
+.resultsBar {text-align:right; margin: 2px 10px 2px 10px; border:0;}
+
+#resultsTab thead {background-color: #075993; color:#FFFFFF; margin: 0px 10px 0px 10px;} */
+#resultsTab th {
+        background-color: #075993;
+        color:#FFFFFF;
+        padding: 3px 10px 3px 10px;
+}
+#resultsTab td {
+        color:#333333;
+        /* line-height:1.5; */
+        padding: 5px 10px 5px 10px;
+}
+/* #resultsTab tbody {vertical-align:baseline; } */
+
+.ndgem {font-weight:bold}
+tr.rowlo {background: #eeeeee;
+border-top:1px;
+border-bottom:1px;
+border-bottom-color:#FFFFFF;
+border-top-color:#000000;
+}
+tr.rowhi {
+border-top:1px;
+border-bottom:1px;
+border-bottom-color:#FFFFFF;
+border-top-color:#000000;
+}
+
 /* And now the footer */
 #Footer  { color: #999999; background-color: #eeeeee; margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; clear: both; border-top: 2px solid #333333; margin-top:10px; font-size:80%; border-bottom: 2px solid #333333;}

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

@@ -48 +48 @@
     
     
-    <div py:def="Spatial(bbox)">
+    <div py:def="Spatial(bbox,h)">
         <!-- Currently this only shows the first bounding box -->
         <table py:if="bbox.nboxes==1"><tbody>
-            <tr><td colspan="2" class="cellhead">Spatial coverage</td></tr>
+            <tr py:if="h==1"><td colspan="2" class="cellhead">Spatial coverage</td></tr>
             <tr><td colspan="2" align="center">${bbox.boxes[0][0]}</td></tr>
             <tr><td align="center">${bbox.boxes[0][1]}</td><td align="center">${bbox.boxes[0][2]}</td></tr>
@@ -63 +63 @@
         <table cellspacing="0" cellpadding="3" border="0" width="100%"><tbody>
             <tr><td class="linehead" colspan="2"><span class="heading0"> Data Coverage</span> </td></tr>
-            <tr><td><div py:replace="Spatial(bbox)"/></td>
+            <tr><td><div py:replace="Spatial(bbox,1)"/></td>
                 <td><table><tr><td colspan="2" class="cellhead"> Temporal coverage</td></tr>
                            <tr><td> Start Date: ${timcov[0]}</td><td>End Date: ${timcov[1]}</td></tr>
@@ -92 +92 @@
     </div>
     
+    <!--- Create that little list of service icons on the result page -->
+    <span py:def="serviceIcons(sL)">
+        <span py:for="s in sL">
+            <?python
+            t=s.contentType
+            if t=='': t='R'
+            try:
+                icon={'NDG_A_SERVICE':g.icons_A,
+                    'NDG_B_SERVICE':g.icons_B,
+                    'DISCOVERY':g.icons_D,
+                    'R':g.icons_R}[t]
+            except:
+                icon=g.icons_R
+            ?>
+            <span py:replace="linkimage(s.url,icon,s.description)"/>
+        </span>
+    </span> 
+    
+    <!--- Easy shortening of text for result pages, should use ajax to expand -->
+    <span py:def="abbreviate(text,L,url)">
+        <?python
+        if len(text)<L:
+            more=''
+        else:
+            if url:
+                more='&nbsp;<a href="%s">(more)</a>'%url
+            else: more='...'
+        ?>
+        ${text[0:L]}${XML(more)}
+    </span>
+    
+    <span py:def="result(i,d)">
+        <tr class="${i%2 and 'rowhi' or 'rowlo'}">
+            <td>
+                <span py:if="d.briefCitation!=''">
+                    <span class="ndgem">Citation:</span> ${d.briefCitation}</span>
+                <span class="ndgem"> Title:</span>
+                    <span py:replace="abbreviate(d.name,70,0)"/>
+                <br/>
+                <span class="ndgem"> Abstract:</span>
+                    <span py:replace="abbreviate(d.abstract,200,d.binding.url)"/>
+                <br/>
+                <span class="ndgem"> Sourced from:</span>${XML(d.centre.url())}
+                &nbsp;<span class="ndgem">Links:</span>
+                <span py:replace="serviceIcons([d.binding])"/>
+                <span py:replace="serviceIcons(d.services)"/>
+            </td><td>
+                <span py:if="d.timeCoverage[0] not in [None,'','Unknown']"> ${d.timeCoverage[0]}</span>
+            </td><td>
+                <span py:if="d.timeCoverage[0] not in [None,'','Unknown']"> ${d.timeCoverage[1]}</span>
+            </td><td>
+                <div py:replace="Spatial(d.bbox,0)"/>
+            </td>
+        </tr>
+    </span>
+    
 </html>