diff --git a/lib/mappers/esdn_mapper.py b/lib/mappers/esdn_mapper.py index aa6a7b4c..81f7f006 100644 --- a/lib/mappers/esdn_mapper.py +++ b/lib/mappers/esdn_mapper.py @@ -273,10 +273,15 @@ def map_relation(self): def map_rights(self): prop = self.root_key + "accessCondition" rights = [] + edm_rights = None if exists(self.provider_data, prop): for right in iterify(getprop(self.provider_data, prop)): if isinstance(right, dict): - rights.append(right.get("#text")) + _type = getprop(right, "type", True) + if _type and _type == "use and reproduction": + edm_rights = right.get("xlink:href") + else: + rights.append(right.get("#text")) elif isinstance(right, list): for r in right: rights.append(r) @@ -284,6 +289,12 @@ def map_rights(self): rights.append(right) if rights: self.update_source_resource({"rights": rights}) + if edm_rights: + self.mapped_data.update({"rights": edm_rights}) + + def map_edm_rights(self): + # defer to map_rights for edm:rights implementation + pass def map_subject_and_spatial_and_temporal(self): prop = self.root_key + "subject" diff --git a/profiles/esdn.pjs b/profiles/esdn.pjs index e585eda3..b1be3502 100644 --- a/profiles/esdn.pjs +++ b/profiles/esdn.pjs @@ -21,7 +21,6 @@ "HarrisonDigital", "newburgh", "hrvi", - "wp", "cornpl", "fdr", "pipc", diff --git a/profiles/maryland.pjs b/profiles/maryland.pjs index 866d1ac7..c606676c 100644 --- a/profiles/maryland.pjs +++ b/profiles/maryland.pjs @@ -2,7 +2,7 @@ "name": "maryland", "type": "oai_verbs", "metadata_prefix": "oai_qdc", - "endpoint_url": "http://webconfig.digitalmaryland.org/oai/oai.php", + "endpoint_url": "http://collections.digitalmaryland.org/oai/oai.php", "contributor": { "@id": "http://dp.la/api/contributor/maryland", "name": "Digital Maryland" diff --git a/setup.py b/setup.py index fa683948..8f5d9397 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from distutils.core import setup setup( name = 'ingestion', - version = '33.11.1', + version = '33.11.2', description='DPLA Ingestion System', author='Digital Public Library of America', author_email='tech@dp.la',