Changeset 8511


Ignore:
Timestamp:
10/08/12 19:49:19 (7 years ago)
Author:
mnagni
Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534
inconsistent import for settings.py

Location:
mauRepo/HPFos/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py

    r8509 r8511  
    5151from ea_model.ceda_metadatamodel.ceda_result.ceda_result import CEDA_Result 
    5252from ceda_markup.opensearch.os_param import OSParam 
    53 from hpfos import __version__ 
     53from hpfos import __version__, __revision__ 
    5454 
    5555GUID = 'guid' 
     
    6060DUMMY_GUID = 'dummy_guid' 
    6161 
    62 HPFos_TITLE = 'Discovery feed for Search Services (v. %s)' % (__version__) 
     62HPFos_VERSION = __version__ 
     63HPFos_REVISION = __revision__ 
     64CEDA_TITLE = 'ceda_title' 
     65 
     66HPFos_ID = '' 
     67if HPFos_REVISION != 'REVISION':  
     68    HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, HPFos_REVISION) 
     69else: 
     70    HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, 'unknown') 
     71     
     72HPFos_TITLE = 'Discovery feed for Search Services %s' % (HPFos_ID) 
    6373 
    6474 
     
    182192        if hasattr(cedaObj, 'identifier'): 
    183193            for ident in cedaObj.identifier: 
    184                 if ident.authority.title == HPFos_TITLE: 
     194                if ident.authority.title == CEDA_TITLE: 
    185195                    return ident.code   
    186196 
  • mauRepo/HPFos/trunk/hpfos/HPFos/settings.py

    r8508 r8511  
    11# Django settings for HPFos project. 
    22import os 
    3 from osImpl.hpfos_conf import setUp 
     3from hpfos.HPFos.osImpl.hpfos_conf import setUp 
    44 
    55def decodeRelativePath(relPath): 
     
    111111) 
    112112 
    113 ROOT_URLCONF = 'HPFos.urls' 
     113ROOT_URLCONF = 'hpfos.HPFos.urls' 
    114114 
    115115# Python dotted path to the WSGI application used by Django's runserver. 
    116 WSGI_APPLICATION = 'HPFos.wsgi.application' 
     116WSGI_APPLICATION = 'hpfos.HPFos.wsgi.application' 
    117117 
    118118TEMPLATE_DIRS = ( 
  • mauRepo/HPFos/trunk/hpfos/__init__.py

    r8509 r8511  
    11__version__ = '1.0.0-SNAPSHOT' 
     2__revision__ = 'REVISION' 
  • mauRepo/HPFos/trunk/resources/wsgi.py

    r8348 r8511  
    2626# Add each new site-packages directory. 
    2727for directory in ALLDIRS: 
    28   site.addsitedir(directory) 
     28    site.addsitedir(directory) 
    2929 
    3030# Reorder sys.path so new directories at the front. 
Note: See TracChangeset for help on using the changeset viewer.