Ignore:
Timestamp:
10/07/12 14:41:56 (7 years ago)
Author:
mnagni
Message:

Corrected an error in the generation of the classes "synchronize" method.

Location:
mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/ceda_platformtypevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:03 
     25Created on 10-Jul-2012 14:15:05 
    2626 
    2727@author: mnagni 
     
    3535                This class has been genererated automatically using the Apache Velocity project. 
    3636        ''' 
    37         cl_spacestation = "spaceStation"  
    3837        cl_groundstation = "groundStation"  
     38        cl_orbitalsatellite = "orbitalSatellite"  
    3939        cl_aircraft = "aircraft"  
    4040        cl_watercraft = "watercraft"  
     41        cl_balloon = "balloon"  
    4142        cl_vehicle = "vehicle"  
     43        cl_spacestation = "spaceStation"  
    4244        cl_geostationaysatellite = "geostationaySatellite"  
    43         cl_orbitalsatellite = "orbitalSatellite"  
    44         cl_balloon = "balloon"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_acquisition.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:16 
     25Created on 10-Jul-2012 14:15:09 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_instrument.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:12 
     24Created on 10-Jul-2012 14:15:07 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_instrumentplatformpair.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:08 
     24Created on 10-Jul-2012 14:15:05 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_instrumenttypevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:16 
     25Created on 10-Jul-2012 14:15:11 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_location.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:05 
     24Created on 10-Jul-2012 14:15:05 
    2525 
    2626@author: mnagni 
     
    4141 
    4242                self.nameLocation = None 
     43                self._geometryLocation_gm_aggregate = None 
     44                self._geometryLocation_gm_primitive = None 
    4345                self._geometryLocation_gm_complex = None 
    44                 self._geometryLocation_gm_primitive = None 
    45                 self._geometryLocation_gm_aggregate = None 
    4646                self._geometryLocation = None 
    4747                super(MO_Location, self).__init__() 
    4848        @property 
    4949        def geometryLocation(self):      
     50                if(has_value(self._geometryLocation_gm_aggregate)): 
     51                        return self._geometryLocation_gm_aggregate 
     52                if(has_value(self._geometryLocation_gm_primitive)): 
     53                        return self._geometryLocation_gm_primitive 
    5054                if(has_value(self._geometryLocation_gm_complex)): 
    5155                        return self._geometryLocation_gm_complex 
    52                 if(has_value(self._geometryLocation_gm_primitive)): 
    53                         return self._geometryLocation_gm_primitive 
    54                 if(has_value(self._geometryLocation_gm_aggregate)): 
    55                         return self._geometryLocation_gm_aggregate 
    5656                return  None 
    5757 
     
    5959        def geometryLocation(self, value):       
    6060                valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     61                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_aggregates.gm_aggregate.GM_Aggregate": 
     62                        self._geometryLocation_gm_aggregate = value 
     63                        self._geometryLocation_gm_primitive = None 
     64                        self._geometryLocation_gm_complex = None 
     65                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_primitive.GM_Primitive": 
     66                        self._geometryLocation_gm_primitive = value 
     67                        self._geometryLocation_gm_aggregate = None 
     68                        self._geometryLocation_gm_complex = None 
    6169                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_complex.GM_Complex": 
    6270                        self._geometryLocation_gm_complex = value 
    63                         self._geometryLocation_gm_primitive = None 
    6471                        self._geometryLocation_gm_aggregate = None 
    65                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_primitive.GM_Primitive": 
    66                         self._geometryLocation_gm_primitive = value 
    67                         self._geometryLocation_gm_complex = None 
    68                         self._geometryLocation_gm_aggregate = None 
    69                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_aggregates.gm_aggregate.GM_Aggregate": 
    70                         self._geometryLocation_gm_aggregate = value 
    71                         self._geometryLocation_gm_complex = None 
    7272                        self._geometryLocation_gm_primitive = None 
    7373 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_operation.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:13 
     24Created on 10-Jul-2012 14:15:11 
    2525 
    2626@author: mnagni 
     
    4242                self.identifier = [] 
    4343                self.childOperation = [] 
     44                self.relatedParty = [] 
    4445                self.status = None 
    45                 self.relatedParty = [] 
    4646                self._operationTime_tm_complex = None 
    4747                self._operationTime_tm_primitive = None 
     
    7474 
    7575        def __key(self): 
    76                 return (self.identifier, self.childOperation, self.status, self.relatedParty, self.operationTime, self.documentation, self.location, self.platform, self.description) 
     76                return (self.identifier, self.childOperation, self.relatedParty, self.status, self.operationTime, self.documentation, self.location, self.platform, self.description) 
    7777 
    7878        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_operationstatusvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:07 
     25Created on 10-Jul-2012 14:15:02 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_platform.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:12 
     24Created on 10-Jul-2012 14:15:06 
    2525 
    2626@author: mnagni 
     
    4141 
    4242                self.identifier = [] 
     43                self.relatedParty = [] 
    4344                self.type = None 
    44                 self.relatedParty = [] 
    4545                self.documentation = [] 
    4646                self.location = None 
     
    5353 
    5454        def __key(self): 
    55                 return (self.identifier, self.type, self.relatedParty, self.documentation, self.location, self.description, self.childPlatform) 
     55                return (self.identifier, self.relatedParty, self.type, self.documentation, self.location, self.description, self.childPlatform) 
    5656 
    5757        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/acquisition/mo_platformtypevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:12 
     25Created on 10-Jul-2012 14:15:00 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/computation/mo_computation.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:16 
     25Created on 10-Jul-2012 14:15:04 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/computation/mo_inputoutput.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:15 
     24Created on 10-Jul-2012 14:15:02 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/computation/mo_processing.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:15:08 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/featureofinterest/mo_featureofinterest.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:14 
     25Created on 10-Jul-2012 14:15:10 
    2626 
    2727@author: mnagni 
     
    4444                self.identifier = [] 
    4545                self.type = None 
     46                self.description = None 
    4647                self.sampledFeature = None 
    47                 self.description = None 
    4848                super(MO_FeatureOfInterest, self).__init__() 
    4949        @property 
     
    5959 
    6060        def __key(self): 
    61                 return (self.identifier, self.type, self.propertyValueProvider, self.sampledFeature, self.description) 
     61                return (self.identifier, self.type, self.propertyValueProvider, self.description, self.sampledFeature) 
    6262 
    6363        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/featureofinterest/mo_featureofinteresttypevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:42:59 
     25Created on 10-Jul-2012 14:15:05 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/featureofinterest/mo_specimenprocess.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:11 
     25Created on 10-Jul-2012 14:15:10 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observableproperty/mo_absractobservableproperty.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:14 
     24Created on 10-Jul-2012 14:15:05 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observableproperty/mo_basephenomenonvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:14:58 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observableproperty/mo_compositeobservableproperty.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:10 
     25Created on 10-Jul-2012 14:14:58 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observableproperty/mo_observablepropertyconstraint.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:07 
     24Created on 10-Jul-2012 14:15:06 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observableproperty/mo_simpleobservableproperty.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:11 
     25Created on 10-Jul-2012 14:15:14 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observation/mo_observation.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:15:13 
    2626 
    2727@author: mnagni 
     
    4343 
    4444                self.resolution = None 
    45                 self._geographicExtent_ex_boundingpolygon = [] 
    4645                self._geographicExtent_ex_geographicdescription = [] 
    4746                self._geographicExtent_ex_geographicboundingbox = [] 
     47                self._geographicExtent_ex_boundingpolygon = [] 
    4848                self._geographicExtent = [] 
    4949                self.procedure = None 
    5050                self.relatedParty = [] 
     51                self._permission_md_securityconstraints = None 
    5152                self._permission_md_legalconstraints = None 
    52                 self._permission_md_securityconstraints = None 
    5353                self._permission = None 
    5454                self.result = None 
     
    5959                self.inSupportOf = None 
    6060                self.metadata = None 
     61                self.publicationState = None 
    6162                self.identifier = [] 
    62                 self.publicationState = None 
    6363                self.featureOfInterest = None 
    6464                self.phenomenonTime = None 
     
    7272                try: 
    7373                        ret = [] 
    74                         ret.extend(self._geographicExtent_ex_boundingpolygon) 
    7574                        ret.extend(self._geographicExtent_ex_geographicdescription) 
    7675                        ret.extend(self._geographicExtent_ex_geographicboundingbox) 
     76                        ret.extend(self._geographicExtent_ex_boundingpolygon) 
    7777                        if not hasattr(self, '_geographicExtent'): 
    7878                                self._geographicExtent = [] 
     
    9494        @property 
    9595        def permission(self):    
     96                if(has_value(self._permission_md_securityconstraints)): 
     97                        return self._permission_md_securityconstraints 
    9698                if(has_value(self._permission_md_legalconstraints)): 
    9799                        return self._permission_md_legalconstraints 
    98                 if(has_value(self._permission_md_securityconstraints)): 
    99                         return self._permission_md_securityconstraints 
    100100                return  None 
    101101 
     
    103103        def permission(self, value):     
    104104                valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     105                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_securityconstraints.MD_SecurityConstraints": 
     106                        self._permission_md_securityconstraints = value 
     107                        self._permission_md_legalconstraints = None 
    105108                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_legalconstraints.MD_LegalConstraints": 
    106109                        self._permission_md_legalconstraints = value 
    107110                        self._permission_md_securityconstraints = None 
    108                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_securityconstraints.MD_SecurityConstraints": 
    109                         self._permission_md_securityconstraints = value 
    110                         self._permission_md_legalconstraints = None 
    111111        @property 
    112112        def resultTime(self):    
     
    145145                        self._om_observation.featureOfInterest = value 
    146146        @property 
     147        def relatedObservation(self):    
     148                return self._om_observation.relatedObservation 
     149 
     150        @relatedObservation.setter 
     151        def relatedObservation(self, value):     
     152                        self._om_observation.relatedObservation = value 
     153        @property 
    147154        def phenomenonTime(self):        
    148155                return self._om_observation.phenomenonTime 
     
    152159                        self._om_observation.phenomenonTime = value 
    153160        @property 
    154         def relatedObservation(self):    
    155                 return self._om_observation.relatedObservation 
    156  
    157         @relatedObservation.setter 
    158         def relatedObservation(self, value):     
    159                         self._om_observation.relatedObservation = value 
     161        def resultQuality(self):         
     162                return self._om_observation.resultQuality 
     163 
     164        @resultQuality.setter 
     165        def resultQuality(self, value):  
     166                        self._om_observation.resultQuality = value 
    160167        @property 
    161168        def validTime(self):     
     
    165172        def validTime(self, value):      
    166173                        self._om_observation.validTime = value 
    167         @property 
    168         def resultQuality(self):         
    169                 return self._om_observation.resultQuality 
    170  
    171         @resultQuality.setter 
    172         def resultQuality(self, value):  
    173                         self._om_observation.resultQuality = value 
    174174 
    175175        def synchronize(self): 
    176                 del self._geographicExtent_ex_boundingpolygon[:] 
     176                int_geographicExtent = self.geographicExtent     
    177177                del self._geographicExtent_ex_geographicdescription[:] 
    178178                del self._geographicExtent_ex_geographicboundingbox[:] 
    179                 for item in self.geographicExtent:       
    180                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    181                         if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_boundingpolygon.EX_BoundingPolygon": 
    182                                 self._geographicExtent_ex_boundingpolygon.append(item) 
    183                                 continue 
     179                del self._geographicExtent_ex_boundingpolygon[:] 
     180                for item in int_geographicExtent:        
    184181                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    185182                        if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicdescription.EX_GeographicDescription": 
    186183                                self._geographicExtent_ex_geographicdescription.append(item) 
    187184                                continue 
    188                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    189185                        if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox.EX_GeographicBoundingBox": 
    190186                                self._geographicExtent_ex_geographicboundingbox.append(item) 
    191187                                continue 
     188                        if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_boundingpolygon.EX_BoundingPolygon": 
     189                                self._geographicExtent_ex_boundingpolygon.append(item) 
     190                                continue 
    192191                pass 
    193192 
    194193        def __key(self): 
    195                 return (self.resolution, self.geographicExtent, self.procedure, self.relatedParty, self.permission, self.result, self.resultTime, self.verticalExtent, self.observedProperty, self.resultAccumulation, self.parameter, self.inSupportOf, self.metadata, self.identifier, self.publicationState, self.featureOfInterest, self.phenomenonTime, self.relatedObservation, self.status, self.documentation, self.validTime, self.resultQuality, self.description) 
     194                return (self.resolution, self.geographicExtent, self.procedure, self.relatedParty, self.permission, self.result, self.resultTime, self.verticalExtent, self.observedProperty, self.resultAccumulation, self.parameter, self.inSupportOf, self.metadata, self.publicationState, self.identifier, self.featureOfInterest, self.relatedObservation, self.phenomenonTime, self.status, self.documentation, self.resultQuality, self.validTime, self.description) 
    196195 
    197196        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observation/mo_observationpublicationstatevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:13 
     25Created on 10-Jul-2012 14:15:07 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observation/mo_observationstatusvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:02 
     25Created on 10-Jul-2012 14:15:03 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observation/mo_resultaccumulationvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:13 
     25Created on 10-Jul-2012 14:15:11 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observationcollection/mo_observationcollection.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:09 
     24Created on 10-Jul-2012 14:15:11 
    2525 
    2626@author: mnagni 
     
    4040        def __init__(self): 
    4141 
     42                self.identifier = [] 
    4243                self.publicationState = None 
    43                 self.identifier = [] 
    44                 self._geographicExtent_ex_boundingpolygon = [] 
    4544                self._geographicExtent_ex_geographicdescription = [] 
    4645                self._geographicExtent_ex_geographicboundingbox = [] 
     46                self._geographicExtent_ex_boundingpolygon = [] 
    4747                self._geographicExtent = [] 
     48                self._phenomenonTime_tm_instant = [] 
    4849                self._phenomenonTime_tm_period = [] 
    49                 self._phenomenonTime_tm_instant = [] 
    5050                self._phenomenonTime = [] 
     51                self.verticalExtent = [] 
    5152                self.subCollection = [] 
    52                 self.verticalExtent = [] 
    5353                self.additionalMetadata = [] 
    5454                self.member = [] 
     
    6060                try: 
    6161                        ret = [] 
    62                         ret.extend(self._geographicExtent_ex_boundingpolygon) 
    6362                        ret.extend(self._geographicExtent_ex_geographicdescription) 
    6463                        ret.extend(self._geographicExtent_ex_geographicboundingbox) 
     64                        ret.extend(self._geographicExtent_ex_boundingpolygon) 
    6565                        if not hasattr(self, '_geographicExtent'): 
    6666                                self._geographicExtent = [] 
     
    7777                try: 
    7878                        ret = [] 
     79                        ret.extend(self._phenomenonTime_tm_instant) 
    7980                        ret.extend(self._phenomenonTime_tm_period) 
    80                         ret.extend(self._phenomenonTime_tm_instant) 
    8181                        if not hasattr(self, '_phenomenonTime'): 
    8282                                self._phenomenonTime = [] 
     
    9191 
    9292        def synchronize(self): 
    93                 del self._geographicExtent_ex_boundingpolygon[:] 
     93                int_geographicExtent = self.geographicExtent     
    9494                del self._geographicExtent_ex_geographicdescription[:] 
    9595                del self._geographicExtent_ex_geographicboundingbox[:] 
     96                del self._geographicExtent_ex_boundingpolygon[:] 
     97                int_phenomenonTime = self.phenomenonTime         
     98                del self._phenomenonTime_tm_instant[:] 
    9699                del self._phenomenonTime_tm_period[:] 
    97                 del self._phenomenonTime_tm_instant[:] 
    98                 for item in self.geographicExtent:       
    99                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    100                         if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_boundingpolygon.EX_BoundingPolygon": 
    101                                 self._geographicExtent_ex_boundingpolygon.append(item) 
    102                                 continue 
     100                for item in int_geographicExtent:        
    103101                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    104102                        if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicdescription.EX_GeographicDescription": 
    105103                                self._geographicExtent_ex_geographicdescription.append(item) 
    106104                                continue 
    107                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    108105                        if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox.EX_GeographicBoundingBox": 
    109106                                self._geographicExtent_ex_geographicboundingbox.append(item) 
    110107                                continue 
    111                 for item in self.phenomenonTime:         
    112                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    113                         if valueClass == "ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period.TM_Period": 
    114                                 self._phenomenonTime_tm_period.append(item) 
     108                        if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_boundingpolygon.EX_BoundingPolygon": 
     109                                self._geographicExtent_ex_boundingpolygon.append(item) 
    115110                                continue 
     111                for item in int_phenomenonTime:  
    116112                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    117113                        if valueClass == "ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant.TM_Instant": 
    118114                                self._phenomenonTime_tm_instant.append(item) 
    119115                                continue 
     116                        if valueClass == "ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period.TM_Period": 
     117                                self._phenomenonTime_tm_period.append(item) 
     118                                continue 
    120119                pass 
    121120 
    122121        def __key(self): 
    123                 return (self.publicationState, self.identifier, self.geographicExtent, self.phenomenonTime, self.subCollection, self.verticalExtent, self.additionalMetadata, self.member, self.description, self.isoMetadata) 
     122                return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.verticalExtent, self.subCollection, self.additionalMetadata, self.member, self.description, self.isoMetadata) 
    124123 
    125124        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observationcollection/mo_observationcollectionpublicationstatevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:08 
     25Created on 10-Jul-2012 14:15:08 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observationprocess/mo_compositeprocess.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:15:06 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/observationprocess/mo_process.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:13 
     25Created on 10-Jul-2012 14:15:11 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/project/mo_project.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:11 
     24Created on 10-Jul-2012 14:15:13 
    2525 
    2626@author: mnagni 
     
    4343                self.identifier = [] 
    4444                self.abstract = None 
     45                self.status = None 
    4546                self.keywords = [] 
    46                 self.status = None 
    4747                self.relatedParty = [] 
    4848                self.documentation = [] 
     49                self.description = None 
    4950                self.dmp = None 
    50                 self.description = None 
    5151                self.observationCollection = [] 
    5252                self.subProject = [] 
     
    5757 
    5858        def __key(self): 
    59                 return (self.publicationState, self.identifier, self.abstract, self.keywords, self.status, self.relatedParty, self.documentation, self.dmp, self.description, self.observationCollection, self.subProject) 
     59                return (self.publicationState, self.identifier, self.abstract, self.status, self.keywords, self.relatedParty, self.documentation, self.description, self.dmp, self.observationCollection, self.subProject) 
    6060 
    6161        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/project/mo_projectpublicationstatevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:02 
     25Created on 10-Jul-2012 14:15:00 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/project/mo_projectstatusvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:04 
     25Created on 10-Jul-2012 14:15:14 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/result/ceda_applicationprofilevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:08 
     25Created on 10-Jul-2012 14:15:10 
    2626 
    2727@author: mnagni 
     
    3636        ''' 
    3737        cl_geosciml = "geosciml"  
    38         cl_netcdf = "netCDF"  
    39         cl_csv = "csv"  
    40         cl_cerif = "cerif"  
    4138        cl_csml = "csml"  
    4239        cl_vivo = "vivo"  
     40        cl_cerif = "cerif"  
     41        cl_csv = "csv"  
     42        cl_netcdf = "netCDF"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/result/mo_onlineresource.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:15:08 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/result/mo_result.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:10 
     24Created on 10-Jul-2012 14:15:01 
    2525 
    2626@author: mnagni 
     
    4040        def __init__(self): 
    4141 
     42                self.segment = [] 
    4243                self.sample = [] 
    43                 self.segment = [] 
    4444                self.source = [] 
    4545                super(MO_Result, self).__init__() 
     
    4949 
    5050        def __key(self): 
    51                 return (self.sample, self.segment, self.source) 
     51                return (self.segment, self.sample, self.source) 
    5252 
    5353        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/result/mo_servicefunctionvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:03 
     25Created on 10-Jul-2012 14:15:10 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/ceda_publicationstatevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:12 
     25Created on 10-Jul-2012 14:15:11 
    2626 
    2727@author: mnagni 
     
    3535                This class has been genererated automatically using the Apache Velocity project. 
    3636        ''' 
    37         cl_old = "old"  
    3837        cl_published = "published"  
    3938        cl_citable = "citable"  
     39        cl_old = "old"  
    4040        cl_working = "working"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/ceda_rolevalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:08 
     25Created on 10-Jul-2012 14:15:08 
    2626 
    2727@author: mnagni 
     
    3535                This class has been genererated automatically using the Apache Velocity project. 
    3636        ''' 
    37         cl_deliverer = "deliverer"  
     37        cl_collaborator = "collaborator"  
     38        cl_operator = "operator"  
     39        cl_manager = "manager"  
     40        cl_coauthor = "coAuthor"  
    3841        cl_metadataowner = "metadataOwner"  
    39         cl_coauthor = "coAuthor"  
     42        cl_editor = "editor"  
     43        cl_sponsor = "sponsor"  
    4044        cl_mediator = "mediator"  
    4145        cl_projectscientist = "projectScientist"  
    42         cl_manufacturer = "manufacturer"  
    43         cl_rightsholder = "rightsHolder"  
    44         cl_editor = "editor"  
    45         cl_manager = "manager"  
    46         cl_sponsor = "sponsor"  
    47         cl_operator = "operator"  
     46        cl_curator = "curator"  
     47        cl_deliverer = "deliverer"  
    4848        cl_contributor = "contributor"  
    4949        cl_funder = "funder"  
     50        cl_rightsholder = "rightsHolder"  
    5051        cl_stakeholder = "stakeholder"  
    51         cl_collaborator = "collaborator"  
    52         cl_curator = "curator"  
     52        cl_manufacturer = "manufacturer"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/mo_citation.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:13 
     25Created on 10-Jul-2012 14:15:04 
    2626 
    2727@author: mnagni 
     
    8181                        self._ci_citation.date = value 
    8282        @property 
     83        def ISSN(self):  
     84                return self._ci_citation.ISSN 
     85 
     86        @ISSN.setter 
     87        def ISSN(self, value):   
     88                        self._ci_citation.ISSN = value 
     89        @property 
    8390        def alternateTitle(self):        
    8491                return self._ci_citation.alternateTitle 
     
    8895                        self._ci_citation.alternateTitle = value 
    8996        @property 
    90         def ISSN(self):  
    91                 return self._ci_citation.ISSN 
     97        def edition(self):       
     98                return self._ci_citation.edition 
    9299 
    93         @ISSN.setter 
    94         def ISSN(self, value):   
    95                         self._ci_citation.ISSN = value 
     100        @edition.setter 
     101        def edition(self, value):        
     102                        self._ci_citation.edition = value 
    96103        @property 
    97104        def identifier(self):    
     
    101108        def identifier(self, value):     
    102109                        self._ci_citation.identifier = value 
    103         @property 
    104         def edition(self):       
    105                 return self._ci_citation.edition 
    106  
    107         @edition.setter 
    108         def edition(self, value):        
    109                         self._ci_citation.edition = value 
    110110        @property 
    111111        def title(self):         
     
    130130                        self._ci_citation.series = value 
    131131        @property 
     132        def citedResponsibleParty(self):         
     133                return self._ci_citation.citedResponsibleParty 
     134 
     135        @citedResponsibleParty.setter 
     136        def citedResponsibleParty(self, value):  
     137                        self._ci_citation.citedResponsibleParty = value 
     138        @property 
    132139        def ISBN(self):  
    133140                return self._ci_citation.ISBN 
     
    136143        def ISBN(self, value):   
    137144                        self._ci_citation.ISBN = value 
    138         @property 
    139         def citedResponsibleParty(self):         
    140                 return self._ci_citation.citedResponsibleParty 
    141  
    142         @citedResponsibleParty.setter 
    143         def citedResponsibleParty(self, value):  
    144                         self._ci_citation.citedResponsibleParty = value 
    145145 
    146146        def synchronize(self): 
     
    148148 
    149149        def __key(self): 
    150                 return (self.presentationForm, self.editionDate, self.collectiveTitle, self.date, self.alternateTitle, self.ISSN, self.identifier, self.edition, self.title, self.otherCitationDetails, self.series, self.onlineResource, self.ISBN, self.citedResponsibleParty) 
     150                return (self.presentationForm, self.editionDate, self.collectiveTitle, self.date, self.ISSN, self.alternateTitle, self.edition, self.identifier, self.title, self.otherCitationDetails, self.series, self.onlineResource, self.citedResponsibleParty, self.ISBN) 
    151151 
    152152        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/mo_individual.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:15:05 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/mo_organisation.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:01 
     25Created on 10-Jul-2012 14:15:10 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/mo_party.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:13 
     24Created on 10-Jul-2012 14:15:11 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/mo_responsiblepartyfunctionvalue.py

    r8437 r8457  
    2323 
    2424''' 
    25 Created on 06-Jul-2012 07:43:09 
     25Created on 10-Jul-2012 14:15:14 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/moles3_4/utilities/mo_responsiblepartyinfo.py

    r8437 r8457  
    2222 
    2323''' 
    24 Created on 06-Jul-2012 07:43:03 
     24Created on 10-Jul-2012 14:15:11 
    2525 
    2626@author: mnagni 
     
    4141 
    4242                self.extent = [] 
     43                self._party_mo_individual = [] 
    4344                self._party_mo_organisation = [] 
    44                 self._party_mo_individual = [] 
    4545                self._party = [] 
    4646                self.role = None 
     
    5050                try: 
    5151                        ret = [] 
     52                        ret.extend(self._party_mo_individual) 
    5253                        ret.extend(self._party_mo_organisation) 
    53                         ret.extend(self._party_mo_individual) 
    5454                        if not hasattr(self, '_party'): 
    5555                                self._party = [] 
     
    6464 
    6565        def synchronize(self): 
     66                int_party = self.party   
     67                del self._party_mo_individual[:] 
    6668                del self._party_mo_organisation[:] 
    67                 del self._party_mo_individual[:] 
    68                 for item in self.party:  
    69                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    70                         if valueClass == "ea_model.moles3_4.utilities.mo_organisation.MO_Organisation": 
    71                                 self._party_mo_organisation.append(item) 
    72                                 continue 
     69                for item in int_party:   
    7370                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    7471                        if valueClass == "ea_model.moles3_4.utilities.mo_individual.MO_Individual": 
    7572                                self._party_mo_individual.append(item) 
     73                                continue 
     74                        if valueClass == "ea_model.moles3_4.utilities.mo_organisation.MO_Organisation": 
     75                                self._party_mo_organisation.append(item) 
    7676                                continue 
    7777                pass 
Note: See TracChangeset for help on using the changeset viewer.