Ignore:
Timestamp:
06/02/12 16:49:57 (9 years ago)
Author:
mnagni
Message:

Imported a new DB library which fixes the MO_ObservationColleciton <--> CEDA_ObservationCollection problem

Location:
mauRepo/MolesManager/trunk/src
Files:
1 added
805 edited

Legend:

Unmodified
Added
Removed

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_acquisition.py

    r8086 r8087  
    1818from ea_model.moles3_4.acquisition.mo_acquisition import  MO_Acquisition  
    1919from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_process import  CEDA_Process  
     20from ascore.utils import has_value 
    2021 
    2122''' 
    22 Created on 03-Feb-2012 10:41:15 
     23Created on 06-Feb-2012 15:59:46 
    2324 
    2425@author: mnagni 
    2526''' 
    2627 
    27 class CEDA_Acquisition(CEDA_Process,MO_Acquisition): 
     28class CEDA_Acquisition(MO_Acquisition,CEDA_Process): 
    2829    ''' 
    2930        Represents a data entity defined in a UML diagram and supposed to  
    … …  
    3738    ''' 
    3839    def __init__(self): 
     40        self._ceda_process = CEDA_Process()      
    3941        self._mo_acquisition = MO_Acquisition()          
    40         self._ceda_process = CEDA_Process()      
    4142 
    4243        self.identifier = [] 
    … …  
    4950        self.description = None 
    5051        self.instrumentPlatformPair = [] 
     52        self.realatedParty = [] 
    5153        self._generatedObservation_om_measurement = [] 
     54        self._generatedObservation_om_geometryobservation = [] 
    5255        self._generatedObservation_om_discretecoverageobservation = [] 
    53         self._generatedObservation_om_geometryobservation = [] 
     56        self._generatedObservation_om_truthobservation = [] 
     57        self._generatedObservation_om_temporalobservation = [] 
    5458        self._generatedObservation_om_complexobservation = [] 
    5559        self._generatedObservation_om_countobservation = [] 
     60        self._generatedObservation_mo_observation = [] 
    5661        self._generatedObservation_om_categoryobservation = [] 
    57         self._generatedObservation_om_truthobservation = [] 
    58         self._generatedObservation_om_temporalobservation = [] 
    59         self._generatedObservation_mo_observation = [] 
    60         self.realatedParty = [] 
    6162        super(CEDA_Acquisition, self).__init__() 
    6263 
    … …  
    128129 
    129130    @property 
    130     def generatedObservation(self): 
    131         return self._mo_acquisition.generatedObservation 
    132  
    133     @generatedObservation.setter 
    134     def generatedObservation(self, value): 
    135             self._mo_acquisition.generatedObservation = value 
    136  
    137     @property 
    138131    def realatedParty(self): 
    139132        return self._mo_acquisition.realatedParty 
    … …  
    143136            self._mo_acquisition.realatedParty = value 
    144137 
     138    @property 
     139    def generatedObservation(self): 
     140        return self._ceda_process.generatedObservation 
     141 
     142    @generatedObservation.setter 
     143    def generatedObservation(self, value): 
     144            self._ceda_process.generatedObservation = value 
     145 
    145146    def __key(self): 
    146         return (self.identifier, self.instrument, self.review, self.operation, self.documentation, self.outputDescription, self.platform, self.description, self.instrumentPlatformPair, self.generatedObservation, self.realatedParty) 
     147        return (self.identifier, self.instrument, self.review, self.operation, self.documentation, self.outputDescription, self.platform, self.description, self.instrumentPlatformPair, self.realatedParty, self.generatedObservation) 
    147148 
    148149    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_instrument.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.acquisition.mo_instrument import  MO_Instrument  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_operation.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.acquisition.mo_operation import  MO_Operation  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 
    … …  
    4243        self.status = None 
    4344        self.review = [] 
     45        self._operationTime_tm_primitive = None 
    4446        self._operationTime_tm_complex = None 
    45         self._operationTime_tm_primitive = None 
    4647        self.documentation = [] 
    4748        self.location = None 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_platform.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.acquisition.mo_platform import  MO_Platform  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
    … …  
    3940 
    4041        self.identifier = [] 
     42        self.type = None 
    4143        self.relatedParty = [] 
    42         self.type = None 
    4344        self.review = [] 
    4445        self.documentation = [] 
    … …  
    5758 
    5859    @property 
     60    def type(self): 
     61        return self._mo_platform.type 
     62 
     63    @type.setter 
     64    def type(self, value): 
     65            self._mo_platform.type = value 
     66 
     67    @property 
    5968    def relatedParty(self): 
    6069        return self._mo_platform.relatedParty 
    … …  
    6372    def relatedParty(self, value): 
    6473            self._mo_platform.relatedParty = value 
    65  
    66     @property 
    67     def type(self): 
    68         return self._mo_platform.type 
    69  
    70     @type.setter 
    71     def type(self, value): 
    72             self._mo_platform.type = value 
    7374 
    7475 
    … …  
    107108 
    108109    def __key(self): 
    109         return (self.identifier, self.relatedParty, self.type, self.review, self.documentation, self.location, self.description, self.childPlatform) 
     110        return (self.identifier, self.type, self.relatedParty, self.review, self.documentation, self.location, self.description, self.childPlatform) 
    110111 
    111112    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_computation/ceda_processing.py

    r8086 r8087  
    1818from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_process import  CEDA_Process  
    1919from ea_model.moles3_4.computation.mo_processing import  MO_Processing  
     20from ascore.utils import has_value 
    2021 
    2122''' 
    22 Created on 03-Feb-2012 10:41:17 
     23Created on 06-Feb-2012 15:59:47 
    2324 
    2425@author: mnagni 
    2526''' 
    2627 
    27 class CEDA_Processing(CEDA_Process,MO_Processing): 
     28class CEDA_Processing(MO_Processing,CEDA_Process): 
    2829    ''' 
    2930        Represents a data entity defined in a UML diagram and supposed to  
    … …  
    3738    ''' 
    3839    def __init__(self): 
     40        self._ceda_process = CEDA_Process()      
    3941        self._mo_processing = MO_Processing()    
    40         self._ceda_process = CEDA_Process()      
    4142 
    4243        self.identifier = [] 
    … …  
    4546        self.review = [] 
    4647        self.algorithm = [] 
     48        self.processingInput = [] 
    4749        self.documentation = [] 
    48         self.processingInput = [] 
    4950        self.description = None 
    5051        self.processingOutput = None 
    5152        self._generatedObservation_om_measurement = [] 
     53        self._generatedObservation_om_geometryobservation = [] 
    5254        self._generatedObservation_om_discretecoverageobservation = [] 
    53         self._generatedObservation_om_geometryobservation = [] 
     55        self._generatedObservation_om_truthobservation = [] 
     56        self._generatedObservation_om_temporalobservation = [] 
    5457        self._generatedObservation_om_complexobservation = [] 
    5558        self._generatedObservation_om_countobservation = [] 
     59        self._generatedObservation_mo_observation = [] 
    5660        self._generatedObservation_om_categoryobservation = [] 
    57         self._generatedObservation_om_truthobservation = [] 
    58         self._generatedObservation_om_temporalobservation = [] 
    59         self._generatedObservation_mo_observation = [] 
    6061        super(CEDA_Processing, self).__init__() 
    6162 
    … …  
    9596 
    9697    @property 
     98    def processingInput(self): 
     99        return self._mo_processing.processingInput 
     100 
     101    @processingInput.setter 
     102    def processingInput(self, value): 
     103            self._mo_processing.processingInput = value 
     104 
     105    @property 
    97106    def documentation(self): 
    98107        return self._mo_processing.documentation 
    … …  
    101110    def documentation(self, value): 
    102111            self._mo_processing.documentation = value 
    103  
    104     @property 
    105     def processingInput(self): 
    106         return self._mo_processing.processingInput 
    107  
    108     @processingInput.setter 
    109     def processingInput(self, value): 
    110             self._mo_processing.processingInput = value 
    111112 
    112113    @property 
    … …  
    128129    @property 
    129130    def generatedObservation(self): 
    130         return self._mo_processing.generatedObservation 
     131        return self._ceda_process.generatedObservation 
    131132 
    132133    @generatedObservation.setter 
    133134    def generatedObservation(self, value): 
    134             self._mo_processing.generatedObservation = value 
     135            self._ceda_process.generatedObservation = value 
    135136 
    136137    def __key(self): 
    137         return (self.identifier, self.softwareReference, self.relatedParty, self.review, self.algorithm, self.documentation, self.processingInput, self.description, self.processingOutput, self.generatedObservation) 
     138        return (self.identifier, self.softwareReference, self.relatedParty, self.review, self.algorithm, self.processingInput, self.documentation, self.description, self.processingOutput, self.generatedObservation) 
    138139 
    139140    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observation/ceda_citation.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:13 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observation/ceda_observation.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.observation.mo_observation import  MO_Observation  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 
    … …  
    3940 
    4041        self.resolution = None 
     42        self._geographicExtent_ex_geographicdescription = [] 
    4143        self._geographicExtent_ex_boundingpolygon = [] 
    4244        self._geographicExtent_ex_geographicboundingbox = [] 
    43         self._geographicExtent_ex_geographicdescription = [] 
    4445        self.relatedParty = [] 
     46        self._permission_md_securityconstraints = None 
    4547        self._permission_md_legalconstraints = None 
    46         self._permission_md_securityconstraints = None 
    4748        self.resultTime = None 
     49        self.resultAccumulation = None 
     50        self._observedProperty_gf_attributetype = None 
     51        self._observedProperty_gf_associationrole = None 
    4852        self._observedProperty_gf_operation = None 
    49         self._observedProperty_gf_associationrole = None 
    50         self._observedProperty_gf_attributetype = None 
    51         self.resultAccumulation = None 
    5253        self.parameter = [] 
     54        self.identifier = [] 
    5355        self.publicationState = None 
    54         self.identifier = [] 
    5556        self.metadata = None 
    5657        self.dataLineage = None 
     58        self._phenomenonTime_tm_primitive = None 
    5759        self._phenomenonTime_tm_complex = None 
    58         self._phenomenonTime_tm_primitive = None 
    5960        self.documentation = [] 
     61        self._resultQuality_dq_logicalconsistency = [] 
     62        self._resultQuality_qe_usability = [] 
     63        self._resultQuality_dq_temporalaccuracy = [] 
    6064        self._resultQuality_dq_positionalaccuracy = [] 
    61         self._resultQuality_dq_logicalconsistency = [] 
    62         self._resultQuality_dq_temporalaccuracy = [] 
     65        self._resultQuality_dq_thematicaccuracy = [] 
    6366        self._resultQuality_dq_completeness = [] 
    64         self._resultQuality_qe_usability = [] 
    65         self._resultQuality_dq_thematicaccuracy = [] 
    6667        self.validTime = None 
    6768        self.procedure = None 
    … …  
    6970        self.verticalExtent = [] 
    7071        self.inSupportOf = None 
     72        self.internalReview = [] 
    7173        self.citation = [] 
    72         self.internalReview = [] 
     74        self._featureOfInterest_sf_samplingfeature = None 
    7375        self._featureOfInterest_gfi_domainfeature = None 
    7476        self._featureOfInterest_mo_featureofinterest = None 
    75         self._featureOfInterest_sf_samplingfeature = None 
     77        self.keywords = [] 
    7678        self.status = None 
    77         self.keywords = [] 
    7879        self._relatedObservation_om_measurement = [] 
     80        self._relatedObservation_om_geometryobservation = [] 
    7981        self._relatedObservation_om_discretecoverageobservation = [] 
    80         self._relatedObservation_om_geometryobservation = [] 
     82        self._relatedObservation_om_truthobservation = [] 
     83        self._relatedObservation_om_temporalobservation = [] 
    8184        self._relatedObservation_om_complexobservation = [] 
    8285        self._relatedObservation_om_countobservation = [] 
     86        self._relatedObservation_mo_observation = [] 
    8387        self._relatedObservation_om_categoryobservation = [] 
    84         self._relatedObservation_om_truthobservation = [] 
    85         self._relatedObservation_om_temporalobservation = [] 
    86         self._relatedObservation_mo_observation = [] 
    8788        self.description = None 
    8889        super(CEDA_Observation, self).__init__() 
    … …  
    129130 
    130131    @property 
     132    def resultAccumulation(self): 
     133        return self._mo_observation.resultAccumulation 
     134 
     135    @resultAccumulation.setter 
     136    def resultAccumulation(self, value): 
     137            self._mo_observation.resultAccumulation = value 
     138 
     139    @property 
    131140    def observedProperty(self): 
    132141        return self._mo_observation.observedProperty 
    … …  
    137146 
    138147    @property 
    139     def resultAccumulation(self): 
    140         return self._mo_observation.resultAccumulation 
    141  
    142     @resultAccumulation.setter 
    143     def resultAccumulation(self, value): 
    144             self._mo_observation.resultAccumulation = value 
    145  
    146     @property 
    147148    def parameter(self): 
    148149        return self._mo_observation.parameter 
    … …  
    153154 
    154155    @property 
     156    def identifier(self): 
     157        return self._mo_observation.identifier 
     158 
     159    @identifier.setter 
     160    def identifier(self, value): 
     161            self._mo_observation.identifier = value 
     162 
     163    @property 
    155164    def publicationState(self): 
    156165        return self._mo_observation.publicationState 
    … …  
    161170 
    162171    @property 
    163     def identifier(self): 
    164         return self._mo_observation.identifier 
    165  
    166     @identifier.setter 
    167     def identifier(self, value): 
    168             self._mo_observation.identifier = value 
    169  
    170     @property 
    171172    def metadata(self): 
    172173        return self._mo_observation.metadata 
    … …  
    254255            self._mo_observation.featureOfInterest = value 
    255256 
     257 
     258 
    256259    @property 
    257260    def status(self): 
    … …  
    262265            self._mo_observation.status = value 
    263266 
    264  
    265  
    266267    @property 
    267268    def relatedObservation(self): 
    … …  
    281282 
    282283    def __key(self): 
    283         return (self.resolution, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.observedProperty, self.resultAccumulation, self.parameter, self.publicationState, self.identifier, self.metadata, self.dataLineage, self.phenomenonTime, self.documentation, self.resultQuality, self.validTime, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.citation, self.internalReview, self.featureOfInterest, self.status, self.keywords, self.relatedObservation, self.description) 
     284        return (self.resolution, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.resultAccumulation, self.observedProperty, self.parameter, self.identifier, self.publicationState, self.metadata, self.dataLineage, self.phenomenonTime, self.documentation, self.resultQuality, self.validTime, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.internalReview, self.citation, self.featureOfInterest, self.keywords, self.status, self.relatedObservation, self.description) 
    284285 
    285286    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationcollection/ceda_observationcollection.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.observationcollection.mo_observationcollection import  MO_ObservationCollection  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
    … …  
    4041        self.identifier = [] 
    4142        self.publicationState = None 
     43        self._geographicExtent_ex_geographicdescription = [] 
    4244        self._geographicExtent_ex_boundingpolygon = [] 
    4345        self._geographicExtent_ex_geographicboundingbox = [] 
    44         self._geographicExtent_ex_geographicdescription = [] 
     46        self._phenomenonTime_tm_primitive = [] 
    4547        self._phenomenonTime_tm_complex = [] 
    46         self._phenomenonTime_tm_primitive = [] 
    4748        self.review = [] 
     49        self.subCollection = [] 
    4850        self.verticalExtent = [] 
    49         self.subCollection = [] 
    5051        self.member = [] 
    5152        self.additionalMetadata = [] 
    … …  
    9091 
    9192    @property 
     93    def subCollection(self): 
     94        return self._mo_observationcollection.subCollection 
     95 
     96    @subCollection.setter 
     97    def subCollection(self, value): 
     98            self._mo_observationcollection.subCollection = value 
     99 
     100    @property 
    92101    def verticalExtent(self): 
    93102        return self._mo_observationcollection.verticalExtent 
    … …  
    96105    def verticalExtent(self, value): 
    97106            self._mo_observationcollection.verticalExtent = value 
    98  
    99     @property 
    100     def subCollection(self): 
    101         return self._mo_observationcollection.subCollection 
    102  
    103     @subCollection.setter 
    104     def subCollection(self, value): 
    105             self._mo_observationcollection.subCollection = value 
    106107 
    107108    @property 
    … …  
    140141 
    141142    def __key(self): 
    142         return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.review, self.verticalExtent, self.subCollection, self.member, self.additionalMetadata, self.description, self.CEDAOfficer, self.isoMetadata) 
     143        return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.review, self.subCollection, self.verticalExtent, self.member, self.additionalMetadata, self.description, self.CEDAOfficer, self.isoMetadata) 
    143144 
    144145    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_compositeprocess.py

    r8086 r8087  
    1818from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_process import  CEDA_Process  
    1919from ea_model.moles3_4.observationprocess.mo_compositeprocess import  MO_CompositeProcess  
     20from ascore.utils import has_value 
    2021 
    2122''' 
    22 Created on 03-Feb-2012 10:41:11 
     23Created on 06-Feb-2012 15:59:41 
    2324 
    2425@author: mnagni 
    … …  
    4546        self.review = [] 
    4647        self.documentation = [] 
     48        self.description = None 
    4749        self.acquisitionComponent = [] 
    48         self.description = None 
    4950        self._generatedObservation_om_measurement = [] 
     51        self._generatedObservation_om_geometryobservation = [] 
    5052        self._generatedObservation_om_discretecoverageobservation = [] 
    51         self._generatedObservation_om_geometryobservation = [] 
     53        self._generatedObservation_om_truthobservation = [] 
     54        self._generatedObservation_om_temporalobservation = [] 
    5255        self._generatedObservation_om_complexobservation = [] 
    5356        self._generatedObservation_om_countobservation = [] 
     57        self._generatedObservation_mo_observation = [] 
    5458        self._generatedObservation_om_categoryobservation = [] 
    55         self._generatedObservation_om_truthobservation = [] 
    56         self._generatedObservation_om_temporalobservation = [] 
    57         self._generatedObservation_mo_observation = [] 
    5859        super(CEDA_CompositeProcess, self).__init__() 
    5960 
    … …  
    9394 
    9495    @property 
     96    def description(self): 
     97        return self._mo_compositeprocess.description 
     98 
     99    @description.setter 
     100    def description(self, value): 
     101            self._mo_compositeprocess.description = value 
     102 
     103    @property 
    95104    def acquisitionComponent(self): 
    96105        return self._mo_compositeprocess.acquisitionComponent 
    … …  
    99108    def acquisitionComponent(self, value): 
    100109            self._mo_compositeprocess.acquisitionComponent = value 
    101  
    102     @property 
    103     def description(self): 
    104         return self._mo_compositeprocess.description 
    105  
    106     @description.setter 
    107     def description(self, value): 
    108             self._mo_compositeprocess.description = value 
    109110 
    110111    @property 
    … …  
    117118 
    118119    def __key(self): 
    119         return (self.identifier, self.computationComponent, self.relatedParty, self.review, self.documentation, self.acquisitionComponent, self.description, self.generatedObservation) 
     120        return (self.identifier, self.computationComponent, self.relatedParty, self.review, self.documentation, self.description, self.acquisitionComponent, self.generatedObservation) 
    120121 
    121122    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_process.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.observationprocess.mo_process import  MO_Process  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
    … …  
    3940 
    4041        self._generatedObservation_om_measurement = [] 
     42        self._generatedObservation_om_geometryobservation = [] 
    4143        self._generatedObservation_om_discretecoverageobservation = [] 
    42         self._generatedObservation_om_geometryobservation = [] 
     44        self._generatedObservation_om_truthobservation = [] 
     45        self._generatedObservation_om_temporalobservation = [] 
    4346        self._generatedObservation_om_complexobservation = [] 
    4447        self._generatedObservation_om_countobservation = [] 
     48        self._generatedObservation_mo_observation = [] 
    4549        self._generatedObservation_om_categoryobservation = [] 
    46         self._generatedObservation_om_truthobservation = [] 
    47         self._generatedObservation_om_temporalobservation = [] 
    48         self._generatedObservation_mo_observation = [] 
    4950        super(CEDA_Process, self).__init__() 
    5051 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_project/ceda_project.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.project.mo_project import  MO_Project  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 
    … …  
    4647        self.identifier = [] 
    4748        self.abstract = None 
     49        self.keywords = [] 
    4850        self.status = None 
    49         self.keywords = [] 
    5051        self.documentation = [] 
    5152        self.description = None 
    … …  
    106107 
    107108    @property 
     109    def keywords(self): 
     110        return self._mo_project.keywords 
     111 
     112    @keywords.setter 
     113    def keywords(self, value): 
     114            self._mo_project.keywords = value 
     115 
     116    @property 
    108117    def status(self): 
    109118        return self._mo_project.status 
    … …  
    112121    def status(self, value): 
    113122            self._mo_project.status = value 
    114  
    115     @property 
    116     def keywords(self): 
    117         return self._mo_project.keywords 
    118  
    119     @keywords.setter 
    120     def keywords(self, value): 
    121             self._mo_project.keywords = value 
    122123 
    123124    @property 
    … …  
    146147 
    147148    def __key(self): 
    148         return (self.relatedParty, self.review, self.dmp, self.projectResource, self.subProject, self.publicationState, self.identifier, self.abstract, self.status, self.keywords, self.documentation, self.description, self.observationCollection) 
     149        return (self.relatedParty, self.review, self.dmp, self.projectResource, self.subProject, self.publicationState, self.identifier, self.abstract, self.keywords, self.status, self.documentation, self.description, self.observationCollection) 
    149150 
    150151    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_curationvalue.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    cl_b = "b"  
     35    cl_a = "a"  
    3336    cl_c = "c"  
    34     cl_a = "a"  
    35     cl_b = "b"  

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_result.py

    r8086 r8087  
    1717 
    1818from ea_model.moles3_4.result.mo_result import  MO_Result  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._mo_result = MO_Result()    
    3940 
     41        self.sample = [] 
    4042        self.segment = [] 
    41         self.sample = [] 
    4243        self.numberOfFiles = None 
    4344        self.curationCategory = None 
    … …  
    4849 
    4950    @property 
     51    def sample(self): 
     52        return self._mo_result.sample 
     53 
     54    @sample.setter 
     55    def sample(self, value): 
     56            self._mo_result.sample = value 
     57 
     58    @property 
    5059    def segment(self): 
    5160        return self._mo_result.segment 
    … …  
    5463    def segment(self, value): 
    5564            self._mo_result.segment = value 
    56  
    57     @property 
    58     def sample(self): 
    59         return self._mo_result.sample 
    60  
    61     @sample.setter 
    62     def sample(self, value): 
    63             self._mo_result.sample = value 
    6465 
    6566 
    … …  
    8081 
    8182    def __key(self): 
    82         return (self.segment, self.sample, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
     83        return (self.sample, self.segment, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
    8384 
    8485    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_notes.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:39 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_review.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:18 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewfrequencyvalue.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:10 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    cl_threeyear = "threeYear"  
    3335    cl_yearly = "yearly"  
    34     cl_threeyear = "threeYear"  
    3536    cl_biannual = "biannual"  

  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewstatusvalue.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
    33     cl_complete = "complete"  
    3434    cl_required = "required"  
    3535    cl_progressing = "progressing"  
     36    cl_complete = "complete"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_00639_language_codes/languagecode.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
    33     cl_japanese = "Japanese"  
    34     cl_greek = "Greek"  
    35     cl_turkish = "Turkish"  
    36     cl_latvian = "Latvian"  
    37     cl_estonian = "Estonian"  
    38     cl_portuguese = "Portuguese"  
     34    cl_croatian = "Croatian"  
    3935    cl_dutch = "Dutch"  
    40     cl_chinese = "Chinese"  
    41     cl_malaysian = "Malaysian"  
    42     cl_croatian = "Croatian"  
    43     cl_french = "French"  
    44     cl_belarusian = "Belarusian"  
    45     cl_afrikaans = "Afrikaans"  
    4636    cl_basque = "Basque"  
    4737    cl_hawaian = "Hawaian"  
    4838    cl_bulgarian = "Bulgarian"  
     39    cl_german = "German"  
     40    cl_turkish = "Turkish"  
     41    cl_serbian = "Serbian"  
     42    cl_romanian = "Romanian"  
     43    cl_malaysian = "Malaysian"  
     44    cl_slovenian = "Slovenian"  
     45    cl_norwegian = "Norwegian"  
     46    cl_french = "French"  
     47    cl_korean = "Korean"  
     48    cl_icelandic = "Icelandic"  
     49    cl_japanese = "Japanese"  
     50    cl_ukranian = "Ukranian"  
     51    cl_belarusian = "Belarusian"  
     52    cl_greek = "Greek"  
     53    cl_hebrew = "Hebrew"  
     54    cl_spanish = "Spanish"  
     55    cl_latvian = "Latvian"  
     56    cl_arabic = "Arabic"  
     57    cl_albanian = "Albanian"  
     58    cl_czech = "Czech"  
     59    cl_swedish = "Swedish"  
     60    cl_russian = "Russian"  
     61    cl_chinese = "Chinese"  
     62    cl_english = "English"  
     63    cl_swahili = "Swahili"  
     64    cl_hungarian = "Hungarian"  
     65    cl_slovak = "Slovak"  
     66    cl_afrikaans = "Afrikaans"  
     67    cl_portuguese = "Portuguese"  
     68    cl_italian = "Italian"  
     69    cl_estonian = "Estonian"  
     70    cl_polish = "Polish"  
     71    cl_faeroese = "Faeroese"  
     72    cl_lithuanian = "Lithuanian"  
     73    cl_indonesian = "Indonesian"  
     74    cl_finnish = "Finnish"  
     75    cl_danish = "Danish"  
     76    cl_catalan = "Catalan"  
    4977    cl_french_canadian_ = "French(Canadian)"  
    50     cl_korean = "Korean"  
    51     cl_indonesian = "Indonesian"  
    52     cl_german = "German"  
    53     cl_norwegian = "Norwegian"  
    54     cl_english = "English"  
    55     cl_russian = "Russian"  
    56     cl_slovenian = "Slovenian"  
    57     cl_finnish = "Finnish"  
    58     cl_faeroese = "Faeroese"  
    59     cl_swedish = "Swedish"  
    60     cl_danish = "Danish"  
    61     cl_arabic = "Arabic"  
    62     cl_czech = "Czech"  
    63     cl_romanian = "Romanian"  
    64     cl_polish = "Polish"  
    65     cl_catalan = "Catalan"  
    66     cl_slovak = "Slovak"  
    67     cl_albanian = "Albanian"  
    68     cl_spanish = "Spanish"  
    69     cl_icelandic = "Icelandic"  
    70     cl_hebrew = "Hebrew"  
    71     cl_hungarian = "Hungarian"  
    72     cl_ukranian = "Ukranian"  
    73     cl_serbian = "Serbian"  
    74     cl_swahili = "Swahili"  
    75     cl_lithuanian = "Lithuanian"  
    76     cl_italian = "Italian"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angle.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angularvelocity.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/area.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/currency.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/distance.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.length import  Length  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/length.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measure.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:10 
     21Created on 06-Feb-2012 15:59:46 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measuretype.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
    33     cl_velocity = "velocity"  
    34     cl_scale = "scale"  
     34    cl_time = "time"  
     35    cl_length = "length"  
    3536    cl_angle = "angle"  
    3637    cl_volume = "volume"  
     38    cl_velocity = "velocity"  
    3739    cl_area = "area"  
    3840    cl_weight = "weight"  
    39     cl_length = "length"  
    40     cl_time = "time"  
     41    cl_scale = "scale"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/scale.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:39 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/standardunits.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
    33     cl_meter = "meter"  
     34    cl_meter_meter = "meter/meter"  
     35    cl_second = "second"  
    3436    cl_squaremeter = "squareMeter"  
     37    cl_meters_second = "meters/second"  
    3538    cl_cubicmeter = "cubicMeter"  
    3639    cl_kilogram = "kilogram"  
    37     cl_meters_second = "meters/second"  
    3840    cl_radian = "radian"  
    39     cl_meter_meter = "meter/meter"  
    40     cl_second = "second"  
     41    cl_meter = "meter"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/subunitsperunit.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:09 
     21Created on 06-Feb-2012 15:59:49 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/time.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitofmeasure.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:13 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 
    … …  
    3940        self.nameStandardUnit = None 
    4041        self.scaleToStandardUnit = None 
     42        self.measureType = None 
    4143        self.measure = [] 
    42         self.measureType = None 
    4344        self.offsetToStandardUnit = None 
    4445        self.uomName = None 
    … …  
    6667 
    6768    def __key(self): 
    68         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     69        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    6970 
    7071    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitslist.py

    r8086 r8087  
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.standardunits import  StandardUnits  
    1919from ascore.ascodelist import  ASCodeList  
     20from ascore.utils import has_value 
    2021 
    2122''' 
    22 Created on 03-Feb-2012 10:41:18 
     23Created on 06-Feb-2012 15:59:46 
    2324 
    2425@author: mnagni 
    … …  
    3233        This class has been genererated automatically using the Apache Velocity project. 
    3334    ''' 
     35    cl_cubicyard = "cubicYard"  
     36    cl_foot = "foot"  
    3437    cl_squarefoot = "squareFoot"  
    35     cl_foot = "foot"  
    36     cl_cubicyard = "cubicYard"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangle.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangularvelocity.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.uomvelocity import  UomVelocity  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomarea.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:10 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomcurrency.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomlength.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomscale.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomtime.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvelocity.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvolume.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:10 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomweight.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:10 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/velocity.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/volume.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/weight.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/bag.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.collection import  Collection  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:38 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/circularsequence.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.sequence import  Sequence  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/code.py

    r8086 r8087  
    1818from sqlalchemy.types import  Text,  NUMERIC  
    1919from ascore.asunion import  ASUnion  
     20from ascore.utils import has_value 
    2021 
    2122''' 
    22 Created on 03-Feb-2012 10:41:18 
     23Created on 06-Feb-2012 15:59:43 
    2324 
    2425@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/codelist.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:13 
     21Created on 06-Feb-2012 15:59:49 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/collection.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:11 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/dictionary.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:18 
     21Created on 06-Feb-2012 15:59:36 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keytype.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keyvaluepair.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:14 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/sequence.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.collection import  Collection  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:38 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/set.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.collection import  Collection  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/t.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/transfiniteset.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:13 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/valuetype.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:18 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/genericname.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/localname.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.genericname import  GenericName  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/membername.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.localname import  LocalName  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/namespace.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:14 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/null.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:46 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/reference.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:36 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/scopedname.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.genericname import  GenericName  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/typename.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.localname import  LocalName  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/void.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:13 
     21Created on 06-Feb-2012 15:59:36 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/any.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:40 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/classtypedescriptor.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/operationtype.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 
    … …  
    3839        self.inputParameters = None 
    3940        self.returnType = None 
    40         self.ouputParamters = None 
    4141        self.theClassTypeDescriptor = [] 
    4242        self.metaData = None 
     43        self.ouputParamters = None 
    4344        self.descirption = None 
    4445        super(OperationType, self).__init__() 
    … …  
    5758 
    5859    def __key(self): 
    59         return (self.inputParameters, self.returnType, self.ouputParamters, self.theClassTypeDescriptor, self.metaData, self.descirption) 
     60        return (self.inputParameters, self.returnType, self.theClassTypeDescriptor, self.metaData, self.ouputParamters, self.descirption) 
    6061 
    6162    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/record.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:49 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordschema.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.records_and_class_metadata.schema import  Schema  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordtype.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.records_and_class_metadata.type import  Type  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/schema.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.namespace import  NameSpace  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
    … …  
    4142        self.isGlobal = None 
    4243        self.schemaName = None 
     44        self.description = None 
    4345        self.acceptableClassList = [] 
    44         self.description = None 
    4546        super(Schema, self).__init__() 
    4647 
    … …  
    6263 
    6364    def __key(self): 
    64         return (self.name, self.isGlobal, self.schemaName, self.acceptableClassList, self.description) 
     65        return (self.name, self.isGlobal, self.schemaName, self.description, self.acceptableClassList) 
    6566 
    6667    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/type.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:09 
     21Created on 06-Feb-2012 15:59:47 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/clocktime.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:08 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/date.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 
    … …  
    3738 
    3839        self.day = None 
     40        self.century = None 
    3941        self.year = None 
    40         self.century = None 
    4142        self.month = None 
    4243        self.precision = None 
    … …  
    5455 
    5556    def __key(self): 
    56         return (self.day, self.year, self.century, self.month, self.precision) 
     57        return (self.day, self.century, self.year, self.month, self.precision) 
    5758 
    5859    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/dateprecision.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:47 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/datetime.py

    r8086 r8087  
    1818from ea_model.iso_19103_2005_schema_language.basic_types.primitive.date_and_time.clocktime import  ClockTime  
    1919from ea_model.iso_19103_2005_schema_language.basic_types.primitive.date_and_time.date import  Date  
     20from ascore.utils import has_value 
    2021 
    2122''' 
    22 Created on 03-Feb-2012 10:41:12 
     23Created on 06-Feb-2012 15:59:37 
    2324 
    2425@author: mnagni 
    … …  
    4344        self.second = None 
    4445        self.day = None 
     46        self.century = None 
    4547        self.year = None 
    46         self.century = None 
    4748        self.month = None 
    4849        self.minute = None 
    … …  
    7677 
    7778    @property 
     79    def century(self): 
     80        return self._date.century 
     81 
     82    @century.setter 
     83    def century(self, value): 
     84            self._date.century = value 
     85 
     86    @property 
    7887    def year(self): 
    7988        return self._date.year 
    … …  
    8291    def year(self, value): 
    8392            self._date.year = value 
    84  
    85     @property 
    86     def century(self): 
    87         return self._date.century 
    88  
    89     @century.setter 
    90     def century(self, value): 
    91             self._date.century = value 
    9293 
    9394    @property 
    … …  
    124125 
    125126    def __key(self): 
    126         return (self.timeZone, self.second, self.day, self.year, self.century, self.month, self.minute, self.precision, self.hour) 
     127        return (self.timeZone, self.second, self.day, self.century, self.year, self.month, self.minute, self.precision, self.hour) 
    127128 
    128129    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/bit.py

    r8086 r8087  
    1717 
    1818from ascore.asenumeration import  ASEnumeration  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:39 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/digit.py

    r8086 r8087  
    1717 
    1818from ascore.asenumeration import  ASEnumeration  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
    33     en_eight = "eight"  
    34     en_two = "two"  
     34    en_nine = "nine"  
    3535    en_six = "six"  
    3636    en_four = "four"  
    3737    en_five = "five"  
    38     en_three = "three"  
    39     en_zero = "zero"  
    40     en_nine = "nine"  
     38    en_two = "two"  
    4139    en_seven = "seven"  
    4240    en_one = "one"  
     41    en_zero = "zero"  
     42    en_three = "three"  
     43    en_eight = "eight"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/sign.py

    r8086 r8087  
    1717 
    1818from ascore.asenumeration import  ASEnumeration  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    en_positve = "Positve"  
    3335    en_negative = "Negative"  
    34     en_positve = "Positve"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/multiplicities/multiplicity.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:47 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/multiplicities/multiplicityrange.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/decimal.py

    r8086 r8087  
    1717 
    1818from sqlalchemy.types import  NUMERIC  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/integer.py

    r8086 r8087  
    1717 
    1818from sqlalchemy.types import  NUMERIC  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/number.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:13 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/real.py

    r8086 r8087  
    1717 
    1818from sqlalchemy.types import  NUMERIC  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:39 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/unlimitedinteger.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:18 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/vector.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/character.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:47 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/charactersetcode.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    cl_iso10646_1 = "ISO10646-1"  
     35    cl_iso10646_2 = "ISO10646-2"  
    3336    cl_iso8859 = "ISO8859"  
    34     cl_iso10646_2 = "ISO10646-2"  
    35     cl_iso10646_1 = "ISO10646-1"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/ocl.py

    r8086 r8087  
    1717 
    1818from sqlalchemy.types import  Text  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/boolean.py

    r8086 r8087  
    1717 
    1818from ascore.asenumeration import  ASEnumeration  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    en_false = "FALSE"  
    3335    en_true = "TRUE"  
    34     en_false = "FALSE"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/continuoustruth.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.primitive.truth.truth import  Truth  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/discretetruth.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.primitive.truth.truth import  Truth  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/logical.py

    r8086 r8087  
    1717 
    1818from ascore.asenumeration import  ASEnumeration  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/probability.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19103_2005_schema_language.basic_types.primitive.truth.continuoustruth import  ContinuousTruth  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/truth.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:09 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/directposition.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:11 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 
    … …  
    3637    def __init__(self): 
    3738 
     39        self._CRS_sc_compoundcrs = None 
    3840        self._CRS_sc_singlecrs = None 
    39         self._CRS_sc_compoundcrs = None 
    4041        self.dimension = None 
    4142        self.coordinate = [] 
    … …  
    4445    @property 
    4546    def CRS(self): 
    46         if(self._CRS_sc_singlecrs is not None): 
     47        if(has_value(self._CRS_sc_compoundcrs)): 
     48            return self._CRS_sc_compoundcrs 
     49        if(has_value(self._CRS_sc_singlecrs)): 
    4750            return self._CRS_sc_singlecrs 
    48         if(self._CRS_sc_compoundcrs is not None): 
    49             return self._CRS_sc_compoundcrs 
    50         return None 
     51        return  None 
    5152 
    5253    @CRS.setter 
    5354    def CRS(self, value): 
    5455        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     56        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
     57            self._CRS_sc_compoundcrs = value 
     58            self._CRS_sc_singlecrs = None 
    5559        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
    5660            self._CRS_sc_singlecrs = value 
    5761            self._CRS_sc_compoundcrs = None 
    58         if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
    59             self._CRS_sc_compoundcrs = value 
    60             self._CRS_sc_singlecrs = None 
    6162 
    6263 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_affineplacement.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:39 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arc.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring import  GM_ArcString  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_arcstring = GM_ArcString()      
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
    … …  
    4849 
    4950    @property 
     51    def curve(self): 
     52        return self._gm_arcstring.curve 
     53 
     54    @curve.setter 
     55    def curve(self, value): 
     56            self._gm_arcstring.curve = value 
     57 
     58    @property 
    5059    def numDerivativesAtEnd(self): 
    5160        return self._gm_arcstring.numDerivativesAtEnd 
    … …  
    5463    def numDerivativesAtEnd(self, value): 
    5564            self._gm_arcstring.numDerivativesAtEnd = value 
    56  
    57     @property 
    58     def curve(self): 
    59         return self._gm_arcstring.curve 
    60  
    61     @curve.setter 
    62     def curve(self, value): 
    63             self._gm_arcstring.curve = value 
    6465 
    6566    @property 
    … …  
    104105 
    105106    def __key(self): 
    106         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     107        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    107108 
    108109    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcbybulge.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstringbybulge import  GM_ArcStringByBulge  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:38 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_arcstringbybulge = GM_ArcStringByBulge()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.normal = [] 
    4344        self.interpolation = None 
    … …  
    4950 
    5051    @property 
     52    def curve(self): 
     53        return self._gm_arcstringbybulge.curve 
     54 
     55    @curve.setter 
     56    def curve(self, value): 
     57            self._gm_arcstringbybulge.curve = value 
     58 
     59    @property 
    5160    def numDerivativesAtEnd(self): 
    5261        return self._gm_arcstringbybulge.numDerivativesAtEnd 
    … …  
    5564    def numDerivativesAtEnd(self, value): 
    5665            self._gm_arcstringbybulge.numDerivativesAtEnd = value 
    57  
    58     @property 
    59     def curve(self): 
    60         return self._gm_arcstringbybulge.curve 
    61  
    62     @curve.setter 
    63     def curve(self, value): 
    64             self._gm_arcstringbybulge.curve = value 
    6566 
    6667    @property 
    … …  
    113114 
    114115    def __key(self): 
    115         return (self.numDerivativesAtEnd, self.curve, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
     116        return (self.curve, self.numDerivativesAtEnd, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
    116117 
    117118    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstring.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
    … …  
    4849 
    4950    @property 
     51    def curve(self): 
     52        return self._gm_curvesegment.curve 
     53 
     54    @curve.setter 
     55    def curve(self, value): 
     56            self._gm_curvesegment.curve = value 
     57 
     58    @property 
    5059    def numDerivativesAtEnd(self): 
    5160        return self._gm_curvesegment.numDerivativesAtEnd 
    … …  
    5463    def numDerivativesAtEnd(self, value): 
    5564            self._gm_curvesegment.numDerivativesAtEnd = value 
    56  
    57     @property 
    58     def curve(self): 
    59         return self._gm_curvesegment.curve 
    60  
    61     @curve.setter 
    62     def curve(self, value): 
    63             self._gm_curvesegment.curve = value 
    6465 
    6566    @property 
    … …  
    9293 
    9394    def __key(self): 
    94         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     95        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    9596 
    9697    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstringbybulge.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:36 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.normal = [] 
    4344        self.interpolation = None 
    … …  
    4950 
    5051    @property 
     52    def curve(self): 
     53        return self._gm_curvesegment.curve 
     54 
     55    @curve.setter 
     56    def curve(self, value): 
     57            self._gm_curvesegment.curve = value 
     58 
     59    @property 
    5160    def numDerivativesAtEnd(self): 
    5261        return self._gm_curvesegment.numDerivativesAtEnd 
    … …  
    5564    def numDerivativesAtEnd(self, value): 
    5665            self._gm_curvesegment.numDerivativesAtEnd = value 
    57  
    58     @property 
    59     def curve(self): 
    60         return self._gm_curvesegment.curve 
    61  
    62     @curve.setter 
    63     def curve(self, value): 
    64             self._gm_curvesegment.curve = value 
    6566 
    6667 
    … …  
    9596 
    9697    def __key(self): 
    97         return (self.numDerivativesAtEnd, self.curve, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
     98        return (self.curve, self.numDerivativesAtEnd, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
    9899 
    99100    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bezier.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_bsplinecurve import  GM_BSplineCurve  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
    … …  
    3940 
    4041        self.curveForm = None 
     42        self.curve = None 
    4143        self.numDerivativesAtEnd = None 
    42         self.curve = None 
    4344        self.knot = [] 
    4445        self.interpolation = None 
    … …  
    6061 
    6162    @property 
     63    def curve(self): 
     64        return self._gm_bsplinecurve.curve 
     65 
     66    @curve.setter 
     67    def curve(self, value): 
     68            self._gm_bsplinecurve.curve = value 
     69 
     70    @property 
    6271    def numDerivativesAtEnd(self): 
    6372        return self._gm_bsplinecurve.numDerivativesAtEnd 
    … …  
    6675    def numDerivativesAtEnd(self, value): 
    6776            self._gm_bsplinecurve.numDerivativesAtEnd = value 
    68  
    69     @property 
    70     def curve(self): 
    71         return self._gm_bsplinecurve.curve 
    72  
    73     @curve.setter 
    74     def curve(self, value): 
    75             self._gm_bsplinecurve.curve = value 
    7677 
    7778    @property 
    … …  
    140141 
    141142    def __key(self): 
    142         return (self.curveForm, self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
     143        return (self.curveForm, self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
    143144 
    144145    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bicubicgrid.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:36 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bilineargrid.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:09 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinecurve.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve import  GM_SplineCurve  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
    … …  
    3940 
    4041        self.curveForm = None 
     42        self.curve = None 
    4143        self.numDerivativesAtEnd = None 
    42         self.curve = None 
    4344        self.knot = [] 
    4445        self.interpolation = None 
    … …  
    5455 
    5556    @property 
     57    def curve(self): 
     58        return self._gm_splinecurve.curve 
     59 
     60    @curve.setter 
     61    def curve(self, value): 
     62            self._gm_splinecurve.curve = value 
     63 
     64    @property 
    5665    def numDerivativesAtEnd(self): 
    5766        return self._gm_splinecurve.numDerivativesAtEnd 
    … …  
    6069    def numDerivativesAtEnd(self, value): 
    6170            self._gm_splinecurve.numDerivativesAtEnd = value 
    62  
    63     @property 
    64     def curve(self): 
    65         return self._gm_splinecurve.curve 
    66  
    67     @curve.setter 
    68     def curve(self, value): 
    69             self._gm_splinecurve.curve = value 
    7071 
    7172    @property 
    … …  
    122123 
    123124    def __key(self): 
    124         return (self.curveForm, self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
     125        return (self.curveForm, self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
    125126 
    126127    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurface.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurfaceform.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
    … …  
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    cl_toroidal = "toroidal"  
     35    cl_spherical = "spherical"  
     36    cl_unspecified = "unspecified"  
    3337    cl_cylindrical = "cylindrical"  
    34     cl_toroidal = "toroidal"  
    3538    cl_conical = "conical"  
    3639    cl_planar = "planar"  
    37     cl_unspecified = "unspecified"  
    38     cl_spherical = "spherical"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_circle.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arc import  GM_Arc  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_arc = GM_Arc()          
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
    … …  
    4849 
    4950    @property 
     51    def curve(self): 
     52        return self._gm_arc.curve 
     53 
     54    @curve.setter 
     55    def curve(self, value): 
     56            self._gm_arc.curve = value 
     57 
     58    @property 
    5059    def numDerivativesAtEnd(self): 
    5160        return self._gm_arc.numDerivativesAtEnd 
    … …  
    5463    def numDerivativesAtEnd(self, value): 
    5564            self._gm_arc.numDerivativesAtEnd = value 
    56  
    57     @property 
    58     def curve(self): 
    59         return self._gm_arc.curve 
    60  
    61     @curve.setter 
    62     def curve(self, value): 
    63             self._gm_arc.curve = value 
    6465 
    6566    @property 
    … …  
    104105 
    105106    def __key(self): 
    106         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     107        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    107108 
    108109    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_clothoid.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:40 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.endParameter = None 
    4042        self.startParameter = None 
    41         self.endParameter = None 
     43        self.curve = None 
    4244        self.numDerivativesAtEnd = None 
    43         self.curve = None 
    4445        self.interpolation = None 
    4546        self.numDerivativesAtStart = None 
    … …  
    5455 
    5556    @property 
     57    def curve(self): 
     58        return self._gm_curvesegment.curve 
     59 
     60    @curve.setter 
     61    def curve(self, value): 
     62            self._gm_curvesegment.curve = value 
     63 
     64    @property 
    5665    def numDerivativesAtEnd(self): 
    5766        return self._gm_curvesegment.numDerivativesAtEnd 
    … …  
    6069    def numDerivativesAtEnd(self, value): 
    6170            self._gm_curvesegment.numDerivativesAtEnd = value 
    62  
    63     @property 
    64     def curve(self): 
    65         return self._gm_curvesegment.curve 
    66  
    67     @curve.setter 
    68     def curve(self, value): 
    69             self._gm_curvesegment.curve = value 
    7071 
    7172    @property 
    … …  
    9899 
    99100    def __key(self): 
    100         return (self.startParameter, self.endParameter, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
     101        return (self.endParameter, self.startParameter, self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
    101102 
    102103    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cone.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_conic.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
    … …  
    3940 
    4041        self.startConstrParam = None 
     42        self.curve = None 
    4143        self.numDerivativesAtEnd = None 
    42         self.curve = None 
    4344        self.interpolation = None 
    4445        self.numDerivativesAtStart = None 
    … …  
    5455 
    5556    @property 
     57    def curve(self): 
     58        return self._gm_curvesegment.curve 
     59 
     60    @curve.setter 
     61    def curve(self, value): 
     62            self._gm_curvesegment.curve = value 
     63 
     64    @property 
    5665    def numDerivativesAtEnd(self): 
    5766        return self._gm_curvesegment.numDerivativesAtEnd 
    … …  
    6069    def numDerivativesAtEnd(self, value): 
    6170            self._gm_curvesegment.numDerivativesAtEnd = value 
    62  
    63     @property 
    64     def curve(self): 
    65         return self._gm_curvesegment.curve 
    66  
    67     @curve.setter 
    68     def curve(self, value): 
    69             self._gm_curvesegment.curve = value 
    7071 
    7172    @property 
    … …  
    104105 
    105106    def __key(self): 
    106         return (self.startConstrParam, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.endConstrParam, self.numDerivativeInterior, self.shifted, self.position, self.semiLatusRectum, self.eccentricity) 
     107        return (self.startConstrParam, self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.endConstrParam, self.numDerivativeInterior, self.shifted, self.position, self.semiLatusRectum, self.eccentricity) 
    107108 
    108109    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cubicspline.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_polynomialspline import  GM_PolynomialSpline  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:49 
    2223 
    2324@author: mnagni 
    … …  
    3839        self._gm_polynomialspline = GM_PolynomialSpline()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.knot = [] 
    4344        self.interpolation = None 
    4445        self.numDerivativesAtStart = None 
    4546        self.degree = None 
     47        self.vectorAtStart = [] 
    4648        self.vectorAtEnd = [] 
    47         self.vectorAtStart = [] 
    4849        self.numDerivativeInterior = None 
    4950        self.controlPoints = None 
    5051        super(GM_CubicSpline, self).__init__() 
     52 
     53    @property 
     54    def curve(self): 
     55        return self._gm_polynomialspline.curve 
     56 
     57    @curve.setter 
     58    def curve(self, value): 
     59            self._gm_polynomialspline.curve = value 
    5160 
    5261    @property 
    … …  
    5766    def numDerivativesAtEnd(self, value): 
    5867            self._gm_polynomialspline.numDerivativesAtEnd = value 
    59  
    60     @property 
    61     def curve(self): 
    62         return self._gm_polynomialspline.curve 
    63  
    64     @curve.setter 
    65     def curve(self, value): 
    66             self._gm_polynomialspline.curve = value 
    6768 
    6869    @property 
    … …  
    99100 
    100101    @property 
     102    def vectorAtStart(self): 
     103        return self._gm_polynomialspline.vectorAtStart 
     104 
     105    @vectorAtStart.setter 
     106    def vectorAtStart(self, value): 
     107            self._gm_polynomialspline.vectorAtStart = value 
     108 
     109    @property 
    101110    def vectorAtEnd(self): 
    102111        return self._gm_polynomialspline.vectorAtEnd 
    … …  
    105114    def vectorAtEnd(self, value): 
    106115            self._gm_polynomialspline.vectorAtEnd = value 
    107  
    108     @property 
    109     def vectorAtStart(self): 
    110         return self._gm_polynomialspline.vectorAtStart 
    111  
    112     @vectorAtStart.setter 
    113     def vectorAtStart(self, value): 
    114             self._gm_polynomialspline.vectorAtStart = value 
    115116 
    116117    @property 
    … …  
    131132 
    132133    def __key(self): 
    133         return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtEnd, self.vectorAtStart, self.numDerivativeInterior, self.controlPoints) 
     134        return (self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtStart, self.vectorAtEnd, self.numDerivativeInterior, self.controlPoints) 
    134135 
    135136    def __eq__(x, y): 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cylinder.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_envelope.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericcurve.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:11 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericsurface.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:49 
    2122 
    2223@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_geodesic.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring import  GM_GeodesicString  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni