Changeset 8515


Ignore:
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:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/HPFos/trunk/hpfos/HPFos/moles3epb.py

    r8505 r8515  
    3838from sqlalchemy import Table, Column, ForeignKey, Integer, String 
    3939from sqlalchemy.orm import mapper 
    40 from ceda_guid import CedaGUID 
     40from hpfos.HPFos.ceda_guid import CedaGUID 
    4141from sqlalchemy.orm.util import identity_key 
    4242from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox 
  • mauRepo/HPFos/trunk/hpfos/HPFos/molesSessionMiddleware.py

    r8500 r8515  
    3232''' 
    3333from hpfos.libs.commons_db import DbManager 
    34 from moles3epb import Moles3EPBFactory 
    35 from settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 
     34from hpfos.HPFos.settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 
    3635from django.core.context_processors import csrf 
    3736from django.shortcuts import render_to_response 
    3837from sqlalchemy.exc import SQLAlchemyError 
     38from hpfos.HPFos.moles3epb import Moles3EPBFactory 
    3939 
    4040class MolesSessionMiddleware(object): 
  • mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/hpfos_conf.py

    r8466 r8515  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from myimpl import MyOSQuery, MyOSAtomResponse 
    3433from ceda_markup.opensearch.os_request import OpenSearchDescription 
    3534from ceda_markup.opensearch.os_engine import OSEngine 
     35from hpfos.HPFos.osImpl.myimpl import MyOSQuery, MyOSAtomResponse 
    3636 
    3737def setUp():  
  • mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py

    r8511 r8515  
    6060DUMMY_GUID = 'dummy_guid' 
    6161 
    62 HPFos_VERSION = __version__ 
    63 HPFos_REVISION = __revision__ 
    6462CEDA_TITLE = 'ceda_title' 
    65  
    66 HPFos_ID = '' 
    67 if HPFos_REVISION != 'REVISION':  
    68     HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, HPFos_REVISION) 
     63HPFOS_VERSION = __version__ 
     64HPFOS_REVISION = __revision__ 
     65 
     66HPFOS_ID = '' 
     67if HPFOS_REVISION != 'REVISION':  
     68    HPFOS_ID = '(v. %s rev. %s)' % (HPFOS_VERSION, HPFOS_REVISION) 
    6969else: 
    70     HPFos_ID = '(v. %s rev. %s)' % (HPFos_VERSION, 'unknown') 
     70    HPFOS_ID = '(v. %s rev. %s)' % (HPFOS_VERSION, 'unknown') 
    7171     
    72 HPFos_TITLE = 'Discovery feed for Search Services %s' % (HPFos_ID) 
     72HPFOS_TITLE = 'Discovery feed for Search Services %s' % (HPFOS_ID) 
    7373 
    7474 
     
    130130         
    131131         
    132         return Result(count, start_index, start_page, tot_results, subresult = subresults, title=HPFos_TITLE) 
     132        return Result(count, start_index, start_page, tot_results, subresult = subresults, title=HPFOS_TITLE) 
    133133         
    134134    def generateEntryLinks(self, entry, atomroot, path, linkid = None): 
Note: See TracChangeset for help on using the changeset viewer.