Changeset 8500 for mauRepo/HPFos
- Timestamp:
- 08/08/12 17:35:59 (9 years ago)
- Location:
- mauRepo/HPFos/trunk
- Files:
-
- 3 added
- 2 deleted
- 8 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/HPFos/trunk/.pydevproject
r8348 r8500 3 3 4 4 <pydev_project> 5 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER"> MolesManagerEnv</pydev_property>6 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2. 7</pydev_property>5 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">cedaManager</pydev_property> 6 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property> 7 7 <pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION"> 8 8 <key>DJANGO_MANAGE_LOCATION</key> 9 <value> src/HPFos/manage.py</value>9 <value>hpfos/HPFos/manage.py</value> 10 10 <key>DJANGO_SETTINGS_MODULE</key> 11 <value> HPFos.settings</value>11 <value>hpfos.HPFos.settings</value> 12 12 </pydev_variables_property> 13 13 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 14 <path>/HPFos /src</path>14 <path>/HPFos</path> 15 15 </pydev_pathproperty> 16 16 </pydev_project> -
mauRepo/HPFos/trunk/hpfos/HPFos/manage.py
r8346 r8500 4 4 5 5 if __name__ == "__main__": 6 os.environ.setdefault("DJANGO_SETTINGS_MODULE", " HPFos.settings")6 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hpfos.HPFos.settings") 7 7 8 8 from django.core.management import execute_from_command_line -
mauRepo/HPFos/trunk/hpfos/HPFos/moles3epb.py
r8470 r8500 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.epb import EPB33 from hpfos.libs.epb import EPB 34 34 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 35 35 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation … … 47 47 import logging 48 48 from logging import StreamHandler 49 from libs.postgisutil import create_st_setSRID, unifyGeometries,\49 from hpfos.libs.postgisutil import create_st_setSRID, unifyGeometries,\ 50 50 intersectGeometries 51 51 -
mauRepo/HPFos/trunk/hpfos/HPFos/molesSessionMiddleware.py
r8355 r8500 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.commons_db import DbManager33 from hpfos.libs.commons_db import DbManager 34 34 from moles3epb import Moles3EPBFactory 35 35 from settings import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT -
mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py
r8468 r8500 33 33 from xml.dom import minidom 34 34 from datetime import datetime 35 from libs.postgisutil import create_st_setSRID35 from hpfos.libs.postgisutil import create_st_setSRID 36 36 from ceda_markup.opensearch.osquery import OSQuery 37 37 from ceda_markup.opensearch.osParam import OSParam … … 115 115 if type(result) != CEDA_Result: 116 116 result_guid = context['moles3EPB'].retrieveGUIDFromInstance(result) 117 if result_guid is None: 118 continue 117 119 ititle = self._extractTitle(result) 118 120 item = Subresult(result_guid.id, ititle, result.description, datetime.now().isoformat()) -
mauRepo/HPFos/trunk/hpfos/HPFos/testepb.py
r8466 r8500 4 4 @author: mnagni 5 5 ''' 6 from libs.epb import EPB6 from hpfos.libs.epb import EPB 7 7 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 8 8 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation -
mauRepo/HPFos/trunk/hpfos/HPFos/view/view.py
r8466 r8500 31 31 @author: Maurizio Nagni 32 32 ''' 33 from HPFos.settings import os_engine34 from HPFos.osImpl.myimpl import COLLECTION, OBSERVATION, RESULT, GUID,\33 from hpfos.HPFos.settings import os_engine 34 from hpfos.HPFos.osImpl.myimpl import COLLECTION, OBSERVATION, RESULT, GUID,\ 35 35 DUMMY_GUID 36 36 from django.utils.safestring import mark_safe -
mauRepo/HPFos/trunk/hpfos/tests/testconfig.py
r8406 r8500 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.commons_db import DbManager34 from HPFos.moles3epb import Moles3EPBFactory35 from libs.epb import EPB36 MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3_dev1'37 POSTGIS_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3'38 33 39 from ea_model.sqlTables import doTables as doMoles, attachEvents 40 MOLES3_DB_SCRIPT = doMoles 34 import os 35 MOLES3_DB_CONNECTION = '' 36 37 if os.environ.has_key('MOLES3_DB_CONNECTION'): 38 MOLES3_DB_CONNECTION = os.environ['MOLES3_DB_CONNECTION'] 39 40 from ea_model.sqlTables import attachEvents, doTables 41 MOLES3_DB_SCRIPT = doTables 41 42 EVENTS_DB = attachEvents 42 43 """44 Represents the access to the Moles database.45 Creates from the existing db connections pools a new session46 to be used by all the DB operations involved in the actual HTTPRequest47 """48 molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT)49 test_moles3EPBFactory = Moles3EPBFactory(molesDB)50 51 52 def getMoles3EPB():53 return test_moles3EPBFactory.createEPB()54 55 def closeEPB(epb):56 epb.close()
Note: See TracChangeset
for help on using the changeset viewer.