Changeset 8437 for mauRepo


Ignore:
Timestamp:
06/07/12 09:00:43 (7 years ago)
Author:
mnagni
Message:

Added a new function to ascore.utils in order to synchronize classes before committing to database

The following constraints has been added to the official model:

MO_ObservationCollection:member:CEDA_Observation
MO_ObservationCollection:phenomenonTime:TM_GeometricPrimitive
MO_Project:observationCollection:CEDA_ObservationCollection
MO_Observation:result:CEDA_Result
MO_Observation:inSupportOf:CEDA_Project
MO_Project:subProject:CEDA_Project
OM_Observation:procedure:CEDA_Process
OM_Observation:phenomenonTime:TM_GeometricPrimitive
MO_ResponsiblePartyFunctionValue:CEDA_RoleValue

Location:
mauRepo/CedaMolesModel/trunk
Files:
2 added
1129 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/CedaMolesModel/trunk

    • Property svn:ignore
      •  

        old new  
        44 
        55.project 
         6 
         7dist 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model

    • Property svn:ignore set to
      ceda_moles_model.egg-info
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ascore/utils.py

    r8381 r8437  
    4242            toHash.append(item) 
    4343    return toHash 
     44 
     45def synchAttributes(instance): 
     46    """ 
     47        Restores the class's composition elements. 
     48        This methods should be called before any commit operation 
     49        @param instance: the instance that has to be restored  
     50    """ 
     51    if hasattr(instance, 'synchronize'): 
     52        instance.synchronize() 
     53    for attr in dir(instance): 
     54        try: 
     55            if hasattr(getattr(instance,attr), 'synchronize'): 
     56                synchAttributes(getattr(instance,attr)) 
     57        except Exception as e: 
     58            pass 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_acquisition.py

    r8398 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:38 
     26Created on 06-Jul-2012 07:43:16 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_Acquisition(MO_Acquisition,CEDA_Process): 
     31class CEDA_Acquisition(CEDA_Process,MO_Acquisition): 
    3232        ''' 
    3333                Represents a data entity defined in a UML diagram and supposed to  
     
    4141        ''' 
    4242        def __init__(self): 
     43                self._mo_acquisition = MO_Acquisition()          
    4344                self._ceda_process = CEDA_Process()      
    44                 self._mo_acquisition = MO_Acquisition()          
    4545 
    4646                self.metadataManagement = [] 
     
    113113        @property 
    114114        def generatedObservation(self):  
    115                 return self._ceda_process.generatedObservation 
     115                return self._mo_acquisition.generatedObservation 
    116116 
    117117        @generatedObservation.setter 
    118118        def generatedObservation(self, value):   
    119                         self._ceda_process.generatedObservation = value 
     119                        self._mo_acquisition.generatedObservation = value 
    120120 
    121121        def synchronize(self): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_instrument.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:24 
     25Created on 06-Jul-2012 07:43:14 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_operation.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:27 
     25Created on 06-Jul-2012 07:43:09 
    2626 
    2727@author: mnagni 
     
    6363                        self._mo_operation.childOperation = value 
    6464        @property 
     65        def status(self):        
     66                return self._mo_operation.status 
     67 
     68        @status.setter 
     69        def status(self, value):         
     70                        self._mo_operation.status = value 
     71        @property 
    6572        def relatedParty(self):  
    6673                return self._mo_operation.relatedParty 
     
    6976        def relatedParty(self, value):   
    7077                        self._mo_operation.relatedParty = value 
    71         @property 
    72         def status(self):        
    73                 return self._mo_operation.status 
    74  
    75         @status.setter 
    76         def status(self, value):         
    77                         self._mo_operation.status = value 
    7878        @property 
    7979        def operationTime(self):         
     
    116116 
    117117        def __key(self): 
    118                 return (self.identifier, self.childOperation, self.metadataManagement, self.relatedParty, self.status, self.operationTime, self.documentation, self.location, self.platform, self.description) 
     118                return (self.identifier, self.childOperation, self.metadataManagement, self.status, self.relatedParty, self.operationTime, self.documentation, self.location, self.platform, self.description) 
    119119 
    120120        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_platform.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:34 
     25Created on 06-Jul-2012 07:43:09 
    2626 
    2727@author: mnagni 
     
    5555                        self._mo_platform.identifier = value 
    5656        @property 
     57        def type(self):  
     58                return self._mo_platform.type 
     59 
     60        @type.setter 
     61        def type(self, value):   
     62                        self._mo_platform.type = value 
     63        @property 
    5764        def relatedParty(self):  
    5865                return self._mo_platform.relatedParty 
     
    6168        def relatedParty(self, value):   
    6269                        self._mo_platform.relatedParty = value 
    63         @property 
    64         def type(self):  
    65                 return self._mo_platform.type 
    66  
    67         @type.setter 
    68         def type(self, value):   
    69                         self._mo_platform.type = value 
    7070        @property 
    7171        def documentation(self):         
     
    101101 
    102102        def __key(self): 
    103                 return (self.identifier, self.metadataManagement, self.relatedParty, self.type, self.documentation, self.location, self.description, self.childPlatform) 
     103                return (self.identifier, self.metadataManagement, self.type, self.relatedParty, self.documentation, self.location, self.description, self.childPlatform) 
    104104 
    105105        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_computation/ceda_processing.py

    r8398 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:36 
     26Created on 06-Jul-2012 07:43:11 
    2727 
    2828@author: mnagni 
     
    7777                        self._mo_processing.algorithm = value 
    7878        @property 
     79        def processingInput(self):       
     80                return self._mo_processing.processingInput 
     81 
     82        @processingInput.setter 
     83        def processingInput(self, value):        
     84                        self._mo_processing.processingInput = value 
     85        @property 
    7986        def documentation(self):         
    8087                return self._mo_processing.documentation 
     
    8390        def documentation(self, value):  
    8491                        self._mo_processing.documentation = value 
    85         @property 
    86         def processingInput(self):       
    87                 return self._mo_processing.processingInput 
    88  
    89         @processingInput.setter 
    90         def processingInput(self, value):        
    91                         self._mo_processing.processingInput = value 
    9292        @property 
    9393        def description(self):   
     
    116116 
    117117        def __key(self): 
    118                 return (self.identifier, self.softwareReference, self.metadataManagement, self.relatedParty, self.algorithm, self.documentation, self.processingInput, self.description, self.processingOutput, self.generatedObservation) 
     118                return (self.identifier, self.softwareReference, self.metadataManagement, self.relatedParty, self.algorithm, self.processingInput, self.documentation, self.description, self.processingOutput, self.generatedObservation) 
    119119 
    120120        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_observation/ceda_citation.py

    r8398 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:35 
     24Created on 06-Jul-2012 07:43:06 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_observation/ceda_observation.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:27 
     25Created on 06-Jul-2012 07:43:12 
    2626 
    2727@author: mnagni 
     
    4646                self.permission = None 
    4747                self.resultTime = None 
     48                self.resultAccumulation = None 
    4849                self.observedProperty = None 
    49                 self.resultAccumulation = None 
     50                self.publicationState = None 
    5051                self.metadata = None 
    51                 self.publicationState = None 
    5252                self.dataLineage = None 
    5353                self.phenomenonTime = None 
     54                self.validTime = None 
    5455                self.citationTime = None 
    55                 self.validTime = None 
    5656                self.metadataManagement = [] 
    5757                self.procedure = None 
     
    100100                        self._mo_observation.resultTime = value 
    101101        @property 
     102        def resultAccumulation(self):    
     103                return self._mo_observation.resultAccumulation 
     104 
     105        @resultAccumulation.setter 
     106        def resultAccumulation(self, value):     
     107                        self._mo_observation.resultAccumulation = value 
     108        @property 
    102109        def observedProperty(self):      
    103110                return self._mo_observation.observedProperty 
     
    107114                        self._mo_observation.observedProperty = value 
    108115        @property 
    109         def resultAccumulation(self):    
    110                 return self._mo_observation.resultAccumulation 
    111  
    112         @resultAccumulation.setter 
    113         def resultAccumulation(self, value):     
    114                         self._mo_observation.resultAccumulation = value 
    115         @property 
    116116        def parameter(self):     
    117117                return self._mo_observation.parameter 
     
    121121                        self._mo_observation.parameter = value 
    122122        @property 
     123        def publicationState(self):      
     124                return self._mo_observation.publicationState 
     125 
     126        @publicationState.setter 
     127        def publicationState(self, value):       
     128                        self._mo_observation.publicationState = value 
     129        @property 
     130        def identifier(self):    
     131                return self._mo_observation.identifier 
     132 
     133        @identifier.setter 
     134        def identifier(self, value):     
     135                        self._mo_observation.identifier = value 
     136        @property 
    123137        def metadata(self):      
    124138                return self._mo_observation.metadata 
     
    128142                        self._mo_observation.metadata = value 
    129143        @property 
    130         def publicationState(self):      
    131                 return self._mo_observation.publicationState 
    132  
    133         @publicationState.setter 
    134         def publicationState(self, value):       
    135                         self._mo_observation.publicationState = value 
    136         @property 
    137         def identifier(self):    
    138                 return self._mo_observation.identifier 
    139  
    140         @identifier.setter 
    141         def identifier(self, value):     
    142                         self._mo_observation.identifier = value 
    143         @property 
    144144        def phenomenonTime(self):        
    145145                return self._mo_observation.phenomenonTime 
     
    156156                        self._mo_observation.documentation = value 
    157157        @property 
     158        def validTime(self):     
     159                return self._mo_observation.validTime 
     160 
     161        @validTime.setter 
     162        def validTime(self, value):      
     163                        self._mo_observation.validTime = value 
     164        @property 
    158165        def resultQuality(self):         
    159166                return self._mo_observation.resultQuality 
     
    163170                        self._mo_observation.resultQuality = value 
    164171        @property 
    165         def validTime(self):     
    166                 return self._mo_observation.validTime 
    167  
    168         @validTime.setter 
    169         def validTime(self, value):      
    170                         self._mo_observation.validTime = value 
    171         @property 
    172172        def procedure(self):     
    173173                return self._mo_observation.procedure 
     
    230230 
    231231        def __key(self): 
    232                 return (self.resolution, self.geographicExtent, self.resultFirstPublicationDate, self.relatedParty, self.permission, self.resultTime, self.observedProperty, self.resultAccumulation, self.parameter, self.metadata, self.publicationState, self.identifier, self.dataLineage, self.phenomenonTime, self.documentation, self.resultQuality, self.citationTime, self.validTime, self.metadataManagement, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.citation, self.featureOfInterest, self.keywords, self.status, self.relatedObservation, self.description) 
     232                return (self.resolution, self.resultFirstPublicationDate, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.resultAccumulation, self.observedProperty, self.parameter, self.publicationState, self.identifier, self.metadata, self.dataLineage, self.phenomenonTime, self.documentation, self.validTime, self.citationTime, self.resultQuality, self.metadataManagement, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.citation, self.featureOfInterest, self.keywords, self.status, self.relatedObservation, self.description) 
    233233 
    234234        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_observationcollection/ceda_observationcollection.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:33 
     25Created on 06-Jul-2012 07:43:16 
    2626 
    2727@author: mnagni 
     
    7676                        self._mo_observationcollection.phenomenonTime = value 
    7777        @property 
     78        def subCollection(self):         
     79                return self._mo_observationcollection.subCollection 
     80 
     81        @subCollection.setter 
     82        def subCollection(self, value):  
     83                        self._mo_observationcollection.subCollection = value 
     84        @property 
    7885        def verticalExtent(self):        
    7986                return self._mo_observationcollection.verticalExtent 
     
    8289        def verticalExtent(self, value):         
    8390                        self._mo_observationcollection.verticalExtent = value 
    84         @property 
    85         def subCollection(self):         
    86                 return self._mo_observationcollection.subCollection 
    87  
    88         @subCollection.setter 
    89         def subCollection(self, value):  
    90                         self._mo_observationcollection.subCollection = value 
    9191        @property 
    9292        def member(self):        
     
    122122 
    123123        def __key(self): 
    124                 return (self.publicationState, self.identifier, self.metadataManagement, self.geographicExtent, self.phenomenonTime, self.verticalExtent, self.subCollection, self.member, self.additionalMetadata, self.description, self.CEDAOfficer, self.isoMetadata) 
     124                return (self.publicationState, self.identifier, self.metadataManagement, self.geographicExtent, self.phenomenonTime, self.subCollection, self.verticalExtent, self.member, self.additionalMetadata, self.description, self.CEDAOfficer, self.isoMetadata) 
    125125 
    126126        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_compositeprocess.py

    r8398 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:32 
     26Created on 06-Jul-2012 07:43:13 
    2727 
    2828@author: mnagni 
     
    7676                        self._mo_compositeprocess.documentation = value 
    7777        @property 
     78        def description(self):   
     79                return self._mo_compositeprocess.description 
     80 
     81        @description.setter 
     82        def description(self, value):    
     83                        self._mo_compositeprocess.description = value 
     84        @property 
    7885        def acquisitionComponent(self):  
    7986                return self._mo_compositeprocess.acquisitionComponent 
     
    8289        def acquisitionComponent(self, value):   
    8390                        self._mo_compositeprocess.acquisitionComponent = value 
    84         @property 
    85         def description(self):   
    86                 return self._mo_compositeprocess.description 
    87  
    88         @description.setter 
    89         def description(self, value):    
    90                         self._mo_compositeprocess.description = value 
    9191        @property 
    9292        def generatedObservation(self):  
     
    101101 
    102102        def __key(self): 
    103                 return (self.identifier, self.computationComponent, self.metadataManagement, self.relatedParty, self.documentation, self.acquisitionComponent, self.description, self.generatedObservation) 
     103                return (self.identifier, self.computationComponent, self.metadataManagement, self.relatedParty, self.documentation, self.description, self.acquisitionComponent, self.generatedObservation) 
    104104 
    105105        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_process.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:26 
     25Created on 06-Jul-2012 07:43:16 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_project/ceda_project.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:27 
     25Created on 06-Jul-2012 07:43:12 
    2626 
    2727@author: mnagni 
     
    7272                        self._mo_project.subProject = value 
    7373        @property 
     74        def identifier(self):    
     75                return self._mo_project.identifier 
     76 
     77        @identifier.setter 
     78        def identifier(self, value):     
     79                        self._mo_project.identifier = value 
     80        @property 
    7481        def publicationState(self):      
    7582                return self._mo_project.publicationState 
     
    7885        def publicationState(self, value):       
    7986                        self._mo_project.publicationState = value 
    80         @property 
    81         def identifier(self):    
    82                 return self._mo_project.identifier 
    83  
    84         @identifier.setter 
    85         def identifier(self, value):     
    86                         self._mo_project.identifier = value 
    8787        @property 
    8888        def abstract(self):      
     
    9393                        self._mo_project.abstract = value 
    9494        @property 
     95        def status(self):        
     96                return self._mo_project.status 
     97 
     98        @status.setter 
     99        def status(self, value):         
     100                        self._mo_project.status = value 
     101        @property 
    95102        def keywords(self):      
    96103                return self._mo_project.keywords 
     
    99106        def keywords(self, value):       
    100107                        self._mo_project.keywords = value 
    101         @property 
    102         def status(self):        
    103                 return self._mo_project.status 
    104  
    105         @status.setter 
    106         def status(self, value):         
    107                         self._mo_project.status = value 
    108108        @property 
    109109        def documentation(self):         
     
    132132 
    133133        def __key(self): 
    134                 return (self.metadataManagement, self.relatedParty, self.dmp, self.projectResource, self.subProject, self.publicationState, self.identifier, self.abstract, self.keywords, self.status, self.documentation, self.description, self.observationCollection) 
     134                return (self.metadataManagement, self.relatedParty, self.dmp, self.projectResource, self.subProject, self.identifier, self.publicationState, self.abstract, self.status, self.keywords, self.documentation, self.description, self.observationCollection) 
    135135 
    136136        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_result/ceda_curationvalue.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:33 
     25Created on 06-Jul-2012 07:43:13 
    2626 
    2727@author: mnagni 
     
    3535                This class has been genererated automatically using the Apache Velocity project. 
    3636        ''' 
     37        cl_a = "a"  
    3738        cl_b = "b"  
    38         cl_a = "a"  
    3939        cl_c = "c"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_result/ceda_result.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:32 
     25Created on 06-Jul-2012 07:43:13 
    2626 
    2727@author: mnagni 
     
    4848                super(CEDA_Result, self).__init__() 
    4949        @property 
     50        def sample(self):        
     51                return self._mo_result.sample 
     52 
     53        @sample.setter 
     54        def sample(self, value):         
     55                        self._mo_result.sample = value 
     56        @property 
    5057        def segment(self):       
    5158                return self._mo_result.segment 
     
    5461        def segment(self, value):        
    5562                        self._mo_result.segment = value 
    56         @property 
    57         def sample(self):        
    58                 return self._mo_result.sample 
    59  
    60         @sample.setter 
    61         def sample(self, value):         
    62                         self._mo_result.sample = value 
    6363        @property 
    6464        def source(self):        
     
    7373 
    7474        def __key(self): 
    75                 return (self.segment, self.sample, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
     75                return (self.sample, self.segment, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
    7676 
    7777        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_utilities/ceda_notes.py

    r8398 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:41 
     24Created on 06-Jul-2012 07:43:08 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_utilities/ceda_review.py

    r8398 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:32 
     24Created on 06-Jul-2012 07:43:01 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewfrequencyvalue.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:38 
     25Created on 06-Jul-2012 07:43:07 
    2626 
    2727@author: mnagni 
     
    3636        ''' 
    3737        cl_threeyear = "threeYear"  
     38        cl_biannual = "biannual"  
    3839        cl_yearly = "yearly"  
    39         cl_biannual = "biannual"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewstatusvalue.py

    r8398 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:20 
     25Created on 06-Jul-2012 07:43:06 
    2626 
    2727@author: mnagni 
     
    3636        ''' 
    3737        cl_progressing = "progressing"  
     38        cl_required = "required"  
    3839        cl_complete = "complete"  
    39         cl_required = "required"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/extended_metadata_from_19115/taxonomicclassification.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:30 
     24Created on 06-Jul-2012 07:43:07 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/extended_metadata_from_19115/taxonomykeywords.py

    r8397 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:38 
     26Created on 06-Jul-2012 07:43:08 
    2727 
    2828@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/extended_metadata_from_19115/taxonomysystem.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:38 
     24Created on 06-Jul-2012 07:43:09 
    2525 
    2626@author: mnagni 
     
    4141 
    4242                self.theTaxonomicClassification = None 
     43                self.classificationSystemModifications = None 
    4344                self.theVouchers = [] 
     45                self.identificationReference = None 
    4446                self.classificationSystemAuthority = None 
    45                 self.identificationReference = None 
    46                 self.classificationSystemModifications = None 
    4747                self.identificationTaxonomicProcedures = None 
     48                self.identificationTaxonomicCompleteness = None 
    4849                self.observer = None 
    49                 self.identificationTaxonomicCompleteness = None 
    5050                self.generalTaxonomyScope = None 
    5151                super(TaxonomySystem, self).__init__() 
     
    5555 
    5656        def __key(self): 
    57                 return (self.theTaxonomicClassification, self.theVouchers, self.classificationSystemAuthority, self.identificationReference, self.classificationSystemModifications, self.identificationTaxonomicProcedures, self.observer, self.identificationTaxonomicCompleteness, self.generalTaxonomyScope) 
     57                return (self.theTaxonomicClassification, self.classificationSystemModifications, self.theVouchers, self.identificationReference, self.classificationSystemAuthority, self.identificationTaxonomicProcedures, self.identificationTaxonomicCompleteness, self.observer, self.generalTaxonomyScope) 
    5858 
    5959        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/extended_metadata_from_19115/vouchers.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:36 
     24Created on 06-Jul-2012 07:43:11 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_areafeature.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:41 
     25Created on 06-Jul-2012 07:43:12 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_attribute.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:36 
     24Created on 06-Jul-2012 07:43:13 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_attributetype.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:31 
     24Created on 06-Jul-2012 07:43:13 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_complexattributetype.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:22 
     25Created on 06-Jul-2012 07:43:14 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_complexfeature.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:31 
     25Created on 06-Jul-2012 07:43:14 
    2626 
    2727@author: mnagni 
     
    9595                        if not hasattr(self, '_subfeature'): 
    9696                                self._subfeature = [] 
    97                         if self._subfeature: 
     97                        if self._subfeature is not None: 
    9898                                ret.extend(self._subfeature) 
    9999                        del self._subfeature[:] 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_end.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:42 
     25Created on 06-Jul-2012 07:43:10 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_feature.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:27 
     24Created on 06-Jul-2012 07:43:14 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_featurecategory.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:42 
     24Created on 06-Jul-2012 07:43:13 
    2525 
    2626@author: mnagni 
     
    5454                        if not hasattr(self, '_theGDF_Feature'): 
    5555                                self._theGDF_Feature = [] 
    56                         if self._theGDF_Feature: 
     56                        if self._theGDF_Feature is not None: 
    5757                                ret.extend(self._theGDF_Feature) 
    5858                        del self._theGDF_Feature[:] 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_featureclass.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:16 
     24Created on 06-Jul-2012 07:43:11 
    2525 
    2626@author: mnagni 
     
    4949                self._character_gdf_restrictedsubattributetype = None 
    5050                self._character = None 
     51                self.represents = [] 
    5152                self.theme = None 
    52                 self.represents = [] 
    5353                super(GDF_FeatureClass, self).__init__() 
    5454        @property 
     
    6060                        if not hasattr(self, '_belongsTo'): 
    6161                                self._belongsTo = [] 
    62                         if self._belongsTo: 
     62                        if self._belongsTo is not None: 
    6363                                ret.extend(self._belongsTo) 
    6464                        del self._belongsTo[:] 
     
    109109 
    110110        def __key(self): 
    111                 return (self.name, self.belongsTo, self.code, self.character, self.theme, self.represents) 
     111                return (self.name, self.belongsTo, self.code, self.character, self.represents, self.theme) 
    112112 
    113113        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_featuretheme.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:39 
     24Created on 06-Jul-2012 07:43:09 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_layer.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:21 
     24Created on 06-Jul-2012 07:43:11 
    2525 
    2626@author: mnagni 
     
    4040        def __init__(self): 
    4141 
     42                self._topology_gdf_node = [] 
    4243                self._topology_gdf_face = [] 
    4344                self._topology_gdf_edge = [] 
    44                 self._topology_gdf_node = [] 
    4545                self._topology = [] 
     46                self._geometricFeature_gdf_areafeature = [] 
     47                self._geometricFeature_gdf_pointfeature = [] 
    4648                self._geometricFeature_gdf_linefeature = [] 
    47                 self._geometricFeature_gdf_pointfeature = [] 
    48                 self._geometricFeature_gdf_areafeature = [] 
    4949                self._geometricFeature = [] 
    5050                self.id = None 
     
    5555                try: 
    5656                        ret = [] 
     57                        ret.extend(self._topology_gdf_node) 
    5758                        ret.extend(self._topology_gdf_face) 
    5859                        ret.extend(self._topology_gdf_edge) 
    59                         ret.extend(self._topology_gdf_node) 
    6060                        if not hasattr(self, '_topology'): 
    6161                                self._topology = [] 
    62                         if self._topology: 
     62                        if self._topology is not None: 
    6363                                ret.extend(self._topology) 
    6464                        del self._topology[:] 
     
    7272                try: 
    7373                        ret = [] 
     74                        ret.extend(self._geometricFeature_gdf_areafeature) 
     75                        ret.extend(self._geometricFeature_gdf_pointfeature) 
    7476                        ret.extend(self._geometricFeature_gdf_linefeature) 
    75                         ret.extend(self._geometricFeature_gdf_pointfeature) 
    76                         ret.extend(self._geometricFeature_gdf_areafeature) 
    7777                        if not hasattr(self, '_geometricFeature'): 
    7878                                self._geometricFeature = [] 
    79                         if self._geometricFeature: 
     79                        if self._geometricFeature is not None: 
    8080                                ret.extend(self._geometricFeature) 
    8181                        del self._geometricFeature[:] 
     
    8787 
    8888        def synchronize(self): 
     89                del self._topology_gdf_node[:] 
    8990                del self._topology_gdf_face[:] 
    9091                del self._topology_gdf_edge[:] 
    91                 del self._topology_gdf_node[:] 
     92                del self._geometricFeature_gdf_areafeature[:] 
     93                del self._geometricFeature_gdf_pointfeature[:] 
    9294                del self._geometricFeature_gdf_linefeature[:] 
    93                 del self._geometricFeature_gdf_pointfeature[:] 
    94                 del self._geometricFeature_gdf_areafeature[:] 
    9595                for item in self.topology:       
     96                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     97                        if valueClass == "ea_model.informative.iso_gdf.gdf_topology.gdf_node.GDF_Node": 
     98                                self._topology_gdf_node.append(item) 
     99                                continue 
    96100                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    97101                        if valueClass == "ea_model.informative.iso_gdf.gdf_topology.gdf_face.GDF_Face": 
     
    102106                                self._topology_gdf_edge.append(item) 
    103107                                continue 
    104                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    105                         if valueClass == "ea_model.informative.iso_gdf.gdf_topology.gdf_node.GDF_Node": 
    106                                 self._topology_gdf_node.append(item) 
    107                                 continue 
    108108                for item in self.geometricFeature:       
    109109                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    110                         if valueClass == "ea_model.informative.iso_gdf.gdf_feature.gdf_linefeature.GDF_LineFeature": 
    111                                 self._geometricFeature_gdf_linefeature.append(item) 
     110                        if valueClass == "ea_model.informative.iso_gdf.gdf_feature.gdf_areafeature.GDF_AreaFeature": 
     111                                self._geometricFeature_gdf_areafeature.append(item) 
    112112                                continue 
    113113                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     
    116116                                continue 
    117117                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    118                         if valueClass == "ea_model.informative.iso_gdf.gdf_feature.gdf_areafeature.GDF_AreaFeature": 
    119                                 self._geometricFeature_gdf_areafeature.append(item) 
     118                        if valueClass == "ea_model.informative.iso_gdf.gdf_feature.gdf_linefeature.GDF_LineFeature": 
     119                                self._geometricFeature_gdf_linefeature.append(item) 
    120120                                continue 
    121121                pass 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_linefeature.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:29 
     25Created on 06-Jul-2012 07:43:13 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_pointfeature.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:31 
     25Created on 06-Jul-2012 07:43:07 
    2626 
    2727@author: mnagni 
     
    9595                        if not hasattr(self, '_theGDF_Node'): 
    9696                                self._theGDF_Node = [] 
    97                         if self._theGDF_Node: 
     97                        if self._theGDF_Node is not None: 
    9898                                ret.extend(self._theGDF_Node) 
    9999                        del self._theGDF_Node[:] 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_relationshiptype.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:25 
     24Created on 06-Jul-2012 07:43:15 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_restrictedsubattributetype.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:32 
     25Created on 06-Jul-2012 07:43:07 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_semanticrelationship.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:28 
     24Created on 06-Jul-2012 07:43:14 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_side.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:41 
     25Created on 06-Jul-2012 07:43:13 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_simpleattributetype.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:40 
     25Created on 06-Jul-2012 07:43:01 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_simplefeature.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:41 
     25Created on 06-Jul-2012 07:43:04 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_feature/gdf_topologytype.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:24 
     25Created on 06-Jul-2012 07:43:12 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_topology/gdf_edge.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:32 
     25Created on 06-Jul-2012 07:43:11 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_topology/gdf_face.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:37 
     25Created on 06-Jul-2012 07:43:06 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_topology/gdf_isolatednode.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:40 
     25Created on 06-Jul-2012 07:43:11 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_topology/gdf_node.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:17 
     25Created on 06-Jul-2012 07:43:00 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_topology/gdf_nonisolatednode.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:40 
     25Created on 06-Jul-2012 07:43:16 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdf_topology/gdf_topologicalobject.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:35 
     24Created on 06-Jul-2012 07:43:10 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdfgeometry/gdf_dot.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:34 
     24Created on 06-Jul-2012 07:43:16 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdfgeometry/gdf_polygon.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:30 
     24Created on 06-Jul-2012 07:43:06 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/iso_gdf/gdfgeometry/gdf_polyline.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:39 
     24Created on 06-Jul-2012 07:43:06 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/features/fe_containerfeaturecollection.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:27 
     25Created on 06-Jul-2012 07:43:10 
    2626 
    2727@author: mnagni 
     
    4545                self.isGlobal = None 
    4646                self.localName = None 
     47                self._element_fe_queryfeaturecollection = [] 
    4748                self._element_fe_featurecollection = [] 
    48                 self._element_fe_queryfeaturecollection = [] 
    4949                self._element = [] 
    5050                self.container = None 
     
    8989                try: 
    9090                        ret = [] 
     91                        ret.extend(self._element_fe_queryfeaturecollection) 
    9192                        ret.extend(self._element_fe_featurecollection) 
    92                         ret.extend(self._element_fe_queryfeaturecollection) 
    9393                        if not hasattr(self, '_element'): 
    9494                                self._element = [] 
    95                         if self._element: 
     95                        if self._element is not None: 
    9696                                ret.extend(self._element) 
    9797                        del self._element[:] 
     
    124124 
    125125        def synchronize(self): 
     126                del self._element_fe_queryfeaturecollection[:] 
    126127                del self._element_fe_featurecollection[:] 
    127                 del self._element_fe_queryfeaturecollection[:] 
    128128                for item in self.element:        
     129                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     130                        if valueClass == "ea_model.informative.open_gis_consortium.features.fe_queryfeaturecollection.FE_QueryFeatureCollection": 
     131                                self._element_fe_queryfeaturecollection.append(item) 
     132                                continue 
    129133                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    130134                        if valueClass == "ea_model.informative.open_gis_consortium.features.fe_featurecollection.FE_FeatureCollection": 
    131135                                self._element_fe_featurecollection.append(item) 
    132                                 continue 
    133                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    134                         if valueClass == "ea_model.informative.open_gis_consortium.features.fe_queryfeaturecollection.FE_QueryFeatureCollection": 
    135                                 self._element_fe_queryfeaturecollection.append(item) 
    136136                                continue 
    137137                pass 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/features/fe_feature.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:33 
     25Created on 06-Jul-2012 07:43:00 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/features/fe_featureattribute.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:29 
     24Created on 06-Jul-2012 07:43:13 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/features/fe_featurecollection.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:41 
     25Created on 06-Jul-2012 07:43:07 
    2626 
    2727@author: mnagni 
     
    4646                self.localName = None 
    4747                self.container = None 
     48                self._feature_fe_queryfeaturecollection = [] 
    4849                self._feature_fe_featurecollection = [] 
    49                 self._feature_fe_queryfeaturecollection = [] 
    5050                self._feature = [] 
    5151                super(FE_FeatureCollection, self).__init__() 
     
    103103                try: 
    104104                        ret = [] 
     105                        ret.extend(self._feature_fe_queryfeaturecollection) 
    105106                        ret.extend(self._feature_fe_featurecollection) 
    106                         ret.extend(self._feature_fe_queryfeaturecollection) 
    107107                        if not hasattr(self, '_feature'): 
    108108                                self._feature = [] 
    109                         if self._feature: 
     109                        if self._feature is not None: 
    110110                                ret.extend(self._feature) 
    111111                        del self._feature[:] 
     
    117117 
    118118        def synchronize(self): 
     119                del self._feature_fe_queryfeaturecollection[:] 
    119120                del self._feature_fe_featurecollection[:] 
    120                 del self._feature_fe_queryfeaturecollection[:] 
    121121                for item in self.feature:        
     122                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     123                        if valueClass == "ea_model.informative.open_gis_consortium.features.fe_queryfeaturecollection.FE_QueryFeatureCollection": 
     124                                self._feature_fe_queryfeaturecollection.append(item) 
     125                                continue 
    122126                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    123127                        if valueClass == "ea_model.informative.open_gis_consortium.features.fe_featurecollection.FE_FeatureCollection": 
    124128                                self._feature_fe_featurecollection.append(item) 
    125                                 continue 
    126                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    127                         if valueClass == "ea_model.informative.open_gis_consortium.features.fe_queryfeaturecollection.FE_QueryFeatureCollection": 
    128                                 self._feature_fe_queryfeaturecollection.append(item) 
    129129                                continue 
    130130                pass 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/features/fe_queryfeaturecollection.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:23 
     25Created on 06-Jul-2012 07:43:14 
    2626 
    2727@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/services/gc_basicservice.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:34 
     24Created on 06-Jul-2012 07:43:09 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/services/gc_capability.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:29 
     24Created on 06-Jul-2012 07:43:08 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/open_gis_consortium/services/gc_geoparser.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:37 
     24Created on 06-Jul-2012 07:43:15 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/area_of_interest/ai_areaofinterest.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:34 
     24Created on 06-Jul-2012 07:43:08 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/area_of_interest/ai_proximityarea.py

    r8397 r8437  
    2525 
    2626''' 
    27 Created on 26-Jun-2012 10:16:32 
     27Created on 06-Jul-2012 07:43:11 
    2828 
    2929@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_abstractlocation.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:38 
     24Created on 06-Jul-2012 07:43:11 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_directoryrequest.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:28 
     24Created on 06-Jul-2012 07:43:15 
    2525 
    2626@author: mnagni 
     
    5050                self.directoryType = None 
    5151                self.code = None 
     52                self._address_ad_usaddress = None 
    5253                self._address_ad_address = None 
    53                 self._address_ad_usaddress = None 
    5454                self._address = None 
    5555                self.maxResponses = None 
     
    5757        @property 
    5858        def address(self):       
     59                if(has_value(self._address_ad_usaddress)): 
     60                        return self._address_ad_usaddress 
    5961                if(has_value(self._address_ad_address)): 
    6062                        return self._address_ad_address 
    61                 if(has_value(self._address_ad_usaddress)): 
    62                         return self._address_ad_usaddress 
    6363                return  None 
    6464 
     
    6666        def address(self, value):        
    6767                valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     68                if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_usaddress.AD_USAddress": 
     69                        self._address_ad_usaddress = value 
     70                        self._address_ad_address = None 
    6871                if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_address.AD_Address": 
    6972                        self._address_ad_address = value 
    7073                        self._address_ad_usaddress = None 
    71                 if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_usaddress.AD_USAddress": 
    72                         self._address_ad_usaddress = value 
    73                         self._address_ad_address = None 
    7474 
    7575        def synchronize(self): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_directoryresponse.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:32 
     24Created on 06-Jul-2012 07:43:14 
    2525 
    2626@author: mnagni 
     
    4343                self.type = None 
    4444                self.otherInfo = None 
     45                self.description = None 
    4546                self.directoryType = None 
    46                 self.description = None 
    4747                self.web = None 
     48                self._address_ad_usaddress = None 
    4849                self._address_ad_address = None 
    49                 self._address_ad_usaddress = None 
    5050                self._address = None 
     51                self.map = None 
    5152                self.email = None 
    52                 self.map = None 
    5353                super(DI_DirectoryResponse, self).__init__() 
    5454        @property 
    5555        def address(self):       
     56                if(has_value(self._address_ad_usaddress)): 
     57                        return self._address_ad_usaddress 
    5658                if(has_value(self._address_ad_address)): 
    5759                        return self._address_ad_address 
    58                 if(has_value(self._address_ad_usaddress)): 
    59                         return self._address_ad_usaddress 
    6060                return  None 
    6161 
     
    6363        def address(self, value):        
    6464                valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     65                if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_usaddress.AD_USAddress": 
     66                        self._address_ad_usaddress = value 
     67                        self._address_ad_address = None 
    6568                if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_address.AD_Address": 
    6669                        self._address_ad_address = value 
    6770                        self._address_ad_usaddress = None 
    68                 if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_usaddress.AD_USAddress": 
    69                         self._address_ad_usaddress = value 
    70                         self._address_ad_address = None 
    7171 
    7272        def synchronize(self): 
     
    7474 
    7575        def __key(self): 
    76                 return (self.name, self.type, self.otherInfo, self.directoryType, self.description, self.web, self.address, self.email, self.map) 
     76                return (self.name, self.type, self.otherInfo, self.description, self.directoryType, self.web, self.address, self.map, self.email) 
    7777 
    7878        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_directorytype.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:30 
     25Created on 06-Jul-2012 07:43:15 
    2626 
    2727@author: mnagni 
     
    3535                This class has been genererated automatically using the Apache Velocity project. 
    3636        ''' 
     37        cl_yellowpages_business = "yellowPages-business"  
     38        cl_whitepages_names = "whitePages-names"  
     39        cl_greenpages = "greenPages"  
    3740        cl_bluepages_government = "bluePages-government"  
    38         cl_greenpages = "greenPages"  
    39         cl_whitepages_names = "whitePages-names"  
    40         cl_yellowpages_business = "yellowPages-business"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_location.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:31 
     25Created on 06-Jul-2012 07:43:16 
    2626 
    2727@author: mnagni 
     
    4646                self._position_gm_aggregate = None 
    4747                self._position = None 
     48                self._address_ad_usaddress = None 
    4849                self._address_ad_address = None 
    49                 self._address_ad_usaddress = None 
    5050                self._address = None 
    5151                super(DI_Location, self).__init__() 
     
    7777        @property 
    7878        def address(self):       
     79                if(has_value(self._address_ad_usaddress)): 
     80                        return self._address_ad_usaddress 
    7981                if(has_value(self._address_ad_address)): 
    8082                        return self._address_ad_address 
    81                 if(has_value(self._address_ad_usaddress)): 
    82                         return self._address_ad_usaddress 
    8383                return  None 
    8484 
     
    8686        def address(self, value):        
    8787                valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     88                if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_usaddress.AD_USAddress": 
     89                        self._address_ad_usaddress = value 
     90                        self._address_ad_address = None 
    8891                if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_address.AD_Address": 
    8992                        self._address_ad_address = value 
    9093                        self._address_ad_usaddress = None 
    91                 if valueClass == "ea_model.iso_19133_tracking_and_navigation.address_model.address.ad_usaddress.AD_USAddress": 
    92                         self._address_ad_usaddress = value 
    93                         self._address_ad_address = None 
    9494 
    9595        def synchronize(self): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_pointofinterest.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:34 
     24Created on 06-Jul-2012 07:43:16 
    2525 
    2626@author: mnagni 
     
    4141 
    4242                self.name = None 
     43                self.keywords = None 
    4344                self.type = None 
    44                 self.keywords = None 
    4545                self.mapURL = None 
    4646                self.location = None 
    4747                self.category = None 
     48                self.phoneNumber = None 
    4849                self.infoURL = None 
    49                 self.phoneNumber = None 
    5050                self.description = None 
    5151                self.code = None 
     
    5757 
    5858        def __key(self): 
    59                 return (self.name, self.type, self.keywords, self.mapURL, self.location, self.category, self.infoURL, self.phoneNumber, self.description, self.code, self.email) 
     59                return (self.name, self.keywords, self.type, self.mapURL, self.location, self.category, self.phoneNumber, self.infoURL, self.description, self.code, self.email) 
    6060 
    6161        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/other_location_services/directory/di_proximitytype.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:39 
     25Created on 06-Jul-2012 07:43:10 
    2626 
    2727@author: mnagni 
     
    3535                This class has been genererated automatically using the Apache Velocity project. 
    3636        ''' 
     37        cl_boundingpolygon = "boundingPolygon"  
     38        cl_lineardistance = "linearDistance"  
     39        cl_drivingdistance = "drivingDistance"  
    3740        cl_walkingdistance = "walkingDistance"  
    38         cl_lineardistance = "linearDistance"  
    39         cl_boundingpolygon = "boundingPolygon"  
    40         cl_drivingdistance = "drivingDistance"  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/simplicial_topology/onesimplex.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:17 
     24Created on 06-Jul-2012 07:43:08 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/simplicial_topology/simplex.py

    r8397 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:32 
     26Created on 06-Jul-2012 07:43:13 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class Simplex(GM_Primitive,TP_Primitive): 
     31class Simplex(TP_Primitive,GM_Primitive): 
    3232        ''' 
    3333                Represents a data entity defined in a UML diagram and supposed to  
     
    8484                        self._gm_primitive.containingPrimitive = value 
    8585        @property 
     86        def topology(self):      
     87                return self._gm_primitive.topology 
     88 
     89        @topology.setter 
     90        def topology(self, value):       
     91                        self._gm_primitive.topology = value 
     92        @property 
    8693        def isolated(self):      
    8794                return self._tp_primitive.isolated 
     
    9097        def isolated(self, value):       
    9198                        self._tp_primitive.isolated = value 
    92         @property 
    93         def topology(self):      
    94                 return self._gm_primitive.topology 
    95  
    96         @topology.setter 
    97         def topology(self, value):       
    98                         self._gm_primitive.topology = value 
    9999        @property 
    100100        def CRS(self):   
     
    154154 
    155155        def __key(self): 
    156                 return (self.containedPrimitive, self.composite, self.maximalComplex, self.dimension, self.containingPrimitive, self.isolated, self.topology, self.CRS, self.proxy, self.geometry, self.complex, self.container, self.theSimplicialComplex, self.vertices) 
     156                return (self.containedPrimitive, self.composite, self.maximalComplex, self.dimension, self.containingPrimitive, self.topology, self.isolated, self.CRS, self.proxy, self.geometry, self.complex, self.container, self.theSimplicialComplex, self.vertices) 
    157157 
    158158        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/simplicial_topology/simplicialcomplex.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:37 
     24Created on 06-Jul-2012 07:43:03 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/simplicial_topology/threesimplex.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:23 
     24Created on 06-Jul-2012 07:43:03 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/simplicial_topology/twosimplex.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:27 
     24Created on 06-Jul-2012 07:43:09 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/simplicial_topology/zerosimplex.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:21 
     24Created on 06-Jul-2012 07:43:06 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/cellular_topology/cell.py

    r8397 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:34 
     26Created on 06-Jul-2012 07:43:05 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class Cell(GM_Primitive,TP_Primitive): 
     31class Cell(TP_Primitive,GM_Primitive): 
    3232        ''' 
    3333                Represents a data entity defined in a UML diagram and supposed to  
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/cellular_topology/cellularcomplex.py

    r8397 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:33 
     26Created on 06-Jul-2012 07:43:11 
    2727 
    2828@author: mnagni 
     
    7272                        self._gm_complex.CRS = value 
    7373        @property 
     74        def superComplex(self):  
     75                return self._gm_complex.superComplex 
     76 
     77        @superComplex.setter 
     78        def superComplex(self, value):   
     79                        self._gm_complex.superComplex = value 
     80        @property 
    7481        def subComplex(self):    
    7582                return self._gm_complex.subComplex 
     
    7885        def subComplex(self, value):     
    7986                        self._gm_complex.subComplex = value 
    80         @property 
    81         def superComplex(self):  
    82                 return self._gm_complex.superComplex 
    83  
    84         @superComplex.setter 
    85         def superComplex(self, value):   
    86                         self._gm_complex.superComplex = value 
    8787        @property 
    8888        def geometry(self):      
     
    104104 
    105105        def __key(self): 
    106                 return (self.topology, self.maximalComplex, self.CRS, self.cell, self.subComplex, self.superComplex, self.geometry, self.element) 
     106                return (self.topology, self.maximalComplex, self.CRS, self.cell, self.superComplex, self.subComplex, self.geometry, self.element) 
    107107 
    108108        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/cellular_topology/onecell.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:27 
     24Created on 06-Jul-2012 07:43:14 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/cellular_topology/threecell.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:15 
     24Created on 06-Jul-2012 07:43:02 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/cellular_topology/twocell.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:33 
     24Created on 06-Jul-2012 07:43:13 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/cellular_topology/zerocell.py

    r8397 r8437  
    2222 
    2323''' 
    24 Created on 26-Jun-2012 10:16:17 
     24Created on 06-Jul-2012 07:43:04 
    2525 
    2626@author: mnagni 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/feature_topology/ft_complex.py

    r8397 r8437  
    2323 
    2424''' 
    25 Created on 26-Jun-2012 10:16:27 
     25Created on 06-Jul-2012 07:43:14 
    2626 
    2727@author: mnagni 
     
    4242                self._ts_theme = TS_Theme()      
    4343 
     44                self._element_ft_node = [] 
    4445                self._element_ft_face = [] 
    4546                self._element_ft_edge = [] 
    46                 self._element_ft_node = [] 
    4747                self._element = [] 
    4848                super(FT_Complex, self).__init__() 
     
    5151                try: 
    5252                        ret = [] 
     53                        ret.extend(self._element_ft_node) 
    5354                        ret.extend(self._element_ft_face) 
    5455                        ret.extend(self._element_ft_edge) 
    55                         ret.extend(self._element_ft_node) 
    5656                        if not hasattr(self, '_element'): 
    5757                                self._element = [] 
    58                         if self._element: 
     58                        if self._element is not None: 
    5959                                ret.extend(self._element) 
    6060                        del self._element[:] 
     
    6666 
    6767        def synchronize(self): 
     68                del self._element_ft_node[:] 
    6869                del self._element_ft_face[:] 
    6970                del self._element_ft_edge[:] 
    70                 del self._element_ft_node[:] 
    7171                for item in self.element:        
     72                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     73                        if valueClass == "ea_model.informative.spatial_examples_from_iso_19107.application_schema.topology_simple.feature_topology.ft_node.FT_Node": 
     74                                self._element_ft_node.append(item) 
     75                                continue 
    7276                        valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    7377                        if valueClass == "ea_model.informative.spatial_examples_from_iso_19107.application_schema.topology_simple.feature_topology.ft_face.FT_Face": 
     
    7781                        if valueClass == "ea_model.informative.spatial_examples_from_iso_19107.application_schema.topology_simple.feature_topology.ft_edge.FT_Edge": 
    7882                                self._element_ft_edge.append(item) 
    79                                 continue 
    80                         valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    81                         if valueClass == "ea_model.informative.spatial_examples_from_iso_19107.application_schema.topology_simple.feature_topology.ft_node.FT_Node": 
    82                                 self._element_ft_node.append(item) 
    8383                                continue 
    8484                pass 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/feature_topology/ft_edge.py

    r8397 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:37 
     26Created on 06-Jul-2012 07:43:06 
    2727 
    2828@author: mnagni 
     
    7272                        self._ts_curvecomponent.isGlobal = value 
    7373        @property 
     74        def component(self):     
     75                return self._ts_curvecomponent.component 
     76 
     77        @component.setter 
     78        def component(self, value):      
     79                        self._ts_curvecomponent.component = value 
     80        @property 
    7481        def localName(self):     
    7582                return self._ts_curvecomponent.localName 
     
    7885        def localName(self, value):      
    7986                        self._ts_curvecomponent.localName = value 
    80         @property 
    81         def component(self):     
    82                 return self._ts_curvecomponent.component 
    83  
    84         @component.setter 
    85         def component(self, value):      
    86                         self._ts_curvecomponent.component = value 
    8787        @property 
    8888        def theTS_FeatureComponent(self):        
     
    125125 
    126126        def __key(self): 
    127                 return (self.attribute, self.composite, self.isGlobal, self.orientation, self.localName, self.component, self.theTS_FeatureComponent, self.complex, self.acceptableClassList, self.generator, self.theme) 
     127                return (self.attribute, self.composite, self.isGlobal, self.orientation, self.component, self.localName, self.theTS_FeatureComponent, self.complex, self.acceptableClassList, self.generator, self.theme) 
    128128 
    129129        def __eq__(self, y): 
  • mauRepo/CedaMolesModel/trunk/ceda_moles_model/ea_model/informative/spatial_examples_from_iso_19107/application_schema/topology_simple/feature_topology/ft_face.py

    r8397 r8437  
    2424 
    2525''' 
    26 Created on 26-Jun-2012 10:16:37 
     26Created on 06-Jul-2012 07:43:14 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class FT_Face(TS_SurfaceComponent,FT_Primitive): 
     31class FT_Face(FT_Primitive,TS_SurfaceComponent): 
    3232        ''' 
    3333                Represents a data entity defined in a UML diagram and supposed to  
     
    4141        ''' 
    4242        def __init__(self): 
     43                self._ts_surfacecomponent = TS_SurfaceComponent()        
    4344                self._ft_primitive = FT_Primitive()      
    44                 self._ts_surfacecomponent = TS_SurfaceComponent()        
    4545 
    4646                self.attribute = None 
     
    5252        @property 
    5353        def attribute(self):     
    54                 return self._ft_primitive.attribute 
     54                return self._ts_surfacecomponent.attribute 
    5555 
    5656        @attribute.setter 
    5757        def attribute(self, value):      
    58                         self._ft_primitive.attribute = value 
     58                        self._ts_surfacecomponent.attribute = value 
    5959        @property 
    6060        def composite(self):     
    61                 return self._ft_primitive.composite 
     61                return self._ts_surfacecomponent.composite 
    6262 
    6363        @composite.setter 
    6464        def composite(self, value):      
    65                         self._ft_primitive.composite = value 
     65                        self._ts_surfacecomponent.composite = value 
    6666        @property 
    6767        def isGlobal(self):      
    68                 return self._ft_primitive.isGlobal 
     68                return self._ts_surfacecomponent.isGlobal 
    6969 
    7070        @isGlobal.setter 
    7171        def isGlobal(self, value):       
    72                         self._ft_primitive.isGlobal = value 
     72                        self._ts_surfacecomponent.isGlobal = value 
    7373        @property 
    7474        def component(self):     
    75                 return self._ft_primitive.component 
     75                return self._ts_surfacecomponent.component 
    7676 
    7777        @component.setter 
    7878        def component(self, value):      
    79                         self._ft_primitive.component = value 
     79                        self._ts_surfacecomponent.component = value 
    80