- Timestamp:
- 26/06/12 16:53:02 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk/src
- Files:
-
- 1 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py
r8408 r8409 32 32 ''' 33 33 from libs.epb import EPB 34 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection35 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation36 34 from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection 37 35 from ea_model.moles3_4.observation.mo_observation import MO_Observation 38 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project39 36 from sqlalchemy import Table, Column, ForeignKey, Integer, String 40 37 from sqlalchemy.orm import mapper … … 45 42 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox 46 43 from libs.postgisutil import unifyGeometries, create_st_setSRID 44 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 45 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 46 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project 47 47 48 48 class Moles3EPBFactory(EPB): … … 98 98 99 99 def searchEager(self, clazz, inst_id): 100 return EPB.searchEager(clazz, inst_id )100 return EPB.searchEager(clazz, inst_id, self._session) 101 101 102 102 def persistInstance(self, instance): -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedaBrowse.py
r8321 r8409 5 5 from django.shortcuts import render_to_response 6 6 from django.core.context_processors import csrf 7 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation8 7 from MolesManager.moles3epb import Moles3EPB 9 8 from MolesManager.djencoder import DJEncoder 10 9 from django.utils.safestring import mark_safe 10 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 11 11 12 12 def browseView(request, obs_id_str): -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedaInstrument.py
r8323 r8409 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 ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation10 8 from MolesManager.moles3epb import Moles3EPB 11 9 from MolesManager.djencoder import DJEncoder 10 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 12 11 13 12 -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedaObservationView.py
r8408 r8409 1 1 ''' 2 BSD Licence 3 Copyright (c) 2012, Science & Technology Facilities Council (STFC) 4 All rights reserved. 5 6 Redistribution and use in source and binary forms, with or without modification, 7 are permitted provided that the following conditions are met: 8 9 * Redistributions of source code must retain the above copyright notice, 10 this list of conditions and the following disclaimer. 11 * Redistributions in binary form must reproduce the above copyright notice, 12 this list of conditions and the following disclaimer in the documentation 13 and/or other materials provided with the distribution. 14 * Neither the name of the Science & Technology Facilities Council (STFC) 15 nor the names of its contributors may be used to endorse or promote 16 products derived from this software without specific prior written permission. 17 18 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 20 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 22 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 23 OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 26 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 2 29 Created on 1 Nov 2011 3 30 … … 6 33 from django.shortcuts import render_to_response 7 34 from django.core.context_processors import csrf 8 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation9 35 from MolesManager.djencoder import DJEncoder 10 36 from django.utils.safestring import mark_safe 37 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 38 11 39 12 40 -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedaPlatform.py
r8323 r8409 7 7 from django.core.context_processors import csrf 8 8 from MolesManager.forms.commons import ObjectById 9 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation10 9 from MolesManager.moles3epb import Moles3EPB 11 10 from MolesManager.djencoder import DJEncoder 11 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 12 12 13 13 -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedaProjectView.py
r8323 r8409 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 ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation10 8 from MolesManager.moles3epb import Moles3EPB 11 9 from MolesManager.djencoder import DJEncoder 10 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 12 11 13 12 -
mauRepo/MolesManager/trunk/src/dropAllTables.sql
r8245 r8409 19 19 ORDER BY 1; 20 20 21 DROP SEQUENCE IF EXISTS ad_abstractaddress_id_seq CASCADE; 22 DROP SEQUENCE IF EXISTS arcbycenterpoint_id_seq CASCADE; 23 DROP SEQUENCE IF EXISTS cell_id_seq CASCADE; 24 DROP SEQUENCE IF EXISTS cellularcomplex_id_seq CASCADE; 25 DROP SEQUENCE IF EXISTS eg_pointestimate_id_seq CASCADE; 26 DROP SEQUENCE IF EXISTS fd_featurecollection_id_seq CASCADE; 27 DROP SEQUENCE IF EXISTS fd_feature_id_seq CASCADE; 28 DROP SEQUENCE IF EXISTS fd_featurename_id_seq CASCADE; 29 DROP SEQUENCE IF EXISTS lr_element_id_seq CASCADE; 30 DROP SEQUENCE IF EXISTS lr_feature_id_seq CASCADE; 31 DROP SEQUENCE IF EXISTS lr_linearreferencemethod_id_seq CASCADE; 32 DROP SEQUENCE IF EXISTS lr_offsetexpression_id_seq CASCADE; 33 DROP SEQUENCE IF EXISTS lr_positionexpression_id_seq CASCADE; 34 DROP SEQUENCE IF EXISTS lr_referencemarker_id_seq CASCADE; 35 DROP SEQUENCE IF EXISTS mo_citation_id_seq CASCADE; 36 DROP SEQUENCE IF EXISTS mo_individual_id_seq CASCADE; 37 DROP SEQUENCE IF EXISTS mo_organisation_id_seq CASCADE; 38 DROP SEQUENCE IF EXISTS mo_party_id_seq CASCADE; 39 DROP SEQUENCE IF EXISTS nl_compositecurve_id_seq CASCADE; 40 DROP SEQUENCE IF EXISTS nl_composite_id_seq CASCADE; 41 DROP SEQUENCE IF EXISTS nl_compositepoint_id_seq CASCADE; 42 DROP SEQUENCE IF EXISTS nl_compsitesurface_id_seq CASCADE; 43 DROP SEQUENCE IF EXISTS nl_curve_id_seq CASCADE; 44 DROP SEQUENCE IF EXISTS nl_curvesegment_id_seq CASCADE; 45 DROP SEQUENCE IF EXISTS nl_map_id_seq CASCADE; 46 DROP SEQUENCE IF EXISTS nl_orientablecurve_id_seq CASCADE; 47 DROP SEQUENCE IF EXISTS nl_orientablesurface_id_seq CASCADE; 48 DROP SEQUENCE IF EXISTS nl_point_id_seq CASCADE; 49 DROP SEQUENCE IF EXISTS nl_primitve_id_seq CASCADE; 50 DROP SEQUENCE IF EXISTS nl_ring_id_seq CASCADE; 51 DROP SEQUENCE IF EXISTS nl_surfaceboundary_id_seq CASCADE; 52 DROP SEQUENCE IF EXISTS nl_surface_id_seq CASCADE; 53 DROP SEQUENCE IF EXISTS nl_surfacepatch_id_seq CASCADE; 54 DROP SEQUENCE IF EXISTS ns_avoidlist_id_seq CASCADE; 55 DROP SEQUENCE IF EXISTS ns_costedlink_id_seq CASCADE; 56 DROP SEQUENCE IF EXISTS ns_costedturn_id_seq CASCADE; 57 DROP SEQUENCE IF EXISTS ns_costfunction_id_seq CASCADE; 58 DROP SEQUENCE IF EXISTS ns_routerequest_id_seq CASCADE; 59 DROP SEQUENCE IF EXISTS nt_advisorydirection_id_seq CASCADE; 60 DROP SEQUENCE IF EXISTS nt_advisorydistance_id_seq CASCADE; 61 DROP SEQUENCE IF EXISTS nt_advisoryelement_id_seq CASCADE; 62 DROP SEQUENCE IF EXISTS nt_advisory_id_seq CASCADE; 63 DROP SEQUENCE IF EXISTS nt_advisoryspatialrelation_id_seq CASCADE; 64 DROP SEQUENCE IF EXISTS nt_combinednetwork_id_seq CASCADE; 65 DROP SEQUENCE IF EXISTS nt_constraint_id_seq CASCADE; 66 DROP SEQUENCE IF EXISTS nt_exitassociation_id_seq CASCADE; 67 DROP SEQUENCE IF EXISTS nt_junction_id_seq CASCADE; 21 68 DROP TABLE IF EXISTS angle CASCADE; 22 DROP TABLE IF EXISTS "any"CASCADE;69 DROP TABLE IF EXISTS any CASCADE; 23 70 DROP TABLE IF EXISTS cc_concatenatedoperation CASCADE; 24 71 DROP TABLE IF EXISTS cc_concatenatedoperation_cc_concatenatedoperation CASCADE; … … 74 121 DROP TABLE IF EXISTS ci_series CASCADE; 75 122 DROP TABLE IF EXISTS ci_telephone CASCADE; 76 DROP TABLE IF EXISTS class08_4 CASCADE;77 DROP TABLE IF EXISTS class09_1 CASCADE;78 DROP TABLE IF EXISTS class09_2 CASCADE;79 DROP TABLE IF EXISTS class09_3 CASCADE;80 DROP TABLE IF EXISTS class09_4 CASCADE;81 DROP TABLE IF EXISTS class10_1 CASCADE;82 DROP TABLE IF EXISTS class12_1 CASCADE;83 DROP TABLE IF EXISTS class12_2 CASCADE;84 DROP TABLE IF EXISTS class12_3 CASCADE;85 DROP TABLE IF EXISTS class12_4 CASCADE;86 123 DROP TABLE IF EXISTS cl_classificationcollection CASCADE; 87 124 DROP TABLE IF EXISTS cl_classificationcollection_cv_surfacevaluepair CASCADE; … … 572 609 DROP TABLE IF EXISTS uomscale CASCADE; 573 610 DROP TABLE IF EXISTS url CASCADE; 574 DROP TABLE IF EXISTS data_entity_migration CASCADE;575 DROP TABLE IF EXISTS deployment_data_migration CASCADE;576 DROP TABLE IF EXISTS deployments_migration CASCADE;577 611 DROP TABLE IF EXISTS cv_solidvaluepair_cv_discretecoverage CASCADE; 578 DROP TABLE IF EXISTS ceda_guid CASCADE; 612 DROP TABLE IF EXISTS geometries CASCADE; 613 DROP TABLE IF EXISTS geometry_columns CASCADE; 614 DROP TABLE IF EXISTS spatial_ref_sys CASCADE; 615 DROP TABLE IF EXISTS ad_abstractaddress CASCADE; 616 DROP TABLE IF EXISTS arcbycenterpoint CASCADE; 617 DROP TABLE IF EXISTS cell CASCADE; 618 DROP TABLE IF EXISTS cell_cellularcomplex CASCADE; 619 DROP TABLE IF EXISTS cell_gm_complex CASCADE; 620 DROP TABLE IF EXISTS cell_gm_composite CASCADE; 621 DROP TABLE IF EXISTS cell_gm_primitive CASCADE; 622 DROP TABLE IF EXISTS cell_tp_complex CASCADE; 623 DROP TABLE IF EXISTS cell_tp_primitive CASCADE; 624 DROP TABLE IF EXISTS cellularcomplex CASCADE; 625 DROP TABLE IF EXISTS cellularcomplex_cell CASCADE; 626 DROP TABLE IF EXISTS cellularcomplex_gm_complex CASCADE; 627 DROP TABLE IF EXISTS cellularcomplex_gm_primitive CASCADE; 628 DROP TABLE IF EXISTS cellularcomplex_tp_complex CASCADE; 629 DROP TABLE IF EXISTS cellularcomplex_tp_primitive CASCADE; 630 DROP TABLE IF EXISTS eg_pointestimate CASCADE; 631 DROP TABLE IF EXISTS ex_extent_mo_responsiblepartyinfo CASCADE; 632 DROP TABLE IF EXISTS fd_feature CASCADE; 633 DROP TABLE IF EXISTS fd_featurecollection CASCADE; 634 DROP TABLE IF EXISTS fd_featurecollection_fd_feature CASCADE; 635 DROP TABLE IF EXISTS fd_feature_fd_featurecollection CASCADE; 636 DROP TABLE IF EXISTS fd_featurename CASCADE; 637 DROP TABLE IF EXISTS fd_feature_ns_avoidlist CASCADE; 638 DROP TABLE IF EXISTS gf_featuretype_ns_avoidlist CASCADE; 639 DROP TABLE IF EXISTS gm_composite_gm_complex CASCADE; 640 DROP TABLE IF EXISTS gm_composite_gm_primitive CASCADE; 641 DROP TABLE IF EXISTS lr_element CASCADE; 642 DROP TABLE IF EXISTS lr_feature CASCADE; 643 DROP TABLE IF EXISTS lr_linearreferencemethod CASCADE; 644 DROP TABLE IF EXISTS lr_offsetexpression CASCADE; 645 DROP TABLE IF EXISTS lr_positionexpression CASCADE; 646 DROP TABLE IF EXISTS lr_referencemarker CASCADE; 647 DROP TABLE IF EXISTS mo_acquisition_mo_compositeprocess CASCADE; 648 DROP TABLE IF EXISTS mo_citation CASCADE; 649 DROP TABLE IF EXISTS mo_individual CASCADE; 650 DROP TABLE IF EXISTS mo_instrument_mo_acquisition CASCADE; 651 DROP TABLE IF EXISTS mo_operation_mo_acquisition CASCADE; 652 DROP TABLE IF EXISTS mo_organisation CASCADE; 653 DROP TABLE IF EXISTS mo_organisation_mo_responsiblepartyinfo CASCADE; 654 DROP TABLE IF EXISTS mo_party CASCADE; 655 DROP TABLE IF EXISTS mo_platform_mo_acquisition CASCADE; 656 DROP TABLE IF EXISTS mo_platform_mo_operation CASCADE; 657 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_acquisition CASCADE; 658 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_compositeprocess CASCADE; 659 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_instrument CASCADE; 660 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_observation CASCADE; 661 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_operation CASCADE; 662 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_organisation CASCADE; 663 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_platform CASCADE; 664 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_processing CASCADE; 665 DROP TABLE IF EXISTS mo_responsiblepartyinfo_mo_project CASCADE; 666 DROP TABLE IF EXISTS nl_composite CASCADE; 667 DROP TABLE IF EXISTS nl_compositecurve CASCADE; 668 DROP TABLE IF EXISTS nl_compositecurve_nl_compositecurve CASCADE; 669 DROP TABLE IF EXISTS nl_compositepoint CASCADE; 670 DROP TABLE IF EXISTS nl_compsitesurface CASCADE; 671 DROP TABLE IF EXISTS nl_compsitesurface_nl_compsitesurface CASCADE; 672 DROP TABLE IF EXISTS nl_curve CASCADE; 673 DROP TABLE IF EXISTS nl_curvesegment CASCADE; 674 DROP TABLE IF EXISTS nl_map CASCADE; 675 DROP TABLE IF EXISTS nl_orientablecurve CASCADE; 676 DROP TABLE IF EXISTS nl_orientablesurface CASCADE; 677 DROP TABLE IF EXISTS nl_point CASCADE; 678 DROP TABLE IF EXISTS nl_primitve CASCADE; 679 DROP TABLE IF EXISTS nl_ring CASCADE; 680 DROP TABLE IF EXISTS nl_surfaceboundary CASCADE; 681 DROP TABLE IF EXISTS nl_surface CASCADE; 682 DROP TABLE IF EXISTS nl_surfacepatch CASCADE; 683 DROP TABLE IF EXISTS ns_avoidlist CASCADE; 684 DROP TABLE IF EXISTS ns_costedlink CASCADE; 685 DROP TABLE IF EXISTS ns_costedturn CASCADE; 686 DROP TABLE IF EXISTS ns_costfunction CASCADE; 687 DROP TABLE IF EXISTS ns_costfunction_ns_routerequest CASCADE; 688 DROP TABLE IF EXISTS ns_routerequest CASCADE; 689 DROP TABLE IF EXISTS ns_routerequest_ns_costfunction CASCADE; 690 DROP TABLE IF EXISTS nt_advisory CASCADE; 691 DROP TABLE IF EXISTS nt_advisorydirection CASCADE; 692 DROP TABLE IF EXISTS nt_advisorydistance CASCADE; 693 DROP TABLE IF EXISTS nt_advisoryelement CASCADE; 694 DROP TABLE IF EXISTS nt_advisoryspatialrelation CASCADE; 695 DROP TABLE IF EXISTS nt_combinednetwork CASCADE; 696 DROP TABLE IF EXISTS nt_combinednetwork_nt_combinednetwork CASCADE; 697 DROP TABLE IF EXISTS nt_constraint CASCADE; 698 DROP TABLE IF EXISTS nt_exitassociation CASCADE; 699 DROP TABLE IF EXISTS nt_junction CASCADE; 700 DROP TABLE IF EXISTS nt_junction_nt_network CASCADE; 701 DROP TABLE IF EXISTS nt_junction_nt_transfernode CASCADE; 702 DROP TABLE IF EXISTS nt_laneconstraint CASCADE; 703 DROP TABLE IF EXISTS nt_link CASCADE; 704 DROP TABLE IF EXISTS nt_link_lr_linearreferencemethod CASCADE; 705 DROP TABLE IF EXISTS nt_link_nt_junction CASCADE; 706 DROP TABLE IF EXISTS nt_link_nt_maneuver CASCADE; 707 DROP TABLE IF EXISTS nt_link_nt_network CASCADE; 708 DROP TABLE IF EXISTS nt_linkposition CASCADE; 709 DROP TABLE IF EXISTS nt_link_tp_face CASCADE; 710 DROP TABLE IF EXISTS nt_link_tp_node CASCADE; 711 DROP TABLE IF EXISTS nt_maneuver CASCADE; 712 DROP TABLE IF EXISTS nt_maneuver_nt_link CASCADE; 713 DROP TABLE IF EXISTS nt_maneuver_nt_route CASCADE; 714 DROP TABLE IF EXISTS nt_maneuver_nt_turn CASCADE; 715 DROP TABLE IF EXISTS nt_network CASCADE; 716 DROP TABLE IF EXISTS nt_networkposition CASCADE; 717 DROP TABLE IF EXISTS nt_network_tp_complex CASCADE; 718 DROP TABLE IF EXISTS nt_network_tp_primitive CASCADE; 719 DROP TABLE IF EXISTS nt_route CASCADE; 720 DROP TABLE IF EXISTS nt_route_nt_combinednetwork CASCADE; 721 DROP TABLE IF EXISTS nt_routesummary CASCADE; 722 DROP TABLE IF EXISTS nt_temporalconstraint CASCADE; 723 DROP TABLE IF EXISTS nt_transfer CASCADE; 724 DROP TABLE IF EXISTS nt_transferlink CASCADE; 725 DROP TABLE IF EXISTS nt_transfernode CASCADE; 726 DROP TABLE IF EXISTS nt_transfernode_nt_combinednetwork CASCADE; 727 DROP TABLE IF EXISTS nt_turn CASCADE; 728 DROP TABLE IF EXISTS nt_turn_nt_junction CASCADE; 729 DROP TABLE IF EXISTS nt_turn_nt_link CASCADE; 730 DROP TABLE IF EXISTS nt_turn_nt_maneuver CASCADE; 731 DROP TABLE IF EXISTS nt_turn_nt_network CASCADE; 732 DROP TABLE IF EXISTS nt_vehicleconstraint CASCADE; 733 DROP TABLE IF EXISTS nt_waypoint CASCADE; 734 DROP TABLE IF EXISTS nt_waypointlist CASCADE; 735 DROP TABLE IF EXISTS polygon CASCADE; 736 DROP TABLE IF EXISTS rectangle CASCADE; 737 DROP TABLE IF EXISTS si_gazetteer CASCADE; 738 DROP TABLE IF EXISTS si_gazetteer_si_locationinstance CASCADE; 739 DROP TABLE IF EXISTS si_locationinstance CASCADE; 740 DROP TABLE IF EXISTS si_locationinstance_si_gazetteer CASCADE; 741 DROP TABLE IF EXISTS si_locationinstance_si_locationinstance CASCADE; 742 DROP TABLE IF EXISTS si_locationtype CASCADE; 743 DROP TABLE IF EXISTS si_locationtype_si_gazetteer CASCADE; 744 DROP TABLE IF EXISTS si_locationtype_si_locationtype CASCADE; 745 DROP TABLE IF EXISTS si_locationtype_si_spatialreferencesystemusinggeographicidenti CASCADE; 746 DROP TABLE IF EXISTS simplex CASCADE; 747 DROP TABLE IF EXISTS simplex_gm_complex CASCADE; 748 DROP TABLE IF EXISTS simplex_gm_composite CASCADE; 749 DROP TABLE IF EXISTS simplex_gm_primitive CASCADE; 750 DROP TABLE IF EXISTS simplex_simplicialcomplex CASCADE; 751 DROP TABLE IF EXISTS simplex_tp_complex CASCADE; 752 DROP TABLE IF EXISTS simplex_tp_primitive CASCADE; 753 DROP TABLE IF EXISTS simplicialcomplex CASCADE; 754 DROP TABLE IF EXISTS simplicialcomplex_simplex CASCADE; 755 DROP TABLE IF EXISTS si_spatialreferencesystemusinggeographicidentifiers CASCADE; 756 DROP TABLE IF EXISTS si_spatialreferencesystemusinggeographicidentifiers_si_locatio CASCADE; 757 DROP TABLE IF EXISTS taxonomicclassification CASCADE; 758 DROP TABLE IF EXISTS taxonomysystem CASCADE; 759 DROP TABLE IF EXISTS temporalcrs CASCADE; 760 DROP TABLE IF EXISTS temporaldatum CASCADE; 761 DROP TABLE IF EXISTS timecs CASCADE; 762 DROP TABLE IF EXISTS tk_position CASCADE; 763 DROP TABLE IF EXISTS tm_intervallength CASCADE; 764 DROP TABLE IF EXISTS topocurve CASCADE; 765 DROP TABLE IF EXISTS topopoint CASCADE; 766 DROP TABLE IF EXISTS toposurface CASCADE; 767 DROP TABLE IF EXISTS topovolume CASCADE; 768 DROP TABLE IF EXISTS tp_edge_tp_face CASCADE; 769 DROP TABLE IF EXISTS tp_edge_tp_node CASCADE; 770 DROP TABLE IF EXISTS uomweight CASCADE; 771 DROP TABLE IF EXISTS vouchers CASCADE; 772 DROP TABLE IF EXISTS weight CASCADE; 579 773 580 774 775 776 DROP TABLE IF EXISTS ceda_guid CASCADE; 777 UPDATE data_entity_migration 778 set ceda_observation_coll_id = NULL, doc_hash = NULL; 779 780 UPDATE deployments_migration 781 set ceda_observation_id = NULL, doc_hash = NULL; 782 783 UPDATE deployment_data_migration 784 set ceda_processing_id = NULL, ceda_instrument_id = NULL, 785 ceda_compositeprocess_id = NULL, ceda_acquisition_id = NULL, 786 ceda_project_id = NULL, doc_hash = NULL; 787 DROP TABLE IF EXISTS data_entity_migration CASCADE; 788 DROP TABLE IF EXISTS deployments_migration CASCADE; 789 DROP TABLE IF EXISTS deployment_data_migration CASCADE; 581 790 582 791 DROP SEQUENCE IF EXISTS angle_id_seq CASCADE; … … 967 1176 DROP SEQUENCE IF EXISTS uomscale_id_seq CASCADE; 968 1177 DROP SEQUENCE IF EXISTS url_id_seq CASCADE; 1178 DROP SEQUENCE IF EXISTS nt_laneconstraint_id_seq CASCADE; 1179 DROP SEQUENCE IF EXISTS nt_link_id_seq CASCADE; 1180 DROP SEQUENCE IF EXISTS nt_linkposition_id_seq CASCADE; 1181 DROP SEQUENCE IF EXISTS nt_maneuver_id_seq CASCADE; 1182 DROP SEQUENCE IF EXISTS nt_network_id_seq CASCADE; 1183 DROP SEQUENCE IF EXISTS nt_networkposition_id_seq CASCADE; 1184 DROP SEQUENCE IF EXISTS nt_route_id_seq CASCADE; 1185 DROP SEQUENCE IF EXISTS nt_routesummary_id_seq CASCADE; 1186 DROP SEQUENCE IF EXISTS nt_temporalconstraint_id_seq CASCADE; 1187 DROP SEQUENCE IF EXISTS nt_transfer_id_seq CASCADE; 1188 DROP SEQUENCE IF EXISTS nt_transferlink_id_seq CASCADE; 1189 DROP SEQUENCE IF EXISTS nt_transfernode_id_seq CASCADE; 1190 DROP SEQUENCE IF EXISTS nt_turn_id_seq CASCADE; 1191 DROP SEQUENCE IF EXISTS nt_vehicleconstraint_id_seq CASCADE; 1192 DROP SEQUENCE IF EXISTS nt_waypoint_id_seq CASCADE; 1193 DROP SEQUENCE IF EXISTS nt_waypointlist_id_seq CASCADE; 1194 DROP SEQUENCE IF EXISTS polygon_id_seq CASCADE; 1195 DROP SEQUENCE IF EXISTS rectangle_id_seq CASCADE; 1196 DROP SEQUENCE IF EXISTS si_gazetteer_id_seq CASCADE; 1197 DROP SEQUENCE IF EXISTS si_locationinstance_id_seq CASCADE; 1198 DROP SEQUENCE IF EXISTS si_locationtype_id_seq CASCADE; 1199 DROP SEQUENCE IF EXISTS simplex_id_seq CASCADE; 1200 DROP SEQUENCE IF EXISTS simplicialcomplex_id_seq CASCADE; 1201 DROP SEQUENCE IF EXISTS si_spatialreferencesystemusinggeographicidentifiers_id_seq CASCADE; 1202 DROP SEQUENCE IF EXISTS taxonomicclassification_id_seq CASCADE; 1203 DROP SEQUENCE IF EXISTS taxonomysystem_id_seq CASCADE; 1204 DROP SEQUENCE IF EXISTS temporalcrs_id_seq CASCADE; 1205 DROP SEQUENCE IF EXISTS temporaldatum_id_seq CASCADE; 1206 DROP SEQUENCE IF EXISTS timecs_id_seq CASCADE; 1207 DROP SEQUENCE IF EXISTS tk_position_id_seq CASCADE; 1208 DROP SEQUENCE IF EXISTS tm_intervallength_id_seq CASCADE; 1209 DROP SEQUENCE IF EXISTS topocurve_id_seq CASCADE; 1210 DROP SEQUENCE IF EXISTS topopoint_id_seq CASCADE; 1211 DROP SEQUENCE IF EXISTS toposurface_id_seq CASCADE; 1212 DROP SEQUENCE IF EXISTS topovolume_id_seq CASCADE; 1213 DROP SEQUENCE IF EXISTS uomweight_id_seq CASCADE; 1214 DROP SEQUENCE IF EXISTS vouchers_id_seq CASCADE; 1215 DROP SEQUENCE IF EXISTS weight_id_seq CASCADE; -
mauRepo/MolesManager/trunk/src/libs/migration/processor/commons.py
r8408 r8409 40 40 import html5lib 41 41 from html5lib import treebuilders 42 from ea_model.ceda_metadatamodel.ceda_result.ceda_result import CEDA_Result43 42 from ea_model.moles3_4.result.mo_onlineresource import MO_OnlineResource 44 from ea_model.ceda_metadatamodel.ceda_computation.ceda_processing import CEDA_Processing45 from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_instrument import CEDA_Instrument46 from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_compositeprocess import CEDA_CompositeProcess47 from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_acquisition import CEDA_Acquisition48 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project49 from ea_model.ceda_metadatamodel.ceda_utilities.ceda_review import CEDA_Review50 43 from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier 51 44 from ea_model.iso_19115_2006_metadata_corrigendum.identification_information.md_keywords import MD_Keywords … … 71 64 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox 72 65 from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import DQ_Element 66 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project 67 from ea_model.ceda_metadatamodel.ceda_utilities.ceda_review import CEDA_Review 68 from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_acquisition import CEDA_Acquisition 69 from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_compositeprocess import CEDA_CompositeProcess 70 from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_instrument import CEDA_Instrument 71 from ea_model.ceda_metadatamodel.ceda_computation.ceda_processing import CEDA_Processing 72 from ea_model.ceda_metadatamodel.ceda_result.ceda_result import CEDA_Result 73 73 74 74 base = '/exist/rest/atoms' … … 458 458 def extractSummary(deploymentMigration, dataEntityMigration): 459 459 resourceXML = getAtomDocumentByMO(deploymentMigration) 460 summary = resourceXML.find('%ssummary' % (atomNS))461 ret = _returnNotNoneText(summary)462 if ret:463 return ret464 resourceXML = getAtomDocumentByMO(dataEntityMigration)465 460 summary = resourceXML.find('%ssummary' % (atomNS)) 466 461 return _returnNotNoneText(summary) -
mauRepo/MolesManager/trunk/src/libs/migration/processor/dataEntity.py
r8408 r8409 31 31 @author: Maurizio Nagni 32 32 ''' 33 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import \34 CEDA_ObservationCollection35 33 from libs.migration.exception.exceptions import MigrationObjectException, NoAssociatedAuthor,\ 36 34 migrationObjectDescription, NoAssociatedDeployments … … 40 38 isoDateTimeStringToTimeDate, findUpdatedDate, createDate,\ 41 39 calculateHash, findDOIInMigrationDocument,\ 42 hasMOBeenProcessed, getAtomDocumentHashByMO, extractTitle 40 hasMOBeenProcessed, getAtomDocumentHashByMO, extractTitle, extractSummary 43 41 from libs.migration.processor.deployment import DeploymentProcessor 44 42 from logging import StreamHandler … … 46 44 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode 47 45 from MolesManager.ceda_guid import CedaGUID 48 from ea_model.moles3_4.observation.mo_observationpublicationstatevalue import MO_ObservationPublicationStateValue49 46 from MolesManager.codelist import MM_ObservationPublicationStateValue,\ 50 47 getCLValue 48 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 51 49 52 50 CEDA_TITLE = 'ceda_title' … … 73 71 def _checkGeographicExtent(self, ceda_observationCollection): 74 72 union = self.moles3epb.getUnifyObservationCollectionGE(ceda_observationCollection) 73 74 def _assignDescription(self, ceda_observationCollection): 75 if self._dataEntityHasSameHash: 76 return 77 78 description = extractSummary(self._dataEntityMigration) 79 80 if description: 81 ceda_observationCollection.description = description 75 82 76 83 def _processTitle(self, ceda_observationCollection): 84 if self._dataEntityHasSameHash: 85 return 86 77 87 ititle = extractTitle(self._dataEntityMigration) 78 88 if ceda_observationCollection.identifier: … … 118 128 119 129 self._processTitle(ceda_observationCollection) 130 self._assignDescription(ceda_observationCollection) 120 131 121 132 if not self._dataEntityHasSameHash: -
mauRepo/MolesManager/trunk/src/libs/migration/processor/deployment.py
r8408 r8409 51 51 findLinksInMigrationDocument, findSubTypeInDPT, extractMolesPublishedDate,\ 52 52 createMD_Keywords, hasMOBeenProcessed, createMO_Individual 53 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation54 53 from libs.epb import EPB 55 54 from libs.migration.processor.deployment_data import DeploymentDataProcessor … … 65 64 from copy import deepcopy 66 65 import datetime 67 from ea_model.ceda_metadatamodel.ceda_result import ceda_curationvalue68 from ea_model.ceda_metadatamodel.ceda_utilities.ceda_reviewfrequencyvalue import CEDA_ReviewFrequencyValue69 from ea_model.ceda_metadatamodel.ceda_utilities.ceda_reviewstatusvalue import CEDA_ReviewStatusValue70 66 from MolesManager.ceda_guid import CedaGUID 71 67 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_rolecode import CI_RoleCode 72 68 from ea_model.iso_19115_2006_metadata_corrigendum.maintenance_information.md_maintenancefrequencycode import MD_MaintenanceFrequencyCode 73 from ea_model.ceda_metadatamodel.ceda_result.ceda_curationvalue import CEDA_CurationValue74 69 from ea_model.moles3_4.utilities.ceda_rolevalue import CEDA_RoleValue 75 70 from ea_model.moles3_4.observation.mo_observationpublicationstatevalue import MO_ObservationPublicationStateValue 76 71 from MolesManager.codelist import MM_RoleValue,\ 77 72 MM_ObservationPublicationStateValue, getCLValue 73 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 74 from ea_model.ceda_metadatamodel.ceda_result.ceda_curationvalue import CEDA_CurationValue 75 from ea_model.ceda_metadatamodel.ceda_utilities.ceda_reviewstatusvalue import CEDA_ReviewStatusValue 76 from ea_model.ceda_metadatamodel.ceda_utilities.ceda_reviewfrequencyvalue import CEDA_ReviewFrequencyValue 78 77 79 78 MET_GEO_FEATURE = 'Meteorological geographical features' … … 366 365 return 367 366 368 description = extractSummary(self._deploymentMigration, self._dataEntityMigration) 367 description = extractSummary(self._deploymentMigration) 368 if description is None: 369 description = extractSummary(self._dataEntityMigration) 370 369 371 if description: 370 372 observation.description = description -
mauRepo/MolesManager/trunk/src/libs/migration/tests/infodbepbtests.py
r8222 r8409 18 18 def setUp(self): 19 19 InfodbEPBTest.infoDB = DbManager(INFO_DB_CONNECTION) 20 InfodbEPB.overrrideDBManager(InfodbEPBTest.infoDB)20 #InfodbEPB.overrrideDBManager(InfodbEPBTest.infoDB) 21 21 self.logging = logging.getLogger('InfodbEPB') 22 22 self.logging.addHandler(StreamHandler()) … … 30 30 self.getInfo() 31 31 32 32 ''' 33 33 def getInfo(self): 34 34 connection = InfodbEPB.getNewInfoConnection(); … … 38 38 print rec['id'] 39 39 records.close() 40 40 ''' 41 41 42 42 if __name__ == "__main__": -
mauRepo/MolesManager/trunk/src/libs/migration/tests/loadresource.py
r8147 r8409 20 20 def setUp(self): 21 21 migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT) 22 MigrationEPB.overrrideDBManager(migrationDB)22 #MigrationEPB.overrrideDBManager(migrationDB) 23 23 24 24 def testLoadResource(self): -
mauRepo/MolesManager/trunk/src/libs/migration/tests/moles3epbmothods.py
r8323 r8409 12 12 from logging import StreamHandler 13 13 from test_utils import createObservationCollection, createObservation, createProject 14 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection15 14 from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection 16 15 from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo 17 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation18 16 from ea_model.moles3_4.observation.mo_observation import MO_Observation 19 17 from ea_model.moles3_4.utilities.mo_rolevalue import MO_RoleValue -
mauRepo/MolesManager/trunk/src/libs/migration/tests/moles3epbtests.py
r8323 r8409 9 9 from libs.commons_db import DbManager 10 10 from unittest import TestCase 11 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection12 11 import logging, datetime 13 12 from logging import StreamHandler 14 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation15 13 from sqlalchemy.exc import IntegrityError 16 14 from libs.migration.processor.check.check import moles3Append … … 22 20 from ea_model.iso_19108_2006_temporal_schema.temporal_reference_system.tm_position import TM_Position 23 21 from test_utils import createObservationCollection,\ 24 createProject, createCI_Responsibility 25 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project 22 createProject, createCI_Responsibility 26 23 27 24 -
mauRepo/MolesManager/trunk/src/libs/migration/tests/test_utils.py
r8217 r8409 5 5 ''' 6 6 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 7 from libs.migration.processor.commons import create MD_Identifier,\8 create CI_Citation, createCI_Individual, createCI_Organization7 from libs.migration.processor.commons import createCI_Citation,\ 8 createMD_Identifier 9 9 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 10 10 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project 11 from ea_model.upcomingiso.ci_responsibility import CI_Responsibility12 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information import ci_rolecode13 from ea_model.upcomingiso.ci_individual import CI_Individual14 11 15 12 def createObservationCollection(): … … 41 38 return observation 42 39 40 ''' 43 41 def createCI_Responsibility(): 44 ''' 42 45 43 Creates a CI_Responsibility with the following data: 46 44 ci_responsibilty.role = 'ci_rolecode.CI_RoleCode.cl_author … … 49 47 ci_responsibilty.party[1] 50 48 CI_Organization.name = 'organization_1' 51 '''49 52 50 ci_responsibilty = CI_Responsibility() 53 51 ci_responsibilty.role = ci_rolecode.CI_RoleCode.cl_author … … 57 55 ci_responsibilty.party.append(ci_organization_1) 58 56 return ci_responsibilty 57 ''' 59 58 60 59 def createProject(): -
mauRepo/MolesManager/trunk/src/libs/migration/tests/testconfig.py
r8358 r8409 31 31 @author: Maurizio Nagni 32 32 ''' 33 33 34 MIGRATION_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3' 34 35 MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3' … … 38 39 MIGRATION_DB_SCRIPT = doMigration 39 40 40 41 from sqlTables import doTables as doMoles, attachEvents 42 MOLES3_DB_SCRIPT = doMoles 43 EVENTS_DB = attachEvents 41 from ea_model.sqlTables import attachEvents, doTables 42 MOLES3_DB_SCRIPT = doTables 43 EVENTS_DB = attachEvents
Note: See TracChangeset
for help on using the changeset viewer.