Changeset 8515
- Timestamp:
- 13/08/12 15:27:06 (8 years ago)
- Location:
- mauRepo/HPFos/trunk/hpfos/HPFos
- Files:
-
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/HPFos/trunk/hpfos/HPFos/moles3epb.py
r8505 r8515 38 38 from sqlalchemy import Table, Column, ForeignKey, Integer, String 39 39 from sqlalchemy.orm import mapper 40 from ceda_guid import CedaGUID40 from hpfos.HPFos.ceda_guid import CedaGUID 41 41 from sqlalchemy.orm.util import identity_key 42 42 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox -
mauRepo/HPFos/trunk/hpfos/HPFos/molesSessionMiddleware.py
r8500 r8515 32 32 ''' 33 33 from hpfos.libs.commons_db import DbManager 34 from moles3epb import Moles3EPBFactory 35 from settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 34 from hpfos.HPFos.settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 36 35 from django.core.context_processors import csrf 37 36 from django.shortcuts import render_to_response 38 37 from sqlalchemy.exc import SQLAlchemyError 38 from hpfos.HPFos.moles3epb import Moles3EPBFactory 39 39 40 40 class MolesSessionMiddleware(object): -
mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/hpfos_conf.py
r8466 r8515 31 31 @author: Maurizio Nagni 32 32 ''' 33 from myimpl import MyOSQuery, MyOSAtomResponse34 33 from ceda_markup.opensearch.os_request import OpenSearchDescription 35 34 from ceda_markup.opensearch.os_engine import OSEngine 35 from hpfos.HPFos.osImpl.myimpl import MyOSQuery, MyOSAtomResponse 36 36 37 37 def setUp(): -
mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py
r8511 r8515 60 60 DUMMY_GUID = 'dummy_guid' 61 61 62 HPFos_VERSION = __version__63 HPFos_REVISION = __revision__64 62 CEDA_TITLE = 'ceda_title' 65 66 HPFos_ID = '' 67 if HPFos_REVISION != 'REVISION': 68 HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, HPFos_REVISION) 63 HPFOS_VERSION = __version__ 64 HPFOS_REVISION = __revision__ 65 66 HPFOS_ID = '' 67 if HPFOS_REVISION != 'REVISION': 68 HPFOS_ID = '(v. %s rev. %s)' % (HPFOS_VERSION, HPFOS_REVISION) 69 69 else: 70 HPF os_ID = '(v. %s rev. %s)' % (HPFos_VERSION, 'unknown')70 HPFOS_ID = '(v. %s rev. %s)' % (HPFOS_VERSION, 'unknown') 71 71 72 HPF os_TITLE = 'Discovery feed for Search Services %s' % (HPFos_ID)72 HPFOS_TITLE = 'Discovery feed for Search Services %s' % (HPFOS_ID) 73 73 74 74 … … 130 130 131 131 132 return Result(count, start_index, start_page, tot_results, subresult = subresults, title=HPF os_TITLE)132 return Result(count, start_index, start_page, tot_results, subresult = subresults, title=HPFOS_TITLE) 133 133 134 134 def generateEntryLinks(self, entry, atomroot, path, linkid = None):
Note: See TracChangeset
for help on using the changeset viewer.