Ignore:
Timestamp:
13/03/12 13:32:01 (8 years ago)
Author:
mnagni
Message:

This new DB library adds better hash algorithm and a bug fix for the classes eq method

Location:
mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum
Files:
124 edited

Legend:

Unmodified
Added
Removed

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/application_schema_information/md_applicationschemainformation.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:08 
    2525 
    2626@author: mnagni 
    … …  
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_address.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:04 
     24Created on 13-Mar-2012 11:08:06 
    2525 
    2626@author: mnagni 
    … …  
    4141 
    4242        self.deliveryPoint = [] 
     43        self.electronicMailAddress = [] 
    4344        self.country = None 
    44         self.electronicMailAddress = [] 
     45        self.administrativeArea = None 
    4546        self.postalCode = None 
    46         self.administrativeArea = None 
    4747        self.city = None 
    4848        super(CI_Address, self).__init__() 
    4949 
    5050    def __key(self): 
    51         return (self.deliveryPoint, self.country, self.electronicMailAddress, self.postalCode, self.administrativeArea, self.city) 
     51        return (self.deliveryPoint, self.electronicMailAddress, self.country, self.administrativeArea, self.postalCode, self.city) 
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_citation.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:03 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    4444        self.editionDate = None 
    4545        self.date = [] 
     46        self.alternateTitle = [] 
    4647        self.ISSN = None 
    47         self.alternateTitle = [] 
     48        self.identifier = [] 
    4849        self.edition = None 
    49         self.identifier = [] 
    5050        self.otherCitationDetails = None 
    5151        self.title = None 
    … …  
    5656 
    5757    def __key(self): 
    58         return (self.presentationForm, self.collectiveTitle, self.editionDate, self.date, self.ISSN, self.alternateTitle, self.edition, self.identifier, self.otherCitationDetails, self.title, self.series, self.ISBN, self.citedResponsibleParty) 
     58        return (self.presentationForm, self.collectiveTitle, self.editionDate, self.date, self.alternateTitle, self.ISSN, self.identifier, self.edition, self.otherCitationDetails, self.title, self.series, self.ISBN, self.citedResponsibleParty) 
    5959 
    6060    def __eq__(self, y): 
     61        if type(self) != type(y): 
     62            return False 
    6163        ''' 
    6264        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6769 
    6870    def __hash__(self): 
    69         return hash(self.__key()) 
     71        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_contact.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_date.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:07 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
    … …  
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_datetypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:01 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_creation = "creation"  
    3738    cl_publication = "publication"  
    38     cl_creation = "creation"  
    3939    cl_revision = "revision"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_onlinefunctioncode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:02 
     25Created on 13-Mar-2012 11:08:09 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_search = "search"  
    3738    cl_information = "information"  
    3839    cl_download = "download"  
    39     cl_search = "search"  
     40    cl_order = "order"  
    4041    cl_offlineaccess = "offlineAccess"  
    41     cl_order = "order"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_onlineresource.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_presentationformcode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_videohardcopy = "videoHardcopy"  
     38    cl_modeldigital = "modelDigital"  
     39    cl_imagedigital = "imageDigital"  
     40    cl_imagehardcopy = "imageHardcopy"  
     41    cl_modelhardcopy = "modelHardcopy"  
     42    cl_tablehardcopy = "tableHardcopy"  
     43    cl_videodigital = "videoDigital"  
     44    cl_documenthardcopy = "documentHardcopy"  
     45    cl_tabledigital = "tableDigital"  
     46    cl_profilehardcopy = "profileHardcopy"  
    3747    cl_mapdigital = "mapDigital"  
    38     cl_tabledigital = "tableDigital"  
    39     cl_documenthardcopy = "documentHardcopy"  
    40     cl_tablehardcopy = "tableHardcopy"  
     48    cl_profiledigital = "profileDigital"  
     49    cl_documentdigital = "documentDigital"  
    4150    cl_maphardcopy = "mapHardcopy"  
    42     cl_imagedigital = "imageDigital"  
    43     cl_profilehardcopy = "profileHardcopy"  
    44     cl_imagehardcopy = "imageHardcopy"  
    45     cl_documentdigital = "documentDigital"  
    46     cl_modeldigital = "modelDigital"  
    47     cl_videodigital = "videoDigital"  
    48     cl_profiledigital = "profileDigital"  
    49     cl_modelhardcopy = "modelHardcopy"  
    50     cl_videohardcopy = "videoHardcopy"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_responsibleparty.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:05 
     24Created on 13-Mar-2012 11:08:08 
    2525 
    2626@author: mnagni 
    … …  
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_rolecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_owner = "owner"  
     38    cl_originator = "originator"  
    3739    cl_processor = "processor"  
    3840    cl_pointofcontact = "pointOfContact"  
    39     cl_distributor = "distributor"  
    40     cl_owner = "owner"  
    4141    cl_resourceprovider = "resourceProvider"  
     42    cl_custodian = "custodian"  
    4243    cl_principalinvestigator = "principalInvestigator"  
    43     cl_originator = "originator"  
    44     cl_author = "author"  
    45     cl_custodian = "custodian"  
    4644    cl_user = "user"  
    4745    cl_publisher = "publisher"  
     46    cl_distributor = "distributor"  
     47    cl_author = "author"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_series.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:09 
     24Created on 13-Mar-2012 11:08:06 
    2525 
    2626@author: mnagni 
    … …  
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/ci_telephone.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:07 
     24Created on 13-Mar-2012 11:08:12 
    2525 
    2626@author: mnagni 
    … …  
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/citation_and_responsible_party_information/url.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
    … …  
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/constraint_information/md_classificationcode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_topsecret = "topSecret"  
    3738    cl_secret = "secret"  
     39    cl_unclassified = "unclassified"  
    3840    cl_restricted = "restricted"  
    3941    cl_confidential = "confidential"  
    40     cl_unclassified = "unclassified"  
    41     cl_topsecret = "topSecret"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/constraint_information/md_constraints.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:07 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
    … …  
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/constraint_information/md_legalconstraints.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_constraints import  MD_Constraints  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
    … …  
    6060 
    6161    def __eq__(self, y): 
     62        if type(self) != type(y): 
     63            return False 
    6264        ''' 
    6365        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6870 
    6971    def __hash__(self): 
    70         return hash(self.__key()) 
     72        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/constraint_information/md_restrictioncode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_restricted = "restricted"  
     38    cl_patentpending = "patentPending"  
    3739    cl_trademark = "trademark"  
    38     cl_restricted = "restricted"  
     40    cl_intellectualpropertyrights = "intellectualPropertyRights"  
     41    cl_copyright = "copyright"  
     42    cl_otherrestrictions = "otherRestrictions"  
     43    cl_patent = "patent"  
    3944    cl_license = "license"  
    40     cl_copyright = "copyright"  
    41     cl_patentpending = "patentPending"  
    42     cl_otherrestrictions = "otherRestrictions"  
    43     cl_intellectualpropertyrights = "intellectualPropertyRights"  
    44     cl_patent = "patent"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/constraint_information/md_securityconstraints.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_constraints import  MD_Constraints  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:01 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
    … …  
    6161 
    6262    def __eq__(self, y): 
     63        if type(self) != type(y): 
     64            return False 
    6365        ''' 
    6466        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6971 
    7072    def __hash__(self): 
    71         return hash(self.__key()) 
     73        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_band.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_rangedimension import  MD_RangeDimension  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
    … …  
    4747        self.sequenceIdentifier = None 
    4848        self.maxValue = None 
     49        self.offset = None 
    4950        self.minValue = None 
    50         self.offset = None 
    5151        self.bitsPerValue = None 
    5252        self.toneGradation = None 
    … …  
    7171 
    7272    def __key(self): 
    73         return (self.peakResponse, self.descriptor, self.units, self.sequenceIdentifier, self.maxValue, self.minValue, self.offset, self.bitsPerValue, self.toneGradation, self.scaleFactor) 
     73        return (self.peakResponse, self.descriptor, self.units, self.sequenceIdentifier, self.maxValue, self.offset, self.minValue, self.bitsPerValue, self.toneGradation, self.scaleFactor) 
    7474 
    7575    def __eq__(self, y): 
     76        if type(self) != type(y): 
     77            return False 
    7678        ''' 
    7779        Cannot compare classes which do not define a "__key" attribute  
    … …  
    8284 
    8385    def __hash__(self): 
    84         return hash(self.__key()) 
     86        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_contentinformation.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
    … …  
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_coveragecontenttypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:02 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_thematicclassification = "thematicClassification"  
     38    cl_physicalmeasurement = "physicalMeasurement"  
    3739    cl_image = "image"  
    38     cl_physicalmeasurement = "physicalMeasurement"  
    39     cl_thematicclassification = "thematicClassification"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_coveragedescription.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_contentinformation import  MD_ContentInformation  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_featurecataloguedescription.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_contentinformation import  MD_ContentInformation  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    5353 
    5454    def __eq__(self, y): 
     55        if type(self) != type(y): 
     56            return False 
    5557        ''' 
    5658        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6163 
    6264    def __hash__(self): 
    63         return hash(self.__key()) 
     65        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_imagedescription.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_coveragedescription import  MD_CoverageDescription  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
    … …  
    4444        self.cloudCoverPercentage = None 
    4545        self.dimension = [] 
     46        self.triangulationIndicator = None 
    4647        self.imageQualityCode = None 
    47         self.triangulationIndicator = None 
    4848        self.contentType = None 
     49        self.processingLevelCode = None 
    4950        self.lensDistortionInformationAvailability = None 
    50         self.processingLevelCode = None 
     51        self.compressionGenerationQuantity = None 
    5152        self.illuminationAzimuthAngle = None 
    52         self.compressionGenerationQuantity = None 
    5353        self.attributeDescription = None 
    5454        self.imagingCondition = None 
    … …  
    8484 
    8585    def __key(self): 
    86         return (self.cloudCoverPercentage, self.dimension, self.imageQualityCode, self.triangulationIndicator, self.contentType, self.lensDistortionInformationAvailability, self.processingLevelCode, self.illuminationAzimuthAngle, self.compressionGenerationQuantity, self.attributeDescription, self.imagingCondition, self.radiometricCalibrationDataAvailability, self.filmDistortionInformationAvailability, self.illuminationElevationAngle, self.cameraCalibrationInformationAvailability) 
     86        return (self.cloudCoverPercentage, self.dimension, self.triangulationIndicator, self.imageQualityCode, self.contentType, self.processingLevelCode, self.lensDistortionInformationAvailability, self.compressionGenerationQuantity, self.illuminationAzimuthAngle, self.attributeDescription, self.imagingCondition, self.radiometricCalibrationDataAvailability, self.filmDistortionInformationAvailability, self.illuminationElevationAngle, self.cameraCalibrationInformationAvailability) 
    8787 
    8888    def __eq__(self, y): 
     89        if type(self) != type(y): 
     90            return False 
    8991        ''' 
    9092        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9597 
    9698    def __hash__(self): 
    97         return hash(self.__key()) 
     99        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_imagingconditioncode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
    … …  
    3636    ''' 
    3737    cl_heavysmokeordust = "heavySmokeOrDust"  
     38    cl_snow = "snow"  
     39    cl_rain = "rain"  
     40    cl_blurredimage = "blurredImage"  
     41    cl_terrainmasking = "terrainMasking"  
     42    cl_semidarkness = "semiDarkness"  
     43    cl_fog = "fog"  
     44    cl_night = "night"  
     45    cl_shadow = "shadow"  
     46    cl_cloud = "cloud"  
    3847    cl_degradingobliquity = "degradingObliquity"  
    39     cl_cloud = "cloud"  
    40     cl_fog = "fog"  
    41     cl_shadow = "shadow"  
    42     cl_semidarkness = "semiDarkness"  
    43     cl_rain = "rain"  
    44     cl_night = "night"  
    45     cl_blurredimage = "blurredImage"  
    46     cl_snow = "snow"  
    47     cl_terrainmasking = "terrainMasking"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/content_information/md_rangedimension.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
    … …  
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_absoluteexternalpositionalaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_positionalaccuracy import  DQ_PositionalAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_AbsoluteExternalPositionalAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_positionalaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_positionalaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_positionalaccuracy.dateTime 
    … …  
    110118            self._dq_positionalaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_positionalaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_positionalaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_accuracyofatimemeasurement.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_temporalaccuracy import  DQ_TemporalAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:11 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_AccuracyOfATimeMeasurement, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_temporalaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_temporalaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_temporalaccuracy.dateTime 
    … …  
    110118            self._dq_temporalaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_temporalaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_temporalaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_completeness.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import  DQ_Element  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:01 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_Completeness, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_element.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_element.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_element.dateTime 
    … …  
    110118            self._dq_element.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_element.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_element.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_completenesscommission.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_completeness import  DQ_Completeness  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_CompletenessCommission, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_completeness.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_completeness.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_completeness.dateTime 
    … …  
    110118            self._dq_completeness.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_completeness.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_completeness.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_completenessomission.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_completeness import  DQ_Completeness  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_CompletenessOmission, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_completeness.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_completeness.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_completeness.dateTime 
    … …  
    110118            self._dq_completeness.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_completeness.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_completeness.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_conceptualconsistency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_logicalconsistency import  DQ_LogicalConsistency  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_ConceptualConsistency, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_logicalconsistency.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_logicalconsistency.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_logicalconsistency.dateTime 
    … …  
    110118            self._dq_logicalconsistency.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_logicalconsistency.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_logicalconsistency.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_conformanceresult.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_result import  DQ_Result  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_dataquality.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:08 
    2525 
    2626@author: mnagni 
    … …  
    4242        self.lineage = None 
    4343        self.scope = None 
     44        self._report_qe_usability = [] 
     45        self._report_dq_positionalaccuracy = [] 
    4446        self._report_dq_logicalconsistency = [] 
     47        self._report_dq_temporalaccuracy = [] 
    4548        self._report_dq_thematicaccuracy = [] 
    46         self._report_qe_usability = [] 
    4749        self._report_dq_completeness = [] 
    48         self._report_dq_positionalaccuracy = [] 
    49         self._report_dq_temporalaccuracy = [] 
    5050        super(DQ_DataQuality, self).__init__() 
    5151 
    … …  
    5353    def report(self):    
    5454        ret = [] 
     55        for item in self._report_qe_usability: 
     56            ret.append(item) 
     57        for item in self._report_dq_positionalaccuracy: 
     58            ret.append(item) 
    5559        for item in self._report_dq_logicalconsistency: 
     60            ret.append(item) 
     61        for item in self._report_dq_temporalaccuracy: 
    5662            ret.append(item) 
    5763        for item in self._report_dq_thematicaccuracy: 
    5864            ret.append(item) 
    59         for item in self._report_qe_usability: 
    60             ret.append(item) 
    6165        for item in self._report_dq_completeness: 
    62             ret.append(item) 
    63         for item in self._report_dq_positionalaccuracy: 
    64             ret.append(item) 
    65         for item in self._report_dq_temporalaccuracy: 
    6666            ret.append(item) 
    6767        return ret 
    … …  
    7070    def report(self, value):     
    7171        if isinstance(value, list): 
     72            self._report_qe_usability[:] 
     73            self._report_dq_positionalaccuracy[:] 
    7274            self._report_dq_logicalconsistency[:] 
     75            self._report_dq_temporalaccuracy[:] 
    7376            self._report_dq_thematicaccuracy[:] 
    74             self._report_qe_usability[:] 
    7577            self._report_dq_completeness[:] 
    76             self._report_dq_positionalaccuracy[:] 
    77             self._report_dq_temporalaccuracy[:] 
    7878            for item in value: 
    7979                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     80                if valueClass == "ea_model.iso_19115_2_2009_metadata___imagery.data_quality_information___imagery.qe_usability.QE_Usability": 
     81                    self._report_qe_usability.append(item) 
     82                    continue 
     83                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_positionalaccuracy.DQ_PositionalAccuracy": 
     84                    self._report_dq_positionalaccuracy.append(item) 
     85                    continue 
    8086                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_logicalconsistency.DQ_LogicalConsistency": 
    8187                    self._report_dq_logicalconsistency.append(item) 
     88                    continue 
     89                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_temporalaccuracy.DQ_TemporalAccuracy": 
     90                    self._report_dq_temporalaccuracy.append(item) 
    8291                    continue 
    8392                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_thematicaccuracy.DQ_ThematicAccuracy": 
    8493                    self._report_dq_thematicaccuracy.append(item) 
    8594                    continue 
    86                 if valueClass == "ea_model.iso_19115_2_2009_metadata___imagery.data_quality_information___imagery.qe_usability.QE_Usability": 
    87                     self._report_qe_usability.append(item) 
    88                     continue 
    8995                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_completeness.DQ_Completeness": 
    9096                    self._report_dq_completeness.append(item) 
    91                     continue 
    92                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_positionalaccuracy.DQ_PositionalAccuracy": 
    93                     self._report_dq_positionalaccuracy.append(item) 
    94                     continue 
    95                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_temporalaccuracy.DQ_TemporalAccuracy": 
    96                     self._report_dq_temporalaccuracy.append(item) 
    9797                    continue 
    9898 
    … …  
    101101 
    102102    def __eq__(self, y): 
     103        if type(self) != type(y): 
     104            return False 
    103105        ''' 
    104106        Cannot compare classes which do not define a "__key" attribute  
    … …  
    109111 
    110112    def __hash__(self): 
    111         return hash(self.__key()) 
     113        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_domainconsistency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_logicalconsistency import  DQ_LogicalConsistency  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:11 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_DomainConsistency, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_logicalconsistency.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_logicalconsistency.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_logicalconsistency.dateTime 
    … …  
    110118            self._dq_logicalconsistency.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_logicalconsistency.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_logicalconsistency.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_element.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:09 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
    … …  
    4343        self.nameOfMeasure = [] 
    4444        self.evaluationMethodDescription = None 
     45        self._result_dq_conformanceresult = [] 
    4546        self._result_dq_quantitativeresult = [] 
    46         self._result_dq_conformanceresult = [] 
    4747        self._result_qe_coverageresult = [] 
    4848        self.evaluationProcedure = None 
    4949        self.measureIdentification = None 
     50        self.measureDescription = None 
    5051        self.dateTime = [] 
    51         self.measureDescription = None 
    5252        super(DQ_Element, self).__init__() 
    5353 
    … …  
    5555    def result(self):    
    5656        ret = [] 
     57        for item in self._result_dq_conformanceresult: 
     58            ret.append(item) 
    5759        for item in self._result_dq_quantitativeresult: 
    58             ret.append(item) 
    59         for item in self._result_dq_conformanceresult: 
    6060            ret.append(item) 
    6161        for item in self._result_qe_coverageresult: 
    … …  
    6666    def result(self, value):     
    6767        if isinstance(value, list): 
     68            self._result_dq_conformanceresult[:] 
    6869            self._result_dq_quantitativeresult[:] 
    69             self._result_dq_conformanceresult[:] 
    7070            self._result_qe_coverageresult[:] 
    7171            for item in value: 
    7272                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     73                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_conformanceresult.DQ_ConformanceResult": 
     74                    self._result_dq_conformanceresult.append(item) 
     75                    continue 
    7376                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_quantitativeresult.DQ_QuantitativeResult": 
    7477                    self._result_dq_quantitativeresult.append(item) 
    75                     continue 
    76                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_conformanceresult.DQ_ConformanceResult": 
    77                     self._result_dq_conformanceresult.append(item) 
    7878                    continue 
    7979                if valueClass == "ea_model.iso_19115_2_2009_metadata___imagery.data_quality_information___imagery.qe_coverageresult.QE_CoverageResult": 
    … …  
    8282 
    8383    def __key(self): 
    84         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     84        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    8585 
    8686    def __eq__(self, y): 
     87        if type(self) != type(y): 
     88            return False 
    8789        ''' 
    8890        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9395 
    9496    def __hash__(self): 
    95         return hash(self.__key()) 
     97        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_evaluationmethodtypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_indirect = "indirect"  
    3738    cl_directinternal = "directInternal"  
    3839    cl_directexternal = "directExternal"  
    39     cl_indirect = "indirect"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_formatconsistency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_logicalconsistency import  DQ_LogicalConsistency  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:05 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_FormatConsistency, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_logicalconsistency.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_logicalconsistency.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_logicalconsistency.dateTime 
    … …  
    110118            self._dq_logicalconsistency.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_logicalconsistency.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_logicalconsistency.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_griddeddatapositionalaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_positionalaccuracy import  DQ_PositionalAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_GriddedDataPositionalAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_positionalaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_positionalaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_positionalaccuracy.dateTime 
    … …  
    110118            self._dq_positionalaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_positionalaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_positionalaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_logicalconsistency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import  DQ_Element  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_LogicalConsistency, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_element.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_element.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_element.dateTime 
    … …  
    110118            self._dq_element.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_element.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_element.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_nonquantitativeattributeaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_thematicaccuracy import  DQ_ThematicAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_NonQuantitativeAttributeAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_thematicaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_thematicaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_thematicaccuracy.dateTime 
    … …  
    110118            self._dq_thematicaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_thematicaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_thematicaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_positionalaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import  DQ_Element  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_PositionalAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_element.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_element.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_element.dateTime 
    … …  
    110118            self._dq_element.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_element.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_element.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_quantitativeattributeaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_thematicaccuracy import  DQ_ThematicAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:05 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_QuantitativeAttributeAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_thematicaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_thematicaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_thematicaccuracy.dateTime 
    … …  
    110118            self._dq_thematicaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_thematicaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_thematicaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_quantitativeresult.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_result import  DQ_Result  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
    … …  
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_relativeinternalpositionalaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_positionalaccuracy import  DQ_PositionalAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_RelativeInternalPositionalAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_positionalaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_positionalaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_positionalaccuracy.dateTime 
    … …  
    110118            self._dq_positionalaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_positionalaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_positionalaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_result.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:05 
     24Created on 13-Mar-2012 11:08:07 
    2525 
    2626@author: mnagni 
    … …  
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_scope.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:07 
     24Created on 13-Mar-2012 11:08:14 
    2525 
    2626@author: mnagni 
    … …  
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_temporalaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import  DQ_Element  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:11 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_TemporalAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_element.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_element.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_element.dateTime 
    … …  
    110118            self._dq_element.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_element.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_element.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_temporalconsistency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_temporalaccuracy import  DQ_TemporalAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:02 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_TemporalConsistency, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_temporalaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_temporalaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_temporalaccuracy.dateTime 
    … …  
    110118            self._dq_temporalaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_temporalaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_temporalaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_temporalvalidity.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_temporalaccuracy import  DQ_TemporalAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_TemporalValidity, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_temporalaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_temporalaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_temporalaccuracy.dateTime 
    … …  
    110118            self._dq_temporalaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_temporalaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_temporalaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_thematicaccuracy.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import  DQ_Element  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_ThematicAccuracy, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_element.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_element.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_element.dateTime 
    … …  
    110118            self._dq_element.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_element.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_element.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_thematicclassificationcorrectness.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_thematicaccuracy import  DQ_ThematicAccuracy  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_ThematicClassificationCorrectness, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_thematicaccuracy.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_thematicaccuracy.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_thematicaccuracy.dateTime 
    … …  
    110118            self._dq_thematicaccuracy.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_thematicaccuracy.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_thematicaccuracy.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/dq_topologicalconsistency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_logicalconsistency import  DQ_LogicalConsistency  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
    … …  
    4545        self.nameOfMeasure = [] 
    4646        self.evaluationMethodDescription = None 
     47        self._result_dq_conformanceresult = [] 
    4748        self._result_dq_quantitativeresult = [] 
    48         self._result_dq_conformanceresult = [] 
    4949        self._result_qe_coverageresult = [] 
    5050        self.evaluationProcedure = None 
    5151        self.measureIdentification = None 
     52        self.measureDescription = None 
    5253        self.dateTime = [] 
    53         self.measureDescription = None 
    5454        super(DQ_TopologicalConsistency, self).__init__() 
    5555 
    … …  
    103103 
    104104    @property 
     105    def measureDescription(self):        
     106        return self._dq_logicalconsistency.measureDescription 
     107 
     108    @measureDescription.setter 
     109    def measureDescription(self, value):         
     110            self._dq_logicalconsistency.measureDescription = value 
     111 
     112    @property 
    105113    def dateTime(self):  
    106114        return self._dq_logicalconsistency.dateTime 
    … …  
    110118            self._dq_logicalconsistency.dateTime = value 
    111119 
    112     @property 
    113     def measureDescription(self):        
    114         return self._dq_logicalconsistency.measureDescription 
    115  
    116     @measureDescription.setter 
    117     def measureDescription(self, value):         
    118             self._dq_logicalconsistency.measureDescription = value 
    119  
    120120    def __key(self): 
    121         return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.dateTime, self.measureDescription) 
     121        return (self.evaluationMethodType, self.nameOfMeasure, self.evaluationMethodDescription, self.result, self.evaluationProcedure, self.measureIdentification, self.measureDescription, self.dateTime) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
    … …  
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/li_lineage.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
    … …  
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/li_processstep.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:02 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    4040    def __init__(self): 
    4141 
     42        self.description = None 
    4243        self.rationale = None 
    43         self.description = None 
    4444        self.processor = [] 
    4545        self.source = [] 
    … …  
    4848 
    4949    def __key(self): 
    50         return (self.rationale, self.description, self.processor, self.source, self.dateTime) 
     50        return (self.description, self.rationale, self.processor, self.source, self.dateTime) 
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/data_quality_information/li_source.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:08 
    2525 
    2626@author: mnagni 
    … …  
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_digitaltransferoptions.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:06 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
    … …  
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_distribution.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:06 
    2525 
    2626@author: mnagni 
    … …  
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_distributionunits.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_distributor.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:04 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
    … …  
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_format.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:03 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
    … …  
    4040    def __init__(self): 
    4141 
     42        self.fileDecompressionTechnique = None 
    4243        self.name = None 
    43         self.fileDecompressionTechnique = None 
    4444        self.version = None 
    4545        self.specification = None 
    … …  
    4949 
    5050    def __key(self): 
    51         return (self.name, self.fileDecompressionTechnique, self.version, self.specification, self.amendmentNumber, self.formatDistributor) 
     51        return (self.fileDecompressionTechnique, self.name, self.version, self.specification, self.amendmentNumber, self.formatDistributor) 
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_medium.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
    … …  
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_mediumformatcode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_iso9660 = "iso9660"  
     38    cl_tar = "tar"  
     39    cl_highsierra = "highSierra"  
    3740    cl_cpio = "cpio"  
     41    cl_iso9660rockridge = "iso9660RockRidge"  
    3842    cl_iso9660applehfs = "iso9660AppleHFS"  
    39     cl_highsierra = "highSierra"  
    40     cl_tar = "tar"  
    41     cl_iso9660rockridge = "iso9660RockRidge"  
    42     cl_iso9660 = "iso9660"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_mediumnamecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_5quarterinchfloppy = "5quarterInchFloppy"  
     38    cl_7tracktape = "7trackTape"  
     39    cl_telephonelink = "telephoneLink"  
     40    cl_3490cartridge = "3490Cartridge"  
     41    cl_digitallineartape = "digitalLinearTape"  
     42    cl_9tracktape = "9trackTape"  
     43    cl_3halfinchfloppy = "3halfInchFloppy"  
     44    cl_8mmcartridgetape = "8mmCartridgeTape"  
     45    cl_hardcopy = "hardcopy"  
     46    cl_3480cartridge = "3480Cartridge"  
     47    cl_4mmcartridgetape = "4mmCartridgeTape"  
     48    cl_dvd = "dvd"  
     49    cl_satellite = "satellite"  
     50    cl_1quarterinchcartridgetape = "1quarterInchCartridgeTape"  
    3751    cl_3580cartridge = "3580Cartridge"  
    38     cl_3490cartridge = "3490Cartridge"  
    39     cl_hardcopy = "hardcopy"  
    40     cl_3halfinchfloppy = "3halfInchFloppy"  
    41     cl_1quarterinchcartridgetape = "1quarterInchCartridgeTape"  
    4252    cl_online = "onLine"  
    4353    cl_cdrom = "cdRom"  
    44     cl_telephonelink = "telephoneLink"  
    45     cl_5quarterinchfloppy = "5quarterInchFloppy"  
    46     cl_dvd = "dvd"  
    47     cl_satellite = "satellite"  
    48     cl_4mmcartridgetape = "4mmCartridgeTape"  
    49     cl_3480cartridge = "3480Cartridge"  
    50     cl_7tracktape = "7trackTape"  
    51     cl_9tracktape = "9trackTape"  
    5254    cl_dvdrom = "dvdRom"  
    53     cl_8mmcartridgetape = "8mmCartridgeTape"  
    54     cl_digitallineartape = "digitalLinearTape"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/distribution_information/md_standardorderprocess.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:01 
     24Created on 13-Mar-2012 11:08:08 
    2525 
    2626@author: mnagni 
    … …  
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_boundingpolygon.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicextent import  EX_GeographicExtent  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:00 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    4343 
    4444        self._polygon_gm_complex = [] 
     45        self._polygon_gm_aggregate = [] 
    4546        self._polygon_gm_primitive = [] 
    46         self._polygon_gm_aggregate = [] 
    4747        self.extentTypeCode = None 
    4848        super(EX_BoundingPolygon, self).__init__() 
    … …  
    5353        for item in self._polygon_gm_complex: 
    5454            ret.append(item) 
     55        for item in self._polygon_gm_aggregate: 
     56            ret.append(item) 
    5557        for item in self._polygon_gm_primitive: 
    56             ret.append(item) 
    57         for item in self._polygon_gm_aggregate: 
    5858            ret.append(item) 
    5959        return ret 
    … …  
    6363        if isinstance(value, list): 
    6464            self._polygon_gm_complex[:] 
     65            self._polygon_gm_aggregate[:] 
    6566            self._polygon_gm_primitive[:] 
    66             self._polygon_gm_aggregate[:] 
    6767            for item in value: 
    6868                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    … …  
    7070                    self._polygon_gm_complex.append(item) 
    7171                    continue 
     72                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_aggregates.gm_aggregate.GM_Aggregate": 
     73                    self._polygon_gm_aggregate.append(item) 
     74                    continue 
    7275                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_primitive.GM_Primitive": 
    7376                    self._polygon_gm_primitive.append(item) 
    74                     continue 
    75                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_aggregates.gm_aggregate.GM_Aggregate": 
    76                     self._polygon_gm_aggregate.append(item) 
    7777                    continue 
    7878 
    … …  
    8989 
    9090    def __eq__(self, y): 
     91        if type(self) != type(y): 
     92            return False 
    9193        ''' 
    9294        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9799 
    98100    def __hash__(self): 
    99         return hash(self.__key()) 
     101        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_extent.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:12 
     24Created on 13-Mar-2012 11:08:07 
    2525 
    2626@author: mnagni 
    … …  
    8181 
    8282    def __eq__(self, y): 
     83        if type(self) != type(y): 
     84            return False 
    8385        ''' 
    8486        Cannot compare classes which do not define a "__key" attribute  
    … …  
    8991 
    9092    def __hash__(self): 
    91         return hash(self.__key()) 
     93        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_geographicboundingbox.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicextent import  EX_GeographicExtent  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    6161 
    6262    def __eq__(self, y): 
     63        if type(self) != type(y): 
     64            return False 
    6365        ''' 
    6466        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6971 
    7072    def __hash__(self): 
    71         return hash(self.__key()) 
     73        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_geographicdescription.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicextent import  EX_GeographicExtent  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_geographicextent.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
    … …  
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_spatialtemporalextent.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_temporalextent import  EX_TemporalExtent  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    4545        self._spatialExtent_ex_geographicdescription = [] 
    4646        self._spatialExtent_ex_geographicboundingbox = [] 
     47        self._extent_tm_geometricprimitive = None 
    4748        self._extent_tm_topologicalprimitive = None 
    48         self._extent_tm_geometricprimitive = None 
    4949        super(EX_SpatialTemporalExtent, self).__init__() 
    5050 
    … …  
    9090 
    9191    def __eq__(self, y): 
     92        if type(self) != type(y): 
     93            return False 
    9294        ''' 
    9395        Cannot compare classes which do not define a "__key" attribute  
    … …  
    98100 
    99101    def __hash__(self): 
    100         return hash(self.__key()) 
     102        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_temporalextent.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    4040    def __init__(self): 
    4141 
     42        self._extent_tm_geometricprimitive = None 
    4243        self._extent_tm_topologicalprimitive = None 
    43         self._extent_tm_geometricprimitive = None 
    4444        super(EX_TemporalExtent, self).__init__() 
    4545 
    4646    @property 
    4747    def extent(self):    
     48        if(has_value(self._extent_tm_geometricprimitive)): 
     49            return self._extent_tm_geometricprimitive 
    4850        if(has_value(self._extent_tm_topologicalprimitive)): 
    4951            return self._extent_tm_topologicalprimitive 
    50         if(has_value(self._extent_tm_geometricprimitive)): 
    51             return self._extent_tm_geometricprimitive 
    5252        return  None 
    5353 
    … …  
    5555    def extent(self, value):     
    5656        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     57        if valueClass == "ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_geometricprimitive.TM_GeometricPrimitive": 
     58            self._extent_tm_geometricprimitive = value 
     59            self._extent_tm_topologicalprimitive = None 
    5760        if valueClass == "ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_topologicalprimitive.TM_TopologicalPrimitive": 
    5861            self._extent_tm_topologicalprimitive = value 
    5962            self._extent_tm_geometricprimitive = None 
    60         if valueClass == "ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_geometricprimitive.TM_GeometricPrimitive": 
    61             self._extent_tm_geometricprimitive = value 
    62             self._extent_tm_topologicalprimitive = None 
    6363 
    6464    def __key(self): 
    … …  
    6666 
    6767    def __eq__(self, y): 
     68        if type(self) != type(y): 
     69            return False 
    6870        ''' 
    6971        Cannot compare classes which do not define a "__key" attribute  
    … …  
    7476 
    7577    def __hash__(self): 
    76         return hash(self.__key()) 
     78        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/extent_information/ex_verticalextent.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:04 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
    … …  
    4040    def __init__(self): 
    4141 
     42        self.verticalCRS = None 
     43        self._verticalCRS_sc_compoundcrs = None 
    4244        self._verticalCRS_sc_singlecrs = None 
    43         self._verticalCRS_sc_compoundcrs = None 
    44         self.verticalCRS = None 
     45        self.minimumValue = None 
    4546        self.maximumValue = None 
    46         self.minimumValue = None 
    4747        super(EX_VerticalExtent, self).__init__() 
    4848 
    4949    @property 
    5050    def verticalCRS(self):       
     51        if(has_value(self._verticalCRS_sc_compoundcrs)): 
     52            return self._verticalCRS_sc_compoundcrs 
    5153        if(has_value(self._verticalCRS_sc_singlecrs)): 
    5254            return self._verticalCRS_sc_singlecrs 
    53         if(has_value(self._verticalCRS_sc_compoundcrs)): 
    54             return self._verticalCRS_sc_compoundcrs 
    5555        return  None 
    5656 
    … …  
    5858    def verticalCRS(self, value):        
    5959        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     60        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
     61            self._verticalCRS_sc_compoundcrs = value 
     62            self._verticalCRS_sc_singlecrs = None 
    6063        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
    6164            self._verticalCRS_sc_singlecrs = value 
    6265            self._verticalCRS_sc_compoundcrs = None 
    63         if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
    64             self._verticalCRS_sc_compoundcrs = value 
    65             self._verticalCRS_sc_singlecrs = None 
    6666 
    6767    def __key(self): 
    68         return (self.verticalCRS, self.verticalCRS, self.maximumValue, self.minimumValue) 
     68        return (self.verticalCRS, self.verticalCRS, self.minimumValue, self.maximumValue) 
    6969 
    7070    def __eq__(self, y): 
     71        if type(self) != type(y): 
     72            return False 
    7173        ''' 
    7274        Cannot compare classes which do not define a "__key" attribute  
    … …  
    7779 
    7880    def __hash__(self): 
    79         return hash(self.__key()) 
     81        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/ds_association.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:04 
     24Created on 13-Mar-2012 11:08:04 
    2525 
    2626@author: mnagni 
    … …  
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/ds_associationtypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:09 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_crossreference = "crossReference"  
     38    cl_partofseamlessdatabase = "partOfSeamlessDatabase"  
    3739    cl_largerworkcitation = "largerWorkCitation"  
     40    cl_source = "source"  
    3841    cl_stereomate = "stereoMate"  
    39     cl_partofseamlessdatabase = "partOfSeamlessDatabase"  
    40     cl_source = "source"  
    41     cl_crossreference = "crossReference"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/ds_initiativetypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
    37     cl_collection = "collection"  
     37    cl_program = "program"  
     38    cl_trial = "trial"  
     39    cl_campaign = "campaign"  
    3840    cl_experiment = "experiment"  
    3941    cl_exercise = "exercise"  
     42    cl_platform = "platform"  
     43    cl_project = "project"  
     44    cl_task = "task"  
    4045    cl_process = "process"  
     46    cl_investigation = "investigation"  
     47    cl_mission = "mission"  
     48    cl_collection = "collection"  
    4149    cl_sensor = "sensor"  
    42     cl_campaign = "campaign"  
     50    cl_study = "study"  
    4351    cl_operation = "operation"  
    44     cl_project = "project"  
    45     cl_study = "study"  
    46     cl_task = "task"  
    47     cl_program = "program"  
    48     cl_mission = "mission"  
    49     cl_trial = "trial"  
    50     cl_platform = "platform"  
    51     cl_investigation = "investigation"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_aggregateinformation.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:09 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
    … …  
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_browsegraphic.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_charactersetcode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_8859part8 = "8859part8"  
     38    cl_ebcdic = "ebcdic"  
     39    cl_ucs4 = "ucs4"  
     40    cl_8859part5 = "8859part5"  
     41    cl_8859part14 = "8859part14"  
     42    cl_8859part6 = "8859part6"  
     43    cl_8859part4 = "8859part4"  
     44    cl_8859part2 = "8859part2"  
     45    cl_8859part10 = "8859part10"  
     46    cl__reservedforfutureuse_ = "(reservedforfutureuse)"  
     47    cl_jis = "jis"  
     48    cl_8859part15 = "8859part15"  
     49    cl_8859part9 = "8859part9"  
     50    cl_utf8 = "utf8"  
    3751    cl_usascii = "usAscii"  
     52    cl_8859part7 = "8859part7"  
     53    cl_gb2312 = "GB2312"  
     54    cl_utf16 = "utf16"  
     55    cl_8859part3 = "8859part3"  
     56    cl_8859part16 = "8859part16"  
     57    cl_eucjp = "eucJP"  
     58    cl_8859part1 = "8859part1"  
     59    cl_ucs2 = "ucs2"  
     60    cl_8859part13 = "8859part13"  
     61    cl_8859part11 = "8859part11"  
    3862    cl_shiftjis = "shiftJIS"  
    3963    cl_euckr = "eucKR"  
    40     cl_8859part7 = "8859part7"  
    41     cl_eucjp = "eucJP"  
    42     cl_gb2312 = "GB2312"  
    4364    cl_big5 = "big5"  
    44     cl_8859part4 = "8859part4"  
    45     cl_8859part2 = "8859part2"  
    46     cl_8859part15 = "8859part15"  
    47     cl_8859part13 = "8859part13"  
    48     cl_8859part14 = "8859part14"  
    49     cl_8859part8 = "8859part8"  
    50     cl_ucs2 = "ucs2"  
    51     cl_utf8 = "utf8"  
    52     cl_jis = "jis"  
    53     cl_ebcdic = "ebcdic"  
    54     cl_8859part9 = "8859part9"  
    55     cl_8859part10 = "8859part10"  
    56     cl_utf16 = "utf16"  
    57     cl_8859part3 = "8859part3"  
    58     cl_8859part11 = "8859part11"  
    59     cl_8859part16 = "8859part16"  
    60     cl_8859part6 = "8859part6"  
    61     cl_8859part5 = "8859part5"  
    62     cl__reservedforfutureuse_ = "(reservedforfutureuse)"  
    63     cl_8859part1 = "8859part1"  
    6465    cl_utf7 = "utf7"  
    65     cl_ucs4 = "ucs4"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_dataidentification.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.identification_information.md_identification import  MD_Identification  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
    … …  
    4444        self.descriptiveKeywords = [] 
    4545        self.pointOfContact = [] 
     46        self.graphicOverview = [] 
    4647        self.language = [] 
    47         self.graphicOverview = [] 
     48        self.purpose = None 
    4849        self.resourceMaintenance = [] 
    4950        self.extent = [] 
    50         self.purpose = None 
    5151        self.characterSet = [] 
    5252        self.environmentDescription = None 
    … …  
    5555        self.abstract = None 
    5656        self.status = [] 
     57        self._resourceConstraints_md_legalconstraints = [] 
    5758        self._resourceConstraints_md_securityconstraints = [] 
    58         self._resourceConstraints_md_legalconstraints = [] 
    5959        self.spatialResolution = [] 
    6060        self.topicCategory = [] 
    … …  
    9191 
    9292    @property 
     93    def purpose(self):   
     94        return self._md_identification.purpose 
     95 
     96    @purpose.setter 
     97    def purpose(self, value):    
     98            self._md_identification.purpose = value 
     99 
     100    @property 
    93101    def resourceMaintenance(self):       
    94102        return self._md_identification.resourceMaintenance 
    … …  
    97105    def resourceMaintenance(self, value):        
    98106            self._md_identification.resourceMaintenance = value 
    99  
    100     @property 
    101     def purpose(self):   
    102         return self._md_identification.purpose 
    103  
    104     @purpose.setter 
    105     def purpose(self, value):    
    106             self._md_identification.purpose = value 
    107107 
    108108    @property 
    … …  
    171171 
    172172    def __key(self): 
    173         return (self.descriptiveKeywords, self.pointOfContact, self.language, self.graphicOverview, self.resourceMaintenance, self.extent, self.purpose, self.characterSet, self.environmentDescription, self.citation, self.spatialRepresentationType, self.abstract, self.status, self.resourceConstraints, self.spatialResolution, self.topicCategory, self.resourceFormat, self.aggregationInfo, self.resourceSpecificUsage, self.supplementalInformation, self.credit) 
     173        return (self.descriptiveKeywords, self.pointOfContact, self.graphicOverview, self.language, self.purpose, self.resourceMaintenance, self.extent, self.characterSet, self.environmentDescription, self.citation, self.spatialRepresentationType, self.abstract, self.status, self.resourceConstraints, self.spatialResolution, self.topicCategory, self.resourceFormat, self.aggregationInfo, self.resourceSpecificUsage, self.supplementalInformation, self.credit) 
    174174 
    175175    def __eq__(self, y): 
     176        if type(self) != type(y): 
     177            return False 
    176178        ''' 
    177179        Cannot compare classes which do not define a "__key" attribute  
    … …  
    182184 
    183185    def __hash__(self): 
    184         return hash(self.__key()) 
     186        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_identification.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:03 
    2525 
    2626@author: mnagni 
    … …  
    4343        self.pointOfContact = [] 
    4444        self.graphicOverview = [] 
     45        self.resourceMaintenance = [] 
    4546        self.purpose = None 
    46         self.resourceMaintenance = [] 
    4747        self.citation = None 
    4848        self.abstract = None 
     49        self._resourceConstraints_md_legalconstraints = [] 
    4950        self._resourceConstraints_md_securityconstraints = [] 
    50         self._resourceConstraints_md_legalconstraints = [] 
    5151        self.status = [] 
    5252        self.resourceFormat = [] 
     53        self.aggregationInfo = [] 
    5354        self.resourceSpecificUsage = [] 
    54         self.aggregationInfo = [] 
    5555        self.credit = [] 
    5656        super(MD_Identification, self).__init__() 
    … …  
    5959    def resourceConstraints(self):       
    6060        ret = [] 
     61        for item in self._resourceConstraints_md_legalconstraints: 
     62            ret.append(item) 
    6163        for item in self._resourceConstraints_md_securityconstraints: 
    62             ret.append(item) 
    63         for item in self._resourceConstraints_md_legalconstraints: 
    6464            ret.append(item) 
    6565        return ret 
    … …  
    6868    def resourceConstraints(self, value):        
    6969        if isinstance(value, list): 
     70            self._resourceConstraints_md_legalconstraints[:] 
    7071            self._resourceConstraints_md_securityconstraints[:] 
    71             self._resourceConstraints_md_legalconstraints[:] 
    7272            for item in value: 
    7373                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     74                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_legalconstraints.MD_LegalConstraints": 
     75                    self._resourceConstraints_md_legalconstraints.append(item) 
     76                    continue 
    7477                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_securityconstraints.MD_SecurityConstraints": 
    7578                    self._resourceConstraints_md_securityconstraints.append(item) 
    7679                    continue 
    77                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_legalconstraints.MD_LegalConstraints": 
    78                     self._resourceConstraints_md_legalconstraints.append(item) 
    79                     continue 
    8080 
    8181    def __key(self): 
    82         return (self.descriptiveKeywords, self.pointOfContact, self.graphicOverview, self.purpose, self.resourceMaintenance, self.citation, self.abstract, self.resourceConstraints, self.status, self.resourceFormat, self.resourceSpecificUsage, self.aggregationInfo, self.credit) 
     82        return (self.descriptiveKeywords, self.pointOfContact, self.graphicOverview, self.resourceMaintenance, self.purpose, self.citation, self.abstract, self.resourceConstraints, self.status, self.resourceFormat, self.aggregationInfo, self.resourceSpecificUsage, self.credit) 
    8383 
    8484    def __eq__(self, y): 
     85        if type(self) != type(y): 
     86            return False 
    8587        ''' 
    8688        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9193 
    9294    def __hash__(self): 
    93         return hash(self.__key()) 
     95        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_keywords.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
    … …  
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_keywordtypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
    … …  
    3636    ''' 
    3737    cl_temporal = "temporal"  
     38    cl_place = "place"  
    3839    cl_stratum = "stratum"  
    3940    cl_theme = "theme"  
    4041    cl_discipline = "discipline"  
    41     cl_place = "place"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_progresscode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
    37     cl_ongoing = "onGoing"  
    38     cl_completed = "completed"  
    3937    cl_underdevelopment = "underDevelopment"  
    4038    cl_required = "required"  
     39    cl_historicalarchive = "historicalArchive"  
    4140    cl_planned = "planned"  
    4241    cl_obsolete = "obsolete"  
    43     cl_historicalarchive = "historicalArchive"  
     42    cl_completed = "completed"  
     43    cl_ongoing = "onGoing"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_representativefraction.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:07 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
    … …  
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_resolution.py

    r8091 r8160  
    2222from ea_model.iso_19115_2006_metadata_corrigendum.identification_information.md_representativefraction import  MD_RepresentativeFraction  
    2323from ascore.asunion import  ASUnion  
    24 from ascore.utils import has_value 
     24from ascore.utils import has_value, collectionProofHash 
    2525 
    2626''' 
    27 Created on 16-Feb-2012 16:18:08 
     27Created on 13-Mar-2012 11:08:09 
    2828 
    2929@author: mnagni 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_spatialrepresentationtypecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_stereomodel = "stereoModel"  
    3738    cl_vector = "vector"  
     39    cl_tin = "tin"  
     40    cl_texttable = "textTable"  
    3841    cl_video = "video"  
    39     cl_texttable = "textTable"  
    4042    cl_grid = "grid"  
    41     cl_tin = "tin"  
    42     cl_stereomodel = "stereoModel"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_topiccategorycode.py

    r8091 r8160  
    2020 
    2121from ascore.asenumeration import  ASEnumeration  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    en_society = "society"  
     38    en_climatologymeteorologyatmosphere = "climatologyMeteorologyAtmosphere"  
     39    en_geoscientificinformation = "geoscientificInformation"  
     40    en_farming = "farming"  
     41    en_utilitiescommunication = "utilitiesCommunication"  
    3742    en_inlandwaters = "inlandWaters"  
    38     en_society = "society"  
     43    en_environment = "environment"  
     44    en_boundaries = "boundaries"  
     45    en_economy = "economy"  
     46    en_imagerybasemapsearthcover = "imageryBaseMapsEarthCover"  
     47    en_location = "location"  
    3948    en_health = "health"  
     49    en_biota = "biota"  
     50    en_structure = "structure"  
     51    en_elevation = "elevation"  
     52    en_oceans = "oceans"  
    4053    en_planningcadastre = "planningCadastre"  
    4154    en_intelligencemilitary = "intelligenceMilitary"  
    42     en_elevation = "elevation"  
    4355    en_transportation = "transportation"  
    44     en_boundaries = "boundaries"  
    45     en_climatologymeteorologyatmosphere = "climatologyMeteorologyAtmosphere"  
    46     en_economy = "economy"  
    47     en_location = "location"  
    48     en_structure = "structure"  
    49     en_farming = "farming"  
    50     en_imagerybasemapsearthcover = "imageryBaseMapsEarthCover"  
    51     en_oceans = "oceans"  
    52     en_utilitiescommunication = "utilitiesCommunication"  
    53     en_geoscientificinformation = "geoscientificInformation"  
    54     en_environment = "environment"  
    55     en_biota = "biota"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/identification_information/md_usage.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:00 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
    … …  
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
    … …  
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/maintenance_information/md_maintenancefrequencycode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_notplanned = "notPlanned"  
     38    cl_fortnightly = "fortnightly"  
     39    cl_quarterly = "quarterly"  
     40    cl_unknown = "unknown"  
     41    cl_continual = "continual"  
     42    cl_weekly = "weekly"  
     43    cl_daily = "daily"  
     44    cl_irregular = "irregular"  
    3745    cl_asneeded = "asNeeded"  
    38     cl_weekly = "weekly"  
    39     cl_fortnightly = "fortnightly"  
    40     cl_continual = "continual"  
    41     cl_daily = "daily"  
    42     cl_quarterly = "quarterly"  
     46    cl_monthly = "monthly"  
     47    cl_biannually = "biannually"  
    4348    cl_annually = "annually"  
    44     cl_monthly = "monthly"  
    45     cl_irregular = "irregular"  
    46     cl_biannually = "biannually"  
    47     cl_unknown = "unknown"  
    48     cl_notplanned = "notPlanned"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/maintenance_information/md_maintenanceinformation.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:07 
     24Created on 13-Mar-2012 11:08:14 
    2525 
    2626@author: mnagni 
    … …  
    5353 
    5454    def __eq__(self, y): 
     55        if type(self) != type(y): 
     56            return False 
    5557        ''' 
    5658        Cannot compare classes which do not define a "__key" attribute  
    … …  
    6163 
    6264    def __hash__(self): 
    63         return hash(self.__key()) 
     65        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/maintenance_information/md_scopecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:05 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
    … …  
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_collectionsession = "collectionSession"  
     38    cl_service = "service"  
    3739    cl_propertytype = "propertyType"  
    38     cl_collectionhardware = "collectionHardware"  
    39     cl_service = "service"  
    40     cl_software = "software"  
    41     cl_feature = "feature"  
    42     cl_fieldsession = "fieldSession"  
    43     cl_model = "model"  
    44     cl_attributetype = "attributeType"  
    45     cl_dataset = "dataset"  
    46     cl_nongeographicdataset = "nonGeographicDataset"  
    4740    cl_dimensiongroup = "dimensionGroup"  
    4841    cl_series = "series"  
     42    cl_feature = "feature"  
     43    cl_attribute = "attribute"  
     44    cl_attributetype = "attributeType"  
     45    cl_model = "model"  
     46    cl_collectionhardware = "collectionHardware"  
     47    cl_dataset = "dataset"  
     48    cl_featuretype = "featureType"  
     49    cl_fieldsession = "fieldSession"  
    4950    cl_tile = "tile"  
    50     cl_collectionsession = "collectionSession"  
    51     cl_featuretype = "featureType"  
    52     cl_attribute = "attribute"  
     51    cl_software = "software"  
     52    cl_nongeographicdataset = "nonGeographicDataset"  

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/maintenance_information/md_scopedescription.py

    r8091 r8160  
    2323from ascore.asunion import  ASUnion  
    2424from ea_model.iso_19109_2005_application_schema.general_feature_model.gf_featuretype import  GF_FeatureType  
    25 from ascore.utils import has_value 
     25from ascore.utils import has_value, collectionProofHash 
    2626 
    2727''' 
    28 Created on 16-Feb-2012 16:18:05 
     28Created on 13-Mar-2012 11:08:03 
    2929 
    3030@author: mnagni 
    … …  
    3838        This class has been genererated automatically using the Apache Velocity project. 
    3939    ''' 
    40     types = {'attributeInstances':GF_AttributeType,'features':GF_FeatureType,'attributes':GF_AttributeType,'other':Text,'dataset':Text,'featureInstances':GF_FeatureType} 
     40    types = {'other':Text,'attributes':GF_AttributeType,'dataset':Text,'attributeInstances':GF_AttributeType,'features':GF_FeatureType,'featureInstances':GF_FeatureType} 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_aggregate.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:14 
    2525 
    2626@author: mnagni 
    … …  
    112112 
    113113    def __eq__(self, y): 
     114        if type(self) != type(y): 
     115            return False 
    114116        ''' 
    115117        Cannot compare classes which do not define a "__key" attribute  
    … …  
    120122 
    121123    def __hash__(self): 
    122         return hash(self.__key()) 
     124        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_dataset.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:02 
     24Created on 13-Mar-2012 11:08:11 
    2525 
    2626@author: mnagni 
    … …  
    7979 
    8080    def __eq__(self, y): 
     81        if type(self) != type(y): 
     82            return False 
    8183        ''' 
    8284        Cannot compare classes which do not define a "__key" attribute  
    … …  
    8789 
    8890    def __hash__(self): 
    89         return hash(self.__key()) 
     91        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_initiative.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_aggregate import  DS_Aggregate  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_otheraggregate.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_aggregate import  DS_Aggregate  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_platform.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_series import  DS_Series  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_productionseries.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_series import  DS_Series  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_sensor.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_series import  DS_Series  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:01 
     25Created on 13-Mar-2012 11:08:03 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_series.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_aggregate import  DS_Aggregate  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_application_information/ds_stereomate.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19115_2006_metadata_corrigendum.metadata_application_information.ds_otheraggregate import  DS_OtherAggregate  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:04 
    2626 
    2727@author: mnagni 
    … …  
    8888 
    8989    def __eq__(self, y): 
     90        if type(self) != type(y): 
     91            return False 
    9092        ''' 
    9193        Cannot compare classes which do not define a "__key" attribute  
    … …  
    9698 
    9799    def __hash__(self): 
    98         return hash(self.__key()) 
     100        return collectionProofHash(self.__key()) 

  • mauRepo/MolesManager/trunk/src/ea_model/iso_19115_2006_metadata_corrigendum/metadata_entity_set_information/md_metadata.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
    … …  
    4040    def __init__(self): 
    4141 
     42        self.dataSet = None 
    4243        self.fileIdentifier = None 
    43         self.dataSet = None 
    44         self._propertyType_gf_attributetype = [] 
    4544        self._propertyType_gf_associationrole = [] 
    4645        self._propertyType_gf_operation = [] 
     46        self._propertyType_gf_attributetype = [] 
    4747        self.applicationSchemaInfo = [] 
    4848        self.language = None 
     49        self.characterSet = None 
    4950        self.metadataStandardVersion = None 
    50         self.characterSet = None 
     51        self.dateStamp = None 
    5152        self.referenceSystemInfo = [] 
    52         self.dateStamp = None 
    5353        self.hierarchyLevel = [] 
     54        self._metadataConstraints_md_legalconstraints = [] 
    5455        self._metadataConstraints_md_securityconstraints = [] 
    55         self._metadataConstraints_md_legalconstraints = [] 
    5656        self.metadataStandardName = None 
    5757        self.identificationInfo = [] 
    … …  
    5959        self.dataQualityInfo = [] 
    6060        self.metadataMaintenance = None 
     61        self._contentInfo_md_featurecataloguedescription = [] 
    6162        self._contentInfo_md_coveragedescription = [] 
    62         self._contentInfo_md_featurecataloguedescription = [] 
    6363        self.hierarchyLevelName = [] 
     64        self._featureAttribute_gf_locationalattributetype = [] 
     65        self._featureAttribute_gf_metadataattributetype = [] 
     66        self._featureAttribute_gf_thematicattributetype = [] 
     67        self._featureAttribute_gf_temporalattributetype = [] 
    6468        self._featureAttribute_gf_spatialattributetype = [] 
    6569        self._featureAttribute_if_classificationattributetype = [] 
    66         self._featureAttribute_gf_thematicattributetype = [] 
    67         self._featureAttribute_gf_metadataattributetype = [] 
    68         self._featureAttribute_gf_locationalattributetype = [] 
    69         self._featureAttribute_gf_temporalattributetype = [] 
    7070        self.portrayalCatalogueInfo = [] 
    7171        self._series_ds_series = [] 
    … …  
    8484    def propertyType(self):      
    8585        ret = [] 
     86        for item in self._propertyType_gf_associationrole: 
     87            ret.append(item) 
     88        for item in self._propertyType_gf_operation: 
     89            ret.append(item) 
    8690        for item in self._propertyType_gf_attributetype: 
    87             ret.append(item) 
    88         for item in self._propertyType_gf_associationrole: 
    89             ret.append(item) 
    90         for item in self._propertyType_gf_operation: 
    9191            ret.append(item) 
    9292        return ret 
    … …  
    9595    def propertyType(self, value):       
    9696        if isinstance(value, list): 
    97             self._propertyType_gf_attributetype[:] 
    9897            self._propertyType_gf_associationrole[:] 
    9998            self._propertyType_gf_operation[:] 
    100             for item in value: 
    101                 valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     99            self._propertyType_gf_attributetype[:] 
     100            for item in value: 
     101                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     102                if valueClass == "ea_model.iso_19109_2005_application_schema.general_feature_model.gf_associationrole.GF_AssociationRole": 
     103                    self._propertyType_gf_associationrole.append(item) 
     104                    continue 
     105                if valueClass == "ea_model.iso_19109_2005_application_schema.general_feature_model.gf_operation.GF_Operation": 
     106                    self._propertyType_gf_operation.append(item) 
     107                    continue 
    102108                if valueClass == "ea_model.iso_19109_2005_application_schema.general_feature_model.gf_attributetype.GF_AttributeType": 
    103109                    self._propertyType_gf_attributetype.append(item) 
    104110                    continue 
    105                 if valueClass == "ea_model.iso_19109_2005_application_schema.general_feature_model.gf_associationrole.GF_AssociationRole": 
    106                     self._propertyType_gf_associationrole.append(item) 
    107                     continue 
    108                 if valueClass == "ea_model.iso_19109_2005_application_schema.general_feature_model.gf_operation.GF_Operation": 
    109                     self._propertyType_gf_operation.append(item) 
    110                     continue 
    111111 
    112112    @property 
    113113    def metadataConstraints(self):       
    114114        ret = [] 
     115        for item in self._metadataConstraints_md_legalconstraints: 
     116            ret.append(item) 
    115117        for item in self._metadataConstraints_md_securityconstraints: 
    116             ret.append(item) 
    117         for item in self._metadataConstraints_md_legalconstraints: 
    118118            ret.append(item) 
    119119        return ret 
    … …  
    122122    def metadataConstraints(self, value):        
    123123        if isinstance(value, list): 
     124            self._metadataConstraints_md_legalconstraints[:] 
    124125            self._metadataConstraints_md_securityconstraints[:] 
    125             self._metadataConstraints_md_legalconstraints[:] 
    126             for item in value: 
    127                 valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     126            for item in value: 
     127                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     128                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_legalconstraints.MD_LegalConstraints": 
     129                    self._metadataConstraints_md_legalconstraints.append(item) 
     130                    continue 
    128131                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_securityconstraints.MD_SecurityConstraints": 
    129132                    self._metadataConstraints_md_securityconstraints.append(item) 
    130133                    continue 
    131                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_legalconstraints.MD_LegalConstraints": 
    132                     self._metadataConstraints_md_legalconstraints.append(item) 
    133                     continue 
    134134 
    135135    @property 
    136136    def contentInfo(self):       
    137137        ret = [] 
     138        for item in self._contentInfo_md_featurecataloguedescription: 
     139            ret.append(item) 
    138140        for item in self._contentInfo_md_coveragedescription: 
    139             ret.append(item) 
    140         for item in self._contentInfo_md_featurecataloguedescription: 
    141141            ret.append(item) 
    142142        return ret 
    … …  
    145145    def contentInfo(self, value):        
    146146        if isinstance(value, list): 
     147            self._contentInfo_md_featurecataloguedescription[:] 
    147148            self._contentInfo_md_coveragedescription[:] 
    148             self._contentInfo_md_featurecataloguedescription[:] 
    149             for item in value: 
    150                 valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     149            for item in value: 
     150                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     151                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_featurecataloguedescription.MD_FeatureCatalogueDescription": 
     152                    self._contentInfo_md_featurecataloguedescription.append(item) 
     153                    continue 
    151154                if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_coveragedescription.MD_CoverageDescription": 
    152155                    self._contentInfo_md_coveragedescription.append(item) 
    153156                    continue 
    154                 if valueClass == "ea_model.iso_19115_2006_metadata_corrigendum.content_information.md_featurecataloguedescription.MD_FeatureCatalogueDescription": 
    155                     self._contentInfo_md_featurecataloguedescription.append(item) 
    156                     continue 
    157157 
    158158    @property 
    159159    def featureAttribute(self):  
    160160        ret = [] 
     161        for item in self._featureAttribute_gf_locationalattributetype: 
     162            ret.append(item) 
     163        for item in self._featureAttribute_gf_metadataattributetype: 
     164            ret.append(item) 
     165        for item in self._featureAttribute_gf_thematicattributetype: 
     166            ret.append(item) 
     167        for item in self._featureAttribute_gf_temporalattributetype: 
     168            ret.append(item) 
    161169        for item in self._featureAttribute_gf_spatialattributetype: 
    162170            ret.append(item)