Changeset 8486
- Timestamp:
- 06/08/12 17:01:38 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk
- Files:
-
- 1 added
- 53 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/MANIFEST.in
r8485 r8486 1 prune tests -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/db/after_flush.py
r8482 r8486 31 31 @author: mnagni 32 32 ''' 33 from MolesManager.db.partyIndexes import addPartyIndexes, deletePartyIndexes,\33 from cedaMoles.MolesManager.db.partyIndexes import addPartyIndexes, deletePartyIndexes,\ 34 34 updatePartyIndexes 35 35 from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/db/partyIndexes.py
r8482 r8486 31 31 @author: mnagni 32 32 ''' 33 from libs.epb import EPB33 from cedaMoles.libs.epb import EPB 34 34 from sqlalchemy import Table, Column, ForeignKey, Integer, String, event 35 35 from sqlalchemy.orm import mapper -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/forms/MapperView.py
r8088 r8486 18 18 import json 19 19 import inspect 20 from MolesManager.forms.formsFactory import convertColumnToFormField20 from cedaMoles.MolesManager.forms.formsFactory import convertColumnToFormField 21 21 22 22 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/forms/date.py
r8480 r8486 4 4 @author: mnagni 5 5 ''' 6 from MolesManager.forms.formsFactory import createFieldInstance6 from cedaMoles.MolesManager.forms.formsFactory import createFieldInstance 7 7 from django.forms.forms import Form 8 8 from sqlalchemy.orm.properties import ColumnProperty, RelationshipProperty -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/moles3epb.py
r8482 r8486 31 31 @author: mnagni 32 32 ''' 33 from libs.epb import EPB33 from cedaMoles.libs.epb import EPB 34 34 from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection 35 35 from ea_model.moles3_4.observation.mo_observation import MO_Observation 36 36 from sqlalchemy import Table, Column, ForeignKey, Integer, String, event 37 37 from sqlalchemy.orm import mapper 38 from MolesManager.ceda_guid import CedaGUID38 from cedaMoles.MolesManager.ceda_guid import CedaGUID 39 39 from sqlalchemy.orm.collections import InstrumentedList 40 40 from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier 41 41 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation 42 42 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox 43 from libs.postgisutil import create_st_setSRID, unifyGeometriesAsBBox43 from cedaMoles.libs.postgisutil import create_st_setSRID, unifyGeometriesAsBBox 44 44 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 45 45 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 46 46 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project 47 from MolesManager.codelist import MM_RoleValue, getCLValue48 from libs.migration.processor.commons import fromPhenomenonTimeToString47 from cedaMoles.MolesManager.codelist import MM_RoleValue, getCLValue 48 from cedaMoles.libs.migration.processor.commons import fromPhenomenonTimeToString 49 49 from datetime import datetime 50 50 from ascore.utils import synchAttributes 51 from MolesManager.db.partyIndexes import associateMOParty_indexes52 from MolesManager.db.after_flush import afterFlush51 from cedaMoles.MolesManager.db.partyIndexes import associateMOParty_indexes 52 from cedaMoles.MolesManager.db.after_flush import afterFlush 53 53 54 54 class Moles3EPBFactory(EPB): -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/molesSessionMiddleware.py
r8482 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from MolesManager.moles3epb import Moles3EPBFactory34 from libs.migration.client import MigrationThread35 from MolesManager.settings import RUN_MIGRATION, MIGRATION_INTERVAL,\33 from cedaMoles.MolesManager.moles3epb import Moles3EPBFactory 34 from cedaMoles.libs.migration.client import MigrationThread 35 from cedaMoles.MolesManager.settings import RUN_MIGRATION, MIGRATION_INTERVAL,\ 36 36 MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT, MOLES3_DB_CONNECTION,\ 37 37 MOLES3_DB_SCRIPT, EVENTS_DB, INFO_DB_CONNECTION 38 from libs.commons_db import DbManager39 from libs.migration.InfodbEPB import InfodbEPBFactory40 from libs.migration.MigrationEPB import MigrationEPBFactory38 from cedaMoles.libs.commons_db import DbManager 39 from cedaMoles.libs.migration.InfodbEPB import InfodbEPBFactory 40 from cedaMoles.libs.migration.MigrationEPB import MigrationEPBFactory 41 41 from sqlalchemy import exc 42 42 from django.core.context_processors import csrf -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/settings.py
r8484 r8486 219 219 #MIGRATION_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName' 220 220 MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 221 from libs.migration.db.migrationTables import doTables as doMigration221 from cedaMoles.libs.migration.db.migrationTables import doTables as doMigration 222 222 MIGRATION_DB_SCRIPT = doMigration 223 223 … … 236 236 237 237 # Local modifications to settings are imported from settings_local.py 238 from settings_local import *238 from cedaMoles.MolesManager.settings_local import * -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaBrowse.py
r8409 r8486 5 5 from django.shortcuts import render_to_response 6 6 from django.core.context_processors import csrf 7 from MolesManager.moles3epb import Moles3EPB8 from MolesManager.djencoder import DJEncoder7 from cedaMoles.MolesManager.moles3epb import Moles3EPB 8 from cedaMoles.MolesManager.djencoder import DJEncoder 9 9 from django.utils.safestring import mark_safe 10 10 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaInstrument.py
r8409 r8486 6 6 from django.shortcuts import render_to_response 7 7 from django.core.context_processors import csrf 8 from MolesManager.moles3epb import Moles3EPB9 from MolesManager.djencoder import DJEncoder8 from cedaMoles.MolesManager.moles3epb import Moles3EPB 9 from cedaMoles.MolesManager.djencoder import DJEncoder 10 10 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 11 11 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationCollectionView.py
r8445 r8486 33 33 from django.shortcuts import render_to_response 34 34 from django.core.context_processors import csrf 35 from MolesManager.djencoder import encodeToJSON35 from cedaMoles.MolesManager.djencoder import encodeToJSON 36 36 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 37 37 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationView.py
r8477 r8486 33 33 from django.shortcuts import render_to_response 34 34 from django.core.context_processors import csrf 35 from MolesManager.djencoder import encodeToJSON35 from cedaMoles.MolesManager.djencoder import encodeToJSON 36 36 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 37 from MolesManager.views.moles2gui import encodeCedaMoles2Json37 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json 38 38 39 39 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaPlatform.py
r8409 r8486 6 6 from django.shortcuts import render_to_response 7 7 from django.core.context_processors import csrf 8 from MolesManager.forms.commons import ObjectById9 from MolesManager.moles3epb import Moles3EPB10 from MolesManager.djencoder import DJEncoder8 from cedaMoles.MolesManager.forms.commons import ObjectById 9 from cedaMoles.MolesManager.moles3epb import Moles3EPB 10 from cedaMoles.MolesManager.djencoder import DJEncoder 11 11 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 12 12 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaProjectView.py
r8409 r8486 6 6 from django.shortcuts import render_to_response 7 7 from django.core.context_processors import csrf 8 from MolesManager.moles3epb import Moles3EPB9 from MolesManager.djencoder import DJEncoder8 from cedaMoles.MolesManager.moles3epb import Moles3EPB 9 from cedaMoles.MolesManager.djencoder import DJEncoder 10 10 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 11 11 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaSearch.py
r8473 r8486 6 6 from django.core.context_processors import csrf 7 7 from django.shortcuts import render_to_response, redirect 8 from MolesManager.ceda_guid import CedaGUID8 from cedaMoles.MolesManager.ceda_guid import CedaGUID 9 9 import cedaObservationView 10 10 import cedaObservationCollectionView -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedacat.py
r8445 r8486 7 7 from django.shortcuts import redirect 8 8 9 from MolesManager.views import cedaObservationView10 from MolesManager.ceda_guid import CedaGUID9 from cedaMoles.MolesManager.views import cedaObservationView 10 from cedaMoles.MolesManager.ceda_guid import CedaGUID 11 11 12 12 def cedacat(request, guid): -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/index.py
r8241 r8486 7 7 from django.http import HttpResponse 8 8 from django.shortcuts import render_to_response 9 import MolesManager.settings as settings9 import cedaMoles.MolesManager.settings as settings 10 10 from django.core.context_processors import csrf 11 11 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/__init__.py
r8480 r8486 6 6 from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation 7 7 from ea_model.moles3_4.utilities.mo_individual import MO_Individual 8 from MolesManager.djencoder import escapeForJSON8 from cedaMoles.MolesManager.djencoder import escapeForJSON 9 9 import operator 10 10 import inspect 11 from libs.epb import isPrimitive11 from cedaMoles.libs.epb import isPrimitive 12 12 13 13 """ … … 18 18 19 19 _encodeMapper = {'ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant.TM_Instant': 20 (' MolesManager.views.moles2gui.om.instant', 'Instant'),20 ('cedaMoles.MolesManager.views.moles2gui.om.instant', 'Instant'), 21 21 'ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period.TM_Period': 22 (' MolesManager.views.moles2gui.om.period', 'Period'),22 ('cedaMoles.MolesManager.views.moles2gui.om.period', 'Period'), 23 23 'ea_model.moles3_4.utilities.mo_organisation.MO_Organisation': 24 (' MolesManager.views.moles2gui.mo.party', 'Party'),24 ('cedaMoles.MolesManager.views.moles2gui.mo.party', 'Party'), 25 25 'ea_model.moles3_4.utilities.mo_individual.MO_Individual': 26 (' MolesManager.views.moles2gui.mo.party', 'Party'),26 ('cedaMoles.MolesManager.views.moles2gui.mo.party', 'Party'), 27 27 'ea_model.moles3_4.utilities.mo_responsiblepartyinfo.MO_ResponsiblePartyInfo': 28 (' MolesManager.views.moles2gui.mo.responsiblePartyInfo', 'ResponsiblePartyInfo'),28 ('cedaMoles.MolesManager.views.moles2gui.mo.responsiblePartyInfo', 'ResponsiblePartyInfo'), 29 29 'ea_model.ceda_metadatamodel.ceda_observation.ceda_observation.CEDA_Observation': 30 (' MolesManager.views.moles2gui.ceda.observation', 'Observation')30 ('cedaMoles.MolesManager.views.moles2gui.ceda.observation', 'Observation') 31 31 } 32 32 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/ceda/observation.py
r8477 r8486 31 31 @author: mnagni 32 32 ''' 33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter33 from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter 34 34 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 35 35 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/mo/party.py
r8477 r8486 31 31 @author: mnagni 32 32 ''' 33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter33 from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter 34 34 from ea_model.moles3_4.utilities.mo_individual import MO_Individual 35 35 from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/mo/responsiblePartyInfo.py
r8477 r8486 32 32 ''' 33 33 34 from MolesManager.views.moles2gui import CedaMolesGuiAdapter34 from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter 35 35 from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo 36 36 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/om/instant.py
r8477 r8486 31 31 @author: mnagni 32 32 ''' 33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter, hasAttrNotNone33 from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter, hasAttrNotNone 34 34 from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant import TM_Instant 35 35 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/om/period.py
r8477 r8486 31 31 @author: mnagni 32 32 ''' 33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter, unicodeToString33 from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter, unicodeToString 34 34 from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period import TM_Period 35 35 -
mauRepo/MolesManager/trunk/cedaMoles/libs/epb.py
r8482 r8486 34 34 from sqlalchemy.sql.expression import text 35 35 from sqlalchemy.orm.util import identity_key 36 from MolesManager.djencoder import methodsWithDecorator36 from cedaMoles.MolesManager.djencoder import methodsWithDecorator 37 37 38 38 class EPB(object): -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/InfodbEPB.py
r8334 r8486 4 4 @author: mnagni 5 5 ''' 6 from libs.epb import EPB6 from cedaMoles.libs.epb import EPB 7 7 from sqlalchemy.sql.expression import text 8 8 -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/MigrationEPB.py
r8476 r8486 4 4 @author: mnagni 5 5 ''' 6 from libs.migration.db.classes import DeploymentDataMigration, DataEntityMigration,\6 from cedaMoles.libs.migration.db.classes import DeploymentDataMigration, DataEntityMigration,\ 7 7 DeploymentsMigration 8 8 from sqlalchemy.sql.expression import asc 9 from libs.epb import EPB9 from cedaMoles.libs.epb import EPB 10 10 from sqlalchemy.orm.collections import InstrumentedList 11 11 -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/client.py
r8433 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.migration.processor.loadResources import LoadResources34 from libs.migration.processor.migrationProcess import MigrationProcess33 from cedaMoles.libs.migration.processor.loadResources import LoadResources 34 from cedaMoles.libs.migration.processor.migrationProcess import MigrationProcess 35 35 36 36 import threading 37 37 import time 38 38 from threading import Timer 39 from libs.migration.processor.EPBRepo import EPBRepo39 from cedaMoles.libs.migration.processor.EPBRepo import EPBRepo 40 40 from django.core.mail import send_mail 41 from MolesManager.settings import reportMigrationTo41 from cedaMoles.MolesManager.settings import reportMigrationTo 42 42 from datetime import datetime 43 43 -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/db/migrationTables.py
r8195 r8486 7 7 from sqlalchemy.types import TEXT, Integer, TIMESTAMP 8 8 from sqlalchemy.orm import mapper 9 from libs.migration.db.classes import DeploymentDataMigration, DeploymentsMigration,\9 from cedaMoles.libs.migration.db.classes import DeploymentDataMigration, DeploymentsMigration,\ 10 10 DataEntityMigration 11 11 -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/check/check.py
r8235 r8486 4 4 @author: mnagni 5 5 ''' 6 from libs.migration.exception.exceptions import Moles3ObjectException6 from cedaMoles.libs.migration.exception.exceptions import Moles3ObjectException 7 7 def _updateParty(oldParty, newParty): 8 8 pass -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/commons.py
r8477 r8486 35 35 from xml.etree.ElementTree import XML, tostring 36 36 import time, datetime 37 from libs.migration.exception.exceptions import NoDataLineage37 from cedaMoles.libs.migration.exception.exceptions import NoDataLineage 38 38 from hashlib import md5 39 39 from xml.sax.saxutils import unescape, escape -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/dataEntity.py
r8481 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.migration.exception.exceptions import MigrationObjectException, NoAssociatedAuthor,\33 from cedaMoles.libs.migration.exception.exceptions import MigrationObjectException, NoAssociatedAuthor,\ 34 34 migrationObjectDescription, NoAssociatedDeployments,\ 35 35 NoGeographicalExtensionException, NoCitationException 36 from libs.migration.processor.commons import findDeploymentsInDE,\36 from cedaMoles.libs.migration.processor.commons import findDeploymentsInDE,\ 37 37 createMD_Identifier, extractContent,\ 38 38 hasMOSameHash, createCI_Citation, createCI_Date, findPublishedDate,\ … … 42 42 createEX_GeographicBoundingBox, fromDateStringToPhenomenonTime,\ 43 43 comparePhenomenonTimes, compareGeographicBoundingBoxes 44 from libs.migration.processor.deployment import DeploymentProcessor44 from cedaMoles.libs.migration.processor.deployment import DeploymentProcessor 45 45 from logging import StreamHandler 46 46 import logging 47 47 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode 48 from MolesManager.ceda_guid import CedaGUID49 from MolesManager.codelist import MM_ObservationPublicationStateValue,\48 from cedaMoles.MolesManager.ceda_guid import CedaGUID 49 from cedaMoles.MolesManager.codelist import MM_ObservationPublicationStateValue,\ 50 50 getCLValue 51 51 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 52 from MolesManager.moles3epb import getUnifyObservationCollectionPhenomenonTime52 from cedaMoles.MolesManager.moles3epb import getUnifyObservationCollectionPhenomenonTime 53 53 CEDA_TITLE = 'ceda_title' 54 54 -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/deployment.py
r8476 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.migration.processor.commons import findMolesLineage,\33 from cedaMoles.libs.migration.processor.commons import findMolesLineage,\ 34 34 createMO_ResponsiblePartyInfo,\ 35 35 DO_BADC, DO_NEODC, findAuthorsInResource, \ … … 53 53 fromDateStringToPhenomenonTime, fromPhenomenonTimeToString,\ 54 54 comparePhenomenonTimes, compareGeographicBoundingBoxes 55 from libs.epb import EPB56 from libs.migration.processor.deployment_data import DeploymentDataProcessor57 from libs.migration.exception.exceptions import NoDataLineage,\55 from cedaMoles.libs.epb import EPB 56 from cedaMoles.libs.migration.processor.deployment_data import DeploymentDataProcessor 57 from cedaMoles.libs.migration.exception.exceptions import NoDataLineage,\ 58 58 NoAssociatedAuthor, NoAssociatedDeployments,\ 59 59 NoGeographicalExtensionException 60 from libs.migration.authors import authors60 from cedaMoles.libs.migration.authors import authors 61 61 from logging import StreamHandler 62 62 import logging … … 67 67 from copy import deepcopy 68 68 import datetime 69 from MolesManager.ceda_guid import CedaGUID69 from cedaMoles.MolesManager.ceda_guid import CedaGUID 70 70 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_rolecode import CI_RoleCode 71 71 from ea_model.iso_19115_2006_metadata_corrigendum.maintenance_information.md_maintenancefrequencycode import MD_MaintenanceFrequencyCode 72 72 from ea_model.moles3_4.utilities.ceda_rolevalue import CEDA_RoleValue 73 73 from ea_model.moles3_4.observation.mo_observationpublicationstatevalue import MO_ObservationPublicationStateValue 74 from MolesManager.codelist import MM_RoleValue,\74 from cedaMoles.MolesManager.codelist import MM_RoleValue,\ 75 75 MM_ObservationPublicationStateValue, getCLValue 76 76 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/deployment_data.py
r8481 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.migration.processor.commons import findSubTypeInDPT,\33 from cedaMoles.libs.migration.processor.commons import findSubTypeInDPT,\ 34 34 createCEDA_Processing, createCEDA_Instrument, createCEDA_Project,\ 35 35 findSummary, findDocumentationInMigrationDocument, createCI_Citation,\ … … 37 37 getAtomDocumentHashByMO, calculateHash, hasMOSameHash 38 38 from ea_model.moles3_4.utilities.ceda_publicationstatevalue import CEDA_PublicationStateValue 39 from MolesManager.codelist import getCLValue40 from MolesManager.ceda_guid import CedaGUID39 from cedaMoles.MolesManager.codelist import getCLValue 40 from cedaMoles.MolesManager.ceda_guid import CedaGUID 41 41 import logging 42 42 from logging import StreamHandler -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/loadResources.py
r8424 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.migration.processor.commons import DOC_STATUS, getCollectionRefs,\33 from cedaMoles.libs.migration.processor.commons import DOC_STATUS, getCollectionRefs,\ 34 34 findMolesCreationDate, findID, stringToTimestamp, buildExistTypePath,\ 35 35 buildExistDocPath, DT_DATA_ENTITIES, DT_DEPLOYMENTS, DT_DEPLOYMENT_DATA,\ 36 36 getOwnerRefs, getAtomDocumentAsElementtree 37 from libs.migration.exception.exceptions import NoCreationDate, NoDocumentID38 from libs.migration.db.classes import DeploymentDataMigration,\37 from cedaMoles.libs.migration.exception.exceptions import NoCreationDate, NoDocumentID 38 from cedaMoles.libs.migration.db.classes import DeploymentDataMigration,\ 39 39 DeploymentsMigration, DataEntityMigration 40 40 -
mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/migrationProcess.py
r8433 r8486 31 31 @author: Maurizio Nagni 32 32 ''' 33 from libs.migration.processor.dataEntity import DataEntityProcessor33 from cedaMoles.libs.migration.processor.dataEntity import DataEntityProcessor 34 34 import logging 35 35 from logging import StreamHandler -
mauRepo/MolesManager/trunk/cedaMoles/tests/__init__.py
r8476 r8486 1 from cedaMoles.tests.cedamoles.mo.responsiblePartyInfo import ResponsiblePartyInfoTest as rit 2 from cedaMoles.tests.moles2gui.mo.responsiblePartyInfo import ResponsiblePartyInfoTest as rit2 3 from unittest import TestSuite 4 5 def suite(): 6 suite = TestSuite() 7 suite.addTest(rit()) 8 suite.addTest(rit2()) 9 return suite 10 11 12 -
mauRepo/MolesManager/trunk/cedaMoles/tests/cedamoles/mo/responsiblePartyInfo.py
r8482 r8486 32 32 ''' 33 33 from unittest import TestCase 34 from libs.commons_db import DbManager35 from libs.migration.MigrationEPB import MigrationEPBFactory36 from MolesManager.moles3epb import Moles3EPBFactory37 from libs.migration.InfodbEPB import InfodbEPBFactory38 from libs.migration.client import EPBRepo39 from testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\34 from cedaMoles.libs.commons_db import DbManager 35 from cedaMoles.libs.migration.MigrationEPB import MigrationEPBFactory 36 from cedaMoles.MolesManager.moles3epb import Moles3EPBFactory 37 from cedaMoles.libs.migration.InfodbEPB import InfodbEPBFactory 38 from cedaMoles.libs.migration.client import EPBRepo 39 from cedaMoles.tests.testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\ 40 40 MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, INFO_DB_CONNECTION, EVENTS_DB 41 from libs.migration.processor.commons import createMO_ResponsiblePartyInfo,\41 from cedaMoles.libs.migration.processor.commons import createMO_ResponsiblePartyInfo,\ 42 42 createCI_OnlineResource, createCI_Address, createCI_Telephone,\ 43 43 createCI_Contact, createMO_Organization 44 from MolesManager.codelist import getCLValue, MM_RoleValue44 from cedaMoles.MolesManager.codelist import getCLValue, MM_RoleValue 45 45 from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation 46 46 from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo 47 from MolesManager.db.partyIndexes import PartyIndexes, createAssociateIndexes 48 from sqlalchemy.exc import InvalidRequestError, IntegrityError 47 from cedaMoles.MolesManager.db.partyIndexes import PartyIndexes, createAssociateIndexes 49 48 50 49 def _createResponsibleParty(): … … 67 66 return createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_publisher), parties) 68 67 69 class ResponsiblePartyInfo (TestCase):68 class ResponsiblePartyInfoTest(TestCase): 70 69 ''' 71 70 Exploits tests mainly over MO_ResponsiblePartyInfo instances. … … 76 75 77 76 def setUp(self): 78 if ResponsiblePartyInfo .initialized:77 if ResponsiblePartyInfoTest.initialized: 79 78 return 80 79 … … 87 86 migrationFactory = MigrationEPBFactory(migrationDB) 88 87 89 ResponsiblePartyInfo .epbRepo = EPBRepo(moles3Factory.createEPB() , \88 ResponsiblePartyInfoTest.epbRepo = EPBRepo(moles3Factory.createEPB() , \ 90 89 migrationFactory.createEPB(), \ 91 90 infoFactory.createEPB()) 92 91 93 ResponsiblePartyInfo .initialized = True92 ResponsiblePartyInfoTest.initialized = True 94 93 95 94 … … 110 109 ''' 111 110 rp = _createResponsibleParty() 112 ResponsiblePartyInfo .epbRepo.moles3EPB.persistInstance(rp)111 ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(rp) 113 112 self.assertTrue(len(rp.party) == 2, "Error") 114 113 self.assertEqual(rp.role, getCLValue(MM_RoleValue.cl_publisher), "Error") … … 122 121 #----------------------------- 123 122 rpid = getattr(rp, 'id') 124 ResponsiblePartyInfo .epbRepo.moles3EPB.deleteInstance(rp)123 ResponsiblePartyInfoTest.epbRepo.moles3EPB.deleteInstance(rp) 125 124 self.assertEqual(self.epbRepo.moles3EPB.search(MO_ResponsiblePartyInfo, rpid), None, "Error") 126 125 #----------------------------- … … 128 127 # Verifies that the underlying parties has been deleted 129 128 #---------------------------------------------------- 130 res = ResponsiblePartyInfo .epbRepo.moles3EPB.search(MO_Organisation, partyIds[0])129 res = ResponsiblePartyInfoTest.epbRepo.moles3EPB.search(MO_Organisation, partyIds[0]) 131 130 self.assertTrue(res.id in partyIds, "Error") 132 131 res = self.epbRepo.moles3EPB.search(MO_Organisation, partyIds[1]) … … 156 155 pi.id = None 157 156 try: 158 ResponsiblePartyInfo .epbRepo.moles3EPB.persistInstance(pi)157 ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(pi) 159 158 self.fail("PartyIndexes.id cannot be None - PrimaryKey Error") 160 159 except: 161 ResponsiblePartyInfo .epbRepo.moles3EPB.rollback()160 ResponsiblePartyInfoTest.epbRepo.moles3EPB.rollback() 162 161 #----------------------------------- 163 162 … … 165 164 pi.id = 100 166 165 try: 167 ResponsiblePartyInfo .epbRepo.moles3EPB.persistInstance(pi)166 ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(pi) 168 167 self.fail("PartyIndexes.id has not associated MO_REsponsiblePartyInfo - ForeignKey Error") 169 168 except: 170 ResponsiblePartyInfo .epbRepo.moles3EPB.rollback()169 ResponsiblePartyInfoTest.epbRepo.moles3EPB.rollback() 171 170 #----------------------------------- 172 171 173 172 #------------ Test 3 --------------- 174 ResponsiblePartyInfo .epbRepo.moles3EPB.persistInstance(rp)173 ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(rp) 175 174 pi.id = getattr(rp, 'id') 176 175 try: 177 ResponsiblePartyInfo .epbRepo.moles3EPB.persistInstance(pi)176 ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(pi) 178 177 self.fail("PartyIndexes.id has not associated MO_REsponsiblePartyInfo - ForeignKey Error") 179 178 except Exception as e: 180 ResponsiblePartyInfo .epbRepo.moles3EPB.rollback()179 ResponsiblePartyInfoTest.epbRepo.moles3EPB.rollback() 181 180 #----------------------------------- 182 181 183 182 #------------ Test 4 --------------- 184 183 resId = getattr(rp, 'id') 185 ResponsiblePartyInfo .epbRepo.moles3EPB.expunge(rp)186 res = ResponsiblePartyInfo .epbRepo.moles3EPB.search(MO_ResponsiblePartyInfo, resId)184 ResponsiblePartyInfoTest.epbRepo.moles3EPB.expunge(rp) 185 res = ResponsiblePartyInfoTest.epbRepo.moles3EPB.search(MO_ResponsiblePartyInfo, resId) 187 186 for party in res.party: 188 187 self.assertTrue(party.party_order > -1, "MO_Party.party_order is not assigned - Error") … … 190 189 191 190 #------------ Test 5 --------------- 192 ResponsiblePartyInfo .epbRepo.moles3EPB.deleteInstance(res)193 pi = ResponsiblePartyInfo .epbRepo.moles3EPB.search(PartyIndexes, resId)191 ResponsiblePartyInfoTest.epbRepo.moles3EPB.deleteInstance(res) 192 pi = ResponsiblePartyInfoTest.epbRepo.moles3EPB.search(PartyIndexes, resId) 194 193 self.assertTrue(pi is None, "PartyIndexes is not deleted after MO_ResponsiblePartyInfo is deleted - Error") 195 194 #----------------------------------- -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/commontest.py
r8476 r8486 5 5 ''' 6 6 from unittest import TestCase 7 from libs.migration.processor.commons import isoDateTimeStringToTimeDate,\7 from cedaMoles.libs.migration.processor.commons import isoDateTimeStringToTimeDate,\ 8 8 fromDateStringToPhenomenonTime, fromPhenomenonTimeToString,\ 9 9 comparePhenomenonTimes -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/deployment_tests.py
r8476 r8486 5 5 ''' 6 6 from unittest import TestCase 7 from libs.migration.processor.deployment import DeploymentProcessor7 from cedaMoles.libs.migration.processor.deployment import DeploymentProcessor 8 8 class DeploymentTest(TestCase): 9 9 ''' -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/infodbepbtests.py
r8476 r8486 5 5 ''' 6 6 import unittest 7 from libs.commons_db import DbManager7 from cedaMoles.libs.commons_db import DbManager 8 8 from unittest import TestCase 9 9 import logging 10 10 from logging import StreamHandler 11 from testconfig import INFO_DB_CONNECTION 12 from libs.migration.InfodbEPB import InfodbEPB 13 from sqlalchemy.sql.expression import text 11 from cedaMoles.tests.testconfig import INFO_DB_CONNECTION 14 12 15 13 -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/loadresource.py
r8476 r8486 5 5 ''' 6 6 from unittest import TestCase 7 from libs.commons_db import DbManager8 from libs.migration.processor.loadResources import LoadResources9 from libs.migration.db.classes import DataEntityMigration10 from libs.migration.processor.commons import calculateHash11 from testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT7 from cedaMoles.libs.commons_db import DbManager 8 from cedaMoles.libs.migration.processor.loadResources import LoadResources 9 from cedaMoles.libs.migration.db.classes import DataEntityMigration 10 from cedaMoles.libs.migration.processor.commons import calculateHash 11 from cedaMoles.tests.testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT 12 12 13 13 class LoadResourceTest(TestCase): -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/migrationprocess.py
r8476 r8486 32 32 ''' 33 33 from unittest import TestCase 34 from libs.commons_db import DbManager35 from libs.migration.MigrationEPB import MigrationEPBFactory36 from libs.migration.processor.loadResources import LoadResources37 from libs.migration.db.classes import MigrationObject38 from libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED,\34 from cedaMoles.libs.commons_db import DbManager 35 from cedaMoles.libs.migration.MigrationEPB import MigrationEPBFactory 36 from cedaMoles.libs.migration.processor.loadResources import LoadResources 37 from cedaMoles.libs.migration.db.classes import MigrationObject 38 from cedaMoles.libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED,\ 39 39 DO_NEODC 40 from MolesManager.moles3epb import Moles3EPBFactory41 from libs.migration.processor.migrationProcess import MigrationProcess42 from libs.migration.InfodbEPB import InfodbEPBFactory43 from libs.migration.client import EPBRepo, generateMigrationReport44 from testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\40 from cedaMoles.MolesManager.moles3epb import Moles3EPBFactory 41 from cedaMoles.libs.migration.processor.migrationProcess import MigrationProcess 42 from cedaMoles.libs.migration.InfodbEPB import InfodbEPBFactory 43 from cedaMoles.libs.migration.client import EPBRepo, generateMigrationReport 44 from cedaMoles.tests.testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\ 45 45 MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, INFO_DB_CONNECTION, EVENTS_DB 46 46 -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/moles3epbmothods.py
r8476 r8486 5 5 ''' 6 6 import unittest 7 from testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT8 from MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory9 from libs.commons_db import DbManager7 from cedaMoles.tests.testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 8 from cedaMoles.MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory 9 from cedaMoles.libs.commons_db import DbManager 10 10 from unittest import TestCase 11 11 import logging 12 12 from logging import StreamHandler 13 13 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 14 from migration.test_utils import createObservationCollection14 from cedaMoles.tests.migration.test_utils import createObservationCollection 15 15 16 16 -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/moles3epbtests.py
r8476 r8486 5 5 ''' 6 6 import unittest 7 from MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory8 from libs.commons_db import DbManager7 from cedaMoles.MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory 8 from cedaMoles.libs.commons_db import DbManager 9 9 from unittest import TestCase 10 10 import logging, datetime 11 11 from logging import StreamHandler 12 12 from sqlalchemy.exc import IntegrityError 13 from libs.migration.processor.commons import createCI_Date, createDateTime,\13 from cedaMoles.libs.migration.processor.commons import createCI_Date, createDateTime,\ 14 14 createDate, createTM_Position, createTM_Instant 15 15 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode … … 19 19 from test_utils import createObservationCollection,\ 20 20 createProject 21 from libs.migration.processor.EPBRepo import EPBRepo22 from testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, EVENTS_DB21 from cedaMoles.libs.migration.processor.EPBRepo import EPBRepo 22 from cedaMoles.tests.testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, EVENTS_DB 23 23 24 24 -
mauRepo/MolesManager/trunk/cedaMoles/tests/migration/test_utils.py
r8476 r8486 5 5 ''' 6 6 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 7 from libs.migration.processor.commons import createCI_Citation,\7 from cedaMoles.libs.migration.processor.commons import createCI_Citation,\ 8 8 createMD_Identifier 9 9 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation -
mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/ceda/observation.py
r8477 r8486 33 33 import unittest 34 34 from json import loads, dumps 35 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\35 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 36 36 decodeJson2CedaMoles, getData 37 from moles2gui.creationFactory import assembleObservation37 from cedaMoles.tests.moles2gui.creationFactory import assembleObservation 38 38 39 39 … … 54 54 Validates a simple encode/decode 55 55 """ 56 observation = assembleObservation() 56 observation = assembleObservation() 57 57 json = encodeCedaMoles2Json(observation) 58 58 #----------------------- test ------------------------ … … 82 82 self.assertEqual(getData(new_observation, 'relatedParty.role'), decJson['relatedParty']['role'], "Error") 83 83 #--------------------------------------------------------- 84 85 if __name__ == '__main__': 86 unittest.main() 87 -
mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/creationFactory.py
r8477 r8486 31 31 @author: mnagni 32 32 ''' 33 from libs.migration.processor.commons import createCI_OnlineResource,\33 from cedaMoles.libs.migration.processor.commons import createCI_OnlineResource,\ 34 34 createCI_Address, createCI_Telephone, createCI_Contact,\ 35 35 createMO_Organization, createMO_Individual, createMO_ResponsiblePartyInfo,\ 36 36 isoDateTimeStringToTimeDate, createDateTime, createTM_Position,\ 37 37 createTM_Instant, fromDateStringToPhenomenonTime 38 from MolesManager.codelist import getCLValue, MM_RoleValue38 from cedaMoles.MolesManager.codelist import getCLValue, MM_RoleValue 39 39 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 40 40 -
mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/mo/party.py
r8477 r8486 32 32 ''' 33 33 import unittest 34 from moles2gui.creationFactory import assembleMO_Organization, assembleMO_Individual34 from cedaMoles.tests.moles2gui.creationFactory import assembleMO_Organization, assembleMO_Individual 35 35 from json import loads, dumps 36 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\36 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 37 37 decodeJson2CedaMoles, getData 38 38 -
mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/mo/responsiblePartyInfo.py
r8477 r8486 32 32 ''' 33 33 import unittest 34 from moles2gui.creationFactory import assembleMO_ResponsiblePartyInfo34 from cedaMoles.tests.moles2gui.creationFactory import assembleMO_ResponsiblePartyInfo 35 35 from json import loads 36 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\36 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 37 37 decodeJson2CedaMoles, dictByID, _encodeCedaMoles2Adapter 38 from MolesManager.codelist import getCLValue, MM_RoleValue38 from cedaMoles.MolesManager.codelist import getCLValue, MM_RoleValue 39 39 40 40 41 class Test(unittest.TestCase):41 class ResponsiblePartyInfoTest(unittest.TestCase): 42 42 43 43 -
mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/om/instant.py
r8477 r8486 32 32 ''' 33 33 import unittest 34 from moles2gui.creationFactory import assembleTM_Instant35 34 from json import loads, dumps 36 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\35 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 37 36 decodeJson2CedaMoles, getData 37 from cedaMoles.tests.moles2gui.creationFactory import assembleTM_Instant 38 38 39 39 -
mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/om/period.py
r8477 r8486 33 33 import unittest 34 34 from json import loads, dumps 35 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\35 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 36 36 decodeJson2CedaMoles, getData 37 from libs.migration.processor.commons import fromDateStringToPhenomenonTime37 from cedaMoles.libs.migration.processor.commons import fromDateStringToPhenomenonTime 38 38 39 39 -
mauRepo/MolesManager/trunk/cedaMoles/tests/testconfig.py
r8476 r8486 36 36 INFO_DB_CONNECTION = 'postgresql://cedainfo:ler239b@bora.badc.rl.ac.uk:5432/cedainfo' 37 37 38 from libs.migration.db.migrationTables import doTables as doMigration38 from cedaMoles.libs.migration.db.migrationTables import doTables as doMigration 39 39 MIGRATION_DB_SCRIPT = doMigration 40 40 -
mauRepo/MolesManager/trunk/setup.py
r8485 r8486 16 16 author_email='maurizio.nagni@stfc.ac.uk', 17 17 package_dir = {'cedaMoles':'cedaMoles'}, # tell distutils packages are under cedaMoles 18 packages=find_packages( exclude=['tests']), # include all packages under this directory18 packages=find_packages(), # include all packages under this directory 19 19 url='http://proj.badc.rl.ac.uk/svn/ndg/mauRepo/MolesManager', 20 20 license='BSD licence, see LICENCE', … … 31 31 'django==1.3.1', \ 32 32 'html5lib==0.95', \ 33 'ceda-moles-model==0.1.5'], 33 'ceda-moles-model==0.1.5', 34 'psycopg2'], 34 35 ) 35 36
Note: See TracChangeset
for help on using the changeset viewer.