Changeset 8289

Timestamp:

23/04/12 16:44:17 (9 years ago)

Author:

gparton

Message:

amendments to search page files

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• static/js/cedaSearch.js (modified) (1 diff)
• static/templates/cedaSearchResults.html (modified) (1 diff)
• views/cedaSearch.py (modified) (2 diffs)

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

@@ -1 @@
-define(['dojo'], function(dojo){
-        console.log("loads cedaSearch.js")
-   // function <nameOfFunction>(parameter, parameter2..etc coming in){
-   //    write operations to prepare value to return
-   //     
-   //    return(<value>);
-   //      }
+'''
+Created on 1 Nov 2011
 
-        require(['dojo/ready', 'dojo/parser', 'dijit/registry', 'dojo/_base/json', 'dojo/store/Memory',
-                 'dijit/Tree', 'dijit/form/Button'], function(ready, parser, registry, Tree){
-                 ready(function () {
-                         
-                         //----------------------------------------------
-                         //----- Initializes the necessary widgets ------
-                         //----------------------------------------------
-                         //var obs_id = new dijit.form.TextBox({
-                        //       value: '' /* no or empty value! */
-                         //}, 'obs_id');
-                         //obs_id.startup();
-                         
-                         var button = new dijit.form.Button({
-                                 type: "submit",
-                         label: "Search",
-                        // onClick: function(){ console.log("First button was clicked!"); }
-                     }, "search_obs");
-                     button.startup();
-                         
-                         var records_dataLineage = new dijit.form.Textarea({
-                                 value: ""
-                         }, "records_dataLineage");
-                         records_dataLineage.startup(); 
+@author: mnagni
+'''
+from django.shortcuts import render_to_response, redirect
+from django.core.context_processors import csrf
+from MolesManager.views import cedaObservationView
+from MolesManager.ceda_guid import CedaGUID
+from MolesManager.moles3epb import Moles3EPB
 
-                         //----------------------------------------------
-                         //---------- Loads the widgets values ----------
-                         //----------------------------------------------
-                                 
-                         var json = dojo.byTitle('coSearch_id').value;
-                                 var coObs = dojo.fromJson(json);
-                                 dojo.attr("title_id", 'value', '');
-                 });                                      
-        });
-});
 
+"""
+def __getResponseByGuid(request, guid):
+    ceda_guid = Moles3EPB.search(CedaGUID, guid, request.moles_session)
+    if ceda_guid and ceda_guid.ceda_observation:
+        return redirect(cedaObservationView.coView, ceda_guid.ceda_observation)
+"""
+
+def __doSearch(request, keywords):
+    '''
+    @param request: an HttpRequest
+    @param keywords: an list of strings 
+    @return: the first Observation or None 
+    '''    
+    obsevations = Moles3EPB.extractObservationByTitleKeywords(keywords, request.moles_session)      
+    titles = [] 
+    for o in obsevations:
+      titles.append(o.identifier[0].authority.title)
+    #return obsevations.first()
+    return titles
+
+
+def coSearch(request):
+    c = {}    
+    if 'searchTerm' in request.POST:
+        c['searchResults'] = __doSearch(request, request.POST['searchTerm'])
+            
+    c.update(csrf(request))
+    if c == {} :
+        print "AAA"
+        return render_to_response('cedaObservation.html', c)  
+    else :
+        print "BBB"
+        found = False
+        try:
+                a = c['searchResults']
+                found = True
+        except Exception, ex:
+                pass
+        #for a in c:
+        #       b=c[a]
+        #       print "b=", b, "a=", a
+        #       if a != "csrf_token":
+        #               print b.result
+        #       #if b.hasattr("__key__"):
+        #       #       print b.__key__
+        if not found:
+                return render_to_response('cedaSearch.html', c)
+        return render_to_response('cedaSearchResults.html', c)

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

@@ -14 +14 @@
                 {% csrf_token %}
         <div id="searchResults">
+        <ol>
         {% for result in searchResults %}
-                <li>{{ result.identifier[0].authority.title }}</li>
+                <li><a href="{{ result }}">{{ result }}</a></li>
         {% endfor %}
+        </ol>
         </div> <!-- End of div myForm -->
 </div> <!-- End of div claro -->

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

@@ -20 +20 @@
 def __doSearch(request, keywords):
     '''
-    @param request: an HttpRequest
-    @param keywords: an list of strings 
-    @return: the first Observation or None 
-    '''    
-    obsevations = Moles3EPB.extractObservationByTitleKeywords(keywords, request.moles_session)        
-    return obsevations.first()
+        @param request: an HttpRequest
+        @param keywords: an list of strings 
+        @return: the first Observation or None 
+        '''
+    obsevations = Moles3EPB.extractObservationByTitleKeywords(keywords, request.moles_session)      
+    titles = []
+    ids = []
+    baseCov = "http://127.0.0.1:8000/cov/"
+    for o in obsevations:
+        titles.append("".join(
+                    [baseCov,
+                     str(o.id)#,
+                     #'">',
+                    #o.identifier[0].code,
+                    ]))
+        ids.append(o.id)
+    #return obsevations.first()
+    return titles
 
 
@@ -31 +43 @@
     c = {}    
     if 'searchTerm' in request.POST:
-        c['records'] = __doSearch(request, request.POST['searchTerm'])
+        c['searchResults'] = __doSearch(request, request.POST['searchTerm'])
             
     c.update(csrf(request))
     if c == {} :
+        print "AAA"
         return render_to_response('cedaObservation.html', c)  
     else :
-        return render_to_response('cedaSearch.html', c)
+        print "BBB"
+        found = False
+    try:
+        a = c['searchResults']
+        found = True
+    except Exception, ex:
+        pass
+    #for a in c:
+    #    b=c[a]
+    #    print "b=", b, "a=", a
+    #    if a != "csrf_token":
+    #        print b.result
+    #    #if b.hasattr("__key__"):
+    #    #    print b.__key__
+    if not found:
+            return render_to_response('cedaSearch.html', c)
+    return render_to_response('cedaSearchResults.html', c)