Changeset 8503 for mauRepo/MolesManager


Ignore:
Timestamp:
09/08/12 16:01:07 (7 years ago)
Author:
gparton
Message:
 
Location:
mauRepo/MolesManager/trunk/cedaMoles/MolesManager
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/moles3epb.py

    r8502 r8503  
    329329        result = EPB.search(clazz, inst_id, self._session) 
    330330        ret = {} 
    331         for item in result: 
     331        for item in result.all(): 
    332332            guid = self.retrieveGUIDFromInstance(item) 
    333333            if guid is not None: 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/base.html

    r8430 r8503  
    7676                                                         'ceda/cedaObservation']); 
    7777                                        </script> 
    78  
    79                                         <input type="hidden" name="coObs" id="coObs_id" value='{{ coObs }}' /> 
     78                                         
    8079                                        <input type="hidden" name="guid" id="guid_id" value='{{ guid }}' /> 
    8180 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/cedaObservation.html

    r8278 r8503  
    1111     
    1212{% block main %} 
     13                                        <input type="hidden" name="coObs" id="coObs_id" value='{{ coObs }}' /> 
    1314 
    1415<script type="text/javascript"> 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/cedaSearchResults.html

    r8473 r8503  
    3232            </thead> 
    3333        <tbody>   
    34         {% for location, description, title  in searchResults %} 
     34        {% for location, title, description  in searchResults %} 
    3535                <tr bgcolor="white"> 
    36                         <td><a href="{{ location }}">{{ title }}</a></td> 
     36                        <td><a href="{{ location }}"><b>Title: </b>{{ title }}</a></td> 
    3737                </tr> 
    3838                <tr bgcolor=#66CCFF> 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/urls.py

    r8499 r8503  
    3333) 
    3434 
    35 urlpatterns += patterns('MolesManager.views.index', 
    36  
    37     (r'cov/$', 'home'), 
    38 ) 
     35#urlpatterns += patterns('MolesManager.views.index', 
     36# 
     37#    (r'cov/$', 'home'), 
     38#) 
    3939 
    4040urlpatterns += patterns('MolesManager.views.cedacat', 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaSearch.py

    r8486 r8503  
    55''' 
    66from django.core.context_processors import csrf 
    7 from django.shortcuts import render_to_response, redirect 
     7from django.shortcuts import render_to_response#, redirect 
    88from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    99import cedaObservationView 
     
    2424        ''' 
    2525    observations = request.moles3EPB.extractObservationByTitleKeywords(keywords)  
    26     titles = [] 
    27     ids = [] 
     26     
    2827    list_list = [] 
    29     baseCov = "http://" + request.get_host() + "/cov/" 
    30     for o in observations: 
    31         a = "".join([baseCov, str(o.id)]) 
     28    baseCov = "http://" + request.get_host() + "/" 
     29    for guid, o in observations.iteritems(): 
     30         
     31        a = "".join([baseCov, guid]) 
    3232        try: 
    3333            if o.identifier[0].code is not None: 
    3434                list_list.append((a, o.identifier[0].code, o.description)) 
     35                print a, o.identifier[0].code, o.description 
    3536        except Exception as e: 
    3637            print e 
Note: See TracChangeset for help on using the changeset viewer.