Changeset 8473 for mauRepo/MolesManager/trunk

Timestamp:

20/07/12 12:28:05 (9 years ago)

Author:

gparton

Message:

Updated search page to give something a little more meaningful in the results. Now has the title field as a link to the appropriate object with the description below.

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• settings.py (modified) (1 diff)
• static/templates/cedaSearchResults.html (modified) (1 diff)
• views/cedaSearch.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/settings.py

@@ -1 +1 @@
 # Django settings for MolesManager project.
 import os
+
 
 def decodeRelativePath(relPath):

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

@@ -28 +28 @@
             <thead>
                 <tr>
-                    <th>Location</th>
-                    <th>Id</th>
-                    <th>Author</th>
+                    <th>Title</th>
                 </tr>
             </thead>
         <tbody>  
-        {% for location, id, auth  in searchResults %}
+        {% for location, description, title  in searchResults %}
                 <tr bgcolor="white">
-                        <td>{{ location }}</td>
-                        <td><a href="{{ location }}">{{ id }}</a></td>
-                        <td>{{ auth }}</td>
+                        <td><a href="{{ location }}">{{ title }}</a></td>
+                </tr>
+                <tr bgcolor=#66CCFF>
+                        <td>{{ description }}</td>
                 </tr>   
         {% endfor %}

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

@@ -23 +23 @@
         @return: the first Observation or None 
         '''
-    obsevations = request.moles3EPB.extractObservationByTitleKeywords(keywords) 
+    observations = request.moles3EPB.extractObservationByTitleKeywords(keywords) 
     titles = []
     ids = []
     list_list = []
     baseCov = "http://" + request.get_host() + "/cov/"
-    for o in obsevations:
+    for o in observations:
         a = "".join([baseCov, str(o.id)])
         try:
-            responsibleAuthors = request.moles3EPB.observationAuthor(o)
-            if responsibleAuthors is not None:
-                list_list.append((a, o.description, _appendAuthors(responsibleAuthors)))
+            if o.identifier[0].code is not None:
+                list_list.append((a, o.identifier[0].code, o.description))
         except Exception as e:
             print e