Changeset 8511

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:

• hpfos/HPFos/osImpl/myimpl.py (modified) (3 diffs)
• hpfos/HPFos/settings.py (modified) (2 diffs)
• hpfos/__init__.py (modified) (1 diff)
• resources/wsgi.py (modified) (1 diff)

mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py

@@ -51 +51 @@
 from ea_model.ceda_metadatamodel.ceda_result.ceda_result import CEDA_Result
 from ceda_markup.opensearch.os_param import OSParam
-from hpfos import __version__
+from hpfos import __version__, __revision__
 
 GUID = 'guid'
@@ -60 +60 @@
 DUMMY_GUID = 'dummy_guid'
 
-HPFos_TITLE = 'Discovery feed for Search Services (v. %s)' % (__version__)
+HPFos_VERSION = __version__
+HPFos_REVISION = __revision__
+CEDA_TITLE = 'ceda_title'
+
+HPFos_ID = ''
+if HPFos_REVISION != 'REVISION': 
+    HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, HPFos_REVISION)
+else:
+    HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, 'unknown')
+    
+HPFos_TITLE = 'Discovery feed for Search Services %s' % (HPFos_ID)
 
 
@@ -182 +192 @@
         if hasattr(cedaObj, 'identifier'):
             for ident in cedaObj.identifier:
-                if ident.authority.title == HPFos_TITLE:
+                if ident.authority.title == CEDA_TITLE:
                     return ident.code  
 

mauRepo/HPFos/trunk/hpfos/HPFos/settings.py

@@ -1 +1 @@
 # Django settings for HPFos project.
 import os
-from osImpl.hpfos_conf import setUp
+from hpfos.HPFos.osImpl.hpfos_conf import setUp
 
 def decodeRelativePath(relPath):
@@ -111 +111 @@
 )
 
-ROOT_URLCONF = 'HPFos.urls'
+ROOT_URLCONF = 'hpfos.HPFos.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'HPFos.wsgi.application'
+WSGI_APPLICATION = 'hpfos.HPFos.wsgi.application'
 
 TEMPLATE_DIRS = (

mauRepo/HPFos/trunk/hpfos/__init__.py

@@ -1 +1 @@
 __version__ = '1.0.0-SNAPSHOT'
+__revision__ = 'REVISION'

mauRepo/HPFos/trunk/resources/wsgi.py

@@ -26 +26 @@
 # Add each new site-packages directory.
 for directory in ALLDIRS:
-  site.addsitedir(directory)
+    site.addsitedir(directory)
 
 # Reorder sys.path so new directories at the front.