Changeset 2760 for TI05-delivery/ows_framework

Timestamp:

03/08/07 12:02:01 (14 years ago)

Author:

lawrence

Message:

Adding help to results page. Adding initial support for semantic search.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/routing.py (modified) (1 diff)
• controllers/discovery.py (modified) (2 diffs)
• public/layout/ndg2.css (modified) (2 diffs)
• templates/meta.kid (modified) (1 diff)
• templates/ndgPage.kid (modified) (2 diffs)
• templates/results.kid (modified) (2 diffs)

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

@@ -41 +41 @@
     map.connect('wayf', controller='login', action='wayf')
     map.connect('logout', controller='logout')
+    map.connect('semantic',controller='discovery', action='semantic')
     map.connect('view/:uri', controller = 'retrieve', action='view')
     map.connect('askCorrect/:uri', controller='retrieve', action='askCorrect')

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

@@ -183 +183 @@
                     c.state=state
                     c.difs=difs
+                    c.querystring='searchString=%s&textTarget=%s'%(request.params['searchString'],request.params['textTarget'])
                     return render_response('results')
                 
@@ -247 +248 @@
         return constraints(dateRange=dateRange,bbox=bbox,scope=scope,searchString=searchString)
         
-    def oneLineSearch(self):
-        try:
-            discoveryURL=self.cf.get('SEARCH','discoveryURL')
-            oneLiner=DiscoveryTemplate.oneLiner
-        except:
-            return 'Error, invalid configuration for search interface'
-        return DiscoveryTemplate.searchTextOneLine%locals()  
+    #def oneLineSearch(self):
+    #    try:
+    #        discoveryURL=self.cf.get('SEARCH','discoveryURL')
+    #        oneLiner=DiscoveryTemplate.oneLiner
+    #    except:
+    #        return 'Error, invalid configuration for search interface'
+    #    return DiscoveryTemplate.searchTextOneLine%locals()  
+    
+    def semantic(self):
+        c.constraints=request.environ['QUERY_STRING']
+        return render_response('semantic',fragment=True)

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

@@ -37 +37 @@
 }
 
-.searchBar {margin-top: 2px; background-color:  #f0f0f0; font-weight:bold;}
-.searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;}
+.searchBar {margin-top: 2px; background-color:  #f0f0f0; }
+.searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;font-weight:bold;}
+.searchBar .hidden {display:none}
 /* .searchOneLine {margin-top: 2px; margin-bottom: 2px; background-color: #f0f0f0; text-align:right; font-size:100%;} */
 
@@ -147 +148 @@
 
 
-#context { margin: 0 10px 0 10px; border:0; color:#571512;} 
-#synonyms { margin: 0 10px 0 10px; border:0; color:#571512;} 
-.syno {}
+#context { margin: 5px 10px 5px 10px; border:0; color:#571512;}
+#SemanticSearchBox{margin: 0px 0px 0px 0px; border:0} 
+#SemanticSearchResults { margin: 5px 10px 5px 10px; border:0; color:#571512;} 
 .resultsBar {text-align:right; margin: 2px 10px 2px 10px; border:0;}
+.resultsBar .hidden {display:none;}
+.resultsBar .resultsLeft {float:left}
 
 #resultsTab thead {background-color: #075993; color:#FFFFFF; margin: 0px 10px 0px 10px;} 

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

@@ -134 +134 @@
                     <span py:replace="abbreviate(d.abstract,200,d.binding.url)"/>
                 <br/>
-                <span class="ndgem"> Sourced from:</span>${XML(d.centre.url())}
+                <span class="ndgem"> Sourced from:</span>&nbsp;${XML(d.centre.url())}
                 &nbsp;<span class="ndgem">Links:</span>
                 <span py:replace="serviceIcons([d.binding])"/>

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

@@ -40 +40 @@
         <table width="100%"><tr><td align="left">
         <form action="$g.discoveryURL">
-        Free Text Search&nbsp;<input type="text" size="25" name="searchString"/>
+            New Text Search<span py:replace="helpIcon('nts_help')"/>&nbsp;
+            <input type="text" size="25" name="searchString"/>
             <select name="textTarget">
             <option value="Authors">Authors</option>
@@ -54 +55 @@
             <span py:replace="logIn()"/></span>
           </td></tr></table>
+          <div id="nts_help" class="hidden">
+            <div class="helptxt"><p> This will do a completely new text search with no constraints beyond the target of the
+            text search from the drop down list (All, Authors, Parameters) </p></div>
+          </div>
     </div>
 

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

@@ -15 +15 @@
             <div id="context">
                 ${c.state.hits} results for ${c.state.searchString} (${XML(c.state.constraints)})</div>
-            <div py:if="c.state.alternatives is not None" id="synonyms">
-                You could also try:
-                <span py:for="i in c.state.alternatives" class="syno">$i[0] [$i[1] hits]</span>
-            </div>
+            <div id="SemanticSearchBox"/>
             
             <?python
@@ -26 +23 @@
             upper=c.state.offset+c.state.stride-1
             ?>
-            <div class="resultsBar">
-                <a href="${c.state.constrainedurl}"> Refine search</a> 
+            <div class="resultsBar"> 
+                 <div class="resultsLeft">
+                    ${XML(h.link_to_remote("Semantic Search",dict(update="SemanticSearchBox",
+                            url='%s?%s'%(h.url_for(action='semantic'),c.querystring))))}
+                    <span py:replace="helpIcon('semser_help')"/>
+                 </div>
+                 <div>
+                 <a href="${c.state.constrainedurl}"> Refine Search</a><span py:replace="helpIcon('refser_help')"/>
                 | Found ${c.state.hits} | Showing ${c.state.offset}-$upper 
                   <span py:if="p!=[]"> | <a href="$purl"> Previous ${p[1]}</a> </span>
-                  <span py:if="n!=[]"> | <a href="$nurl"> Next ${n[1]}</a></span> |
+                  <span py:if="n!=[]"> | <a href="$nurl"> Next ${n[1]}</a></span> | </div>
+                <div id="semser_help" class="hidden">
+                    <div class="helptxt"><p>
+                    The semantic search option allows you to see how many hits a search using your current parameters would return if you
+                    used a slightly different vocabulary in your search term.
+                    </p></div>
+                </div>
+                <div id="refser_help" class="hidden">
+                    <div class="helptxt"><p>
+                    The refined search option allows you to constrain your search by returning you to the advanced search page, but retaining your current search parameters
+                    </p></div>
+                </div>
             </div>
             <div id="resultsTab">
                 <table>
-                    <thead><tr><th rowspan="2">Dataset description</th><th colspan="2">Temporal coverage</th>
+                    <thead><tr><th rowspan="2">Dataset description</th><th colspan="2">Temporal&nbsp;coverage</th>
                         <th rowspan="2">Spatial coverage</th></tr>
                     <tr><th> Start date </th><th> End date </th></tr></thead>