Changeset 8515

Timestamp:

13/08/12 15:27:06 (7 years ago)

Author:

mnagni

Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534
Corrects import mistakes

Location:

mauRepo/HPFos/trunk/hpfos/HPFos

Files:

• moles3epb.py (modified) (1 diff)
• molesSessionMiddleware.py (modified) (1 diff)
• osImpl/hpfos_conf.py (modified) (1 diff)
• osImpl/myimpl.py (modified) (2 diffs)
• testepb.py (deleted)

mauRepo/HPFos/trunk/hpfos/HPFos/moles3epb.py

@@ -38 +38 @@
 from sqlalchemy import Table, Column, ForeignKey, Integer, String
 from sqlalchemy.orm import mapper
-from ceda_guid import CedaGUID
+from hpfos.HPFos.ceda_guid import CedaGUID
 from sqlalchemy.orm.util import identity_key
 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox

mauRepo/HPFos/trunk/hpfos/HPFos/molesSessionMiddleware.py

@@ -32 +32 @@
 '''
 from hpfos.libs.commons_db import DbManager
-from moles3epb import Moles3EPBFactory
-from settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT
+from hpfos.HPFos.settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT
 from django.core.context_processors import csrf
 from django.shortcuts import render_to_response
 from sqlalchemy.exc import SQLAlchemyError
+from hpfos.HPFos.moles3epb import Moles3EPBFactory
 
 class MolesSessionMiddleware(object):

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

@@ -31 +31 @@
 @author: Maurizio Nagni
 '''
-from myimpl import MyOSQuery, MyOSAtomResponse
 from ceda_markup.opensearch.os_request import OpenSearchDescription
 from ceda_markup.opensearch.os_engine import OSEngine
+from hpfos.HPFos.osImpl.myimpl import MyOSQuery, MyOSAtomResponse
 
 def setUp(): 

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

@@ -60 +60 @@
 DUMMY_GUID = 'dummy_guid'
 
-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)
+HPFOS_VERSION = __version__
+HPFOS_REVISION = __revision__
+
+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_ID = '(v. %s rev. %s)' % (HPFOS_VERSION, 'unknown')
     
-HPFos_TITLE = 'Discovery feed for Search Services %s' % (HPFos_ID)
+HPFOS_TITLE = 'Discovery feed for Search Services %s' % (HPFOS_ID)
 
 
@@ -130 +130 @@
         
         
-        return Result(count, start_index, start_page, tot_results, subresult = subresults, title=HPFos_TITLE)
+        return Result(count, start_index, start_page, tot_results, subresult = subresults, title=HPFOS_TITLE)
         
     def generateEntryLinks(self, entry, atomroot, path, linkid = None):