Changeset 8275 for mauRepo/MolesManager

Timestamp:

20/04/12 15:44:40 (8 years ago)

Author:

gparton

Message:

amendments to search function on base.html, update of search page and modification to display

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• static/js/cedaObservation.js (modified) (1 diff)
• static/templates/base.html (modified) (3 diffs)
• static/templates/index.html (modified) (1 diff)
• urls.py (modified) (2 diffs)
• views/cedaSearch.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

@@ -51 +51 @@
                 pubDetails['pubMonth'] = timeLead0(coObs.resultTime.position.dateTime8601.month)
                 pubDetails['pubDay'] = timeLead0(coObs.resultTime.position.dateTime8601.day)
-                pubDetails['pubString'] = '<p> Record Status: <b>'+ pubDetails['pubType'] +'</b><br /> Created: <b>' + pubDetails['pubYear'] +'-'+ pubDetails['pubMonth'] + '-' + pubDetails['pubDay']+'</b></p>';
+                pubDetails['pubString'] = '<p> Record Status: <b>'+ pubDetails['pubType'] +'</b><br /> Available: <b>' + pubDetails['pubYear'] +'-'+ pubDetails['pubMonth'] + '-' + pubDetails['pubDay']+'</b></p>';
                 return pubDetails
         }

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

@@ -70 +70 @@
                 
                 <div class="header-bottom">
-                        <div class="grid_4 push_8">
+                        <div class="grid_9 push_3">
                 
                                         <script type="text/javascript">
@@ -98 +98 @@
                                         {% csrf_token %}
         
-                                                <div class="fieldWrapper claro">
+                                        <!--    <div class="fieldWrapper claro">
                                                         <label for="id_obj_id">Search:</label>
                                                         <input type="text" name="searchTerm" value= ""
@@ -106 +106 @@
                                                 
                                                 </div> <!-- End of div fieldWrapper -->
-                                                <div id="advancedSearch"><p><a href="/search">+Advanced Search</a></p></div>
-                                        
-                                        </div> <!-- End of div myForm -->                               
+                                        <form method=POST name="searchAll" action="http://badc.nerc.ac.uk/cgi-bin/search/select_search">
+                                        <input type="hidden" name=badc_only value="n">
+                                        <input type="hidden" name=year value="any">
+                                        <center>
+                                        <table border=0 >
+
+                                        <tr>
+                                                <td><b>Search for:</b></td>
+                                                <td><input name="SEARCH_STRING" type="text" size="25" maxlength="50"></td>
+                                                <td nowrap><b>in: &nbsp; </b></td><td> CEDA <input type="radio" name="SEARCH_WHAT" checked value="BROWSE" /> &nbsp; <input type="radio" name="SEARCH_WHAT" value="DISCOVERY" />  NERC Data Catalogue Service <INPUT TYPE="SUBMIT" VALUE="Search"></td>
+                                        </tr>
+                                        </table>
+                                        </center>
+                                </div> <!-- End of div myForm -->
+                                
                         </div> <!-- End of div grid_4 push_8 -->
-                        
+                        <!-- <div id="advancedSearch" class="grid_3 push8"><p><a href="/search">+Advanced Search</a></p></div>
+                        -->
                 </div> <!-- End of div header-bottom -->
         </div> <!-- End of div header -->

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/index.html

@@ -19 +19 @@
                 <div id="box2" class="grid_5"> 
                 <h3>Using this Catalogue</h3>
-           <p>This catalogue is still in its development stage and content may occasionally change and be un-available. Users wishing to explore CEDA's operational metadata catalogue shoudl go to: <a href="http://badc.nerc.ac.uk/discovery?searchString=tet&atomTypeID=All--All&searchTarget=Browse&textTarget=Atom">CEDA Data Catalogue</a></p>
+           <p>This catalogue is still in its development stage and content may occasionally change and be un-available. Users wishing to explore CEDA's operational metadata catalogue shoudl go to: <a href="http://badc.nerc.ac.uk/discovery?searchString=&atomTypeID=DE+-+NOT+YET+SET+UP--DE&searchTarget=Browse&textTarget=Atom">CEDA Data Catalogue</a></p>
            <p>This catalogue, however, has a finer data granularity  - i.e. has a more detail about the data in our archives - and will still enable users to discover and access data. The first step is to search for data using the search function on the top right of the screen. Entering a character string will search for matching text in the titles of the entries in the catalogue (other search options will be added in due course.</p>
            <h3>Further Information</h3>

mauRepo/MolesManager/trunk/src/MolesManager/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import patterns, url
 from settings import SERVE_STATIC_CONTENT, STATIC_ROOT
+from django.views.generic.simple import redirect_to
 
 # Uncomment the next two lines to enable the admin:
@@ -30 +31 @@
 urlpatterns += patterns('MolesManager.views.cedaSearch',
 
-    (r'search/$', 'coSearch'),
+    (r'search/$',  'coSearch'),
+     #redirect_to, {'url': 'http://www.ceda.ac.uk'}),#'coSearchRedirect'),
     )
 

mauRepo/MolesManager/trunk/src/MolesManager/views/cedaSearch.py

@@ -31 +31 @@
     c = {}    
     if 'searchTerm' in request.POST:
-        c['records'] = __doSearch(request, request.POST['searchTerm'])            
-    c.update(csrf(request))   
-    return render_to_response('cedaSearch.html', c)
+        c['records'] = __doSearch(request, request.POST['searchTerm'])
+        print c['records']            
+    c.update(csrf(request))
+    if c == {} :
+        return render_to_response('cedaObservation.html', c)  
+    else :
+        return render_to_response('cedaSearch.html', c)