Changeset 8499 for mauRepo/MolesManager


Ignore:
Timestamp:
08/08/12 17:00:47 (7 years ago)
Author:
gparton
Message:

now deals with Obs and ObsCollection? GUIDs properly in URLs

Location:
mauRepo/MolesManager/trunk/cedaMoles/MolesManager
Files:
2 edited

Legend:

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

    r8497 r8499  
    1919) 
    2020 
    21 urlpatterns += patterns('MolesManager.views.cedaObservationView', 
     21#urlpatterns += patterns('MolesManager.views.cedaObservationView', 
     22# 
     23#    (r'cov/(\d+)$', 'objView'), 
     24#) 
    2225 
    23     (r'cov/(\d+)$', 'objView'), 
    24 ) 
    25  
    26 urlpatterns += patterns('MolesManager.views.cedaObservationCollectionView', 
    27  
    28     (r'cov2/(\d+)$', 'objView'), 
    29 ) 
     26#urlpatterns += patterns('MolesManager.views.cedaObservationCollectionView', 
     27# 
     28#    (r'cov2/(\d+)$', 'objView'), 
     29#) 
    3030 
    3131urlpatterns += patterns('MolesManager.views.cedaSearch', 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedacat.py

    r8486 r8499  
    55''' 
    66 
    7 from django.shortcuts import redirect 
     7#from django.shortcuts import redirect 
    88 
    99from cedaMoles.MolesManager.views import cedaObservationView 
     10from cedaMoles.MolesManager.views import cedaObservationCollectionView 
     11 
    1012from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    1113 
     
    1315    ceda_guid = request.moles3EPB.search(CedaGUID, guid) 
    1416    if ceda_guid and ceda_guid.ceda_observation: 
    15         return redirect(cedaObservationView.objView, ceda_guid.ceda_observation) 
     17        return cedaObservationView.objView(request, ceda_guid.ceda_observation) 
     18        #return redirect(cedaObservationView.objView, ceda_guid.ceda_observation) 
    1619 
    1720    if ceda_guid and ceda_guid.ceda_observationcollection: 
     21        return cedaObservationCollectionView.objView(request, ceda_guid.ceda_observationcollection) 
    1822        #return redirect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection) 
     23        #return cedaObservationCollectionView.objView(request, ceda_guid.ceda_observationcollection) 
     24        print "ObsCol" 
    1925        pass 
    20  
     26#    if ceda_guid and ceda_guid.ceda_project: 
     27#         
     28#        pass 
     29#    if ceda_guid and ceda_guid.ceda_process: 
     30#         
     31#        pass 
     32#    if ceda_guid and ceda_guid.ceda_computation: 
     33#         
     34#        pass 
     35#    if ceda_guid and ceda_guid.ceda_composite: 
     36#         
     37#        pass 
     38#    if ceda_guid and ceda_guid.ceda_aquisition: 
     39#         
     40#        pass 
     41#    if ceda_guid and ceda_guid.ceda_instrument: 
     42#         
     43#        pass 
     44#    if ceda_guid and ceda_guid.ceda_platform: 
     45#         
     46#        pass 
     47     
    2148    raise Exception("Cannot find object associated with: " + guid) 
Note: See TracChangeset for help on using the changeset viewer.