Merge branch 'release-v33.2.2'

dpla-attic · Apr 3, 2015 · 5dc444e · 5dc444e
2 parents e50e046 + 0641341
commit 5dc444e
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 22 deletions.
diff --git a/lib/fetchers/absolute_url_fetcher.py b/lib/fetchers/absolute_url_fetcher.py
@@ -124,9 +124,11 @@ def fetch_all_data(self, set_id=None):
                                                  set_id=set_id):
                         if error is not None:
                             self.response["errors"].extend(iterify(error))
-                        self.add_provider_to_item_records(records)
-                        self.add_collection_to_item_records(set_id, records)
-                        self.response["records"].extend(records)
+                        if records:
+                            self.add_provider_to_item_records(records)
+                            self.add_collection_to_item_records(set_id,
+                                                                records)
+                            self.response["records"].extend(records)
                         if len(self.response["records"]) >= self.batch_size:
                             yield self.response
                             self.reset_response()

diff --git a/lib/fetchers/getty_fetcher.py b/lib/fetchers/getty_fetcher.py
@@ -8,9 +8,9 @@ def __init__(self, profile, uri_base, config_file):
     def get_collection_for_record(self, record):
         source_id = getprop(record, self.root_key + "control/sourceid")
         if  source_id == "GETTY_OCP":
-            coll_title = getprop(record, self.root_key + "display/lds31")
+            coll_title = getprop(record, self.root_key + "display/lds43")
         elif source_id == "GETTY_ROSETTA":
-            coll_title = getprop(record, self.root_key + "display/lds32")
+            coll_title = getprop(record, self.root_key + "display/lds34")
         else:
             coll_title = None
 

diff --git a/lib/mappers/mwdl_mapper.py b/lib/mappers/mwdl_mapper.py
@@ -99,3 +99,10 @@ def map_data_provider(self):
             [dp.append(v) for v in iterify(values) if v not in dp]
 
             self.mapped_data.update({"dataProvider": "; ".join(dp)})
+
+    def map_intermediate_provider(self):
+        prop = self.root_key + "search/lsr10"
+        value = getprop(self.provider_data, prop, True)
+        if value == "Montana Memory Project" \
+                or value == "Arizona Memory Project":
+            self.mapped_data.update({"intermediateProvider": value})
diff --git a/profiles/artstor.pjs b/profiles/artstor.pjs
@@ -17,6 +17,7 @@
         "SSDelwarePostcard",
         "SSDelwareBookplate",
         "SSDelwareStewart",
+        "SSDelwareDonovan",
         "DPLADallas",
         "DPLAIndiana",
         "DPLAKress",
@@ -25,18 +26,27 @@
         "DPLAYaleArt"
     ],
     "set_params": {
-        "SSDPLAWashington": {"frm": "2013-09-13"},
-        "SSDelwareAtlas": {"frm": "2013-10-15"},
-        "SSDelwareGeorge": {"frm": "2013-10-15"},
-        "SSDelwareHistoric": {"frm": "2013-10-15"},
-        "SSDelwareIncorporated1968": {"frm": "2013-10-15"},
-        "SSDelwareIncorporated1959": {"frm": "2013-10-15"},
-        "SSDelwareIncorporated1989": {"frm": "2013-10-15"},
-        "SSDelwareRosenthal": {"frm": "2013-10-15"},
-        "SSDelwarePostcard": {"frm": "2013-10-15"},
-        "SSDelwareBookplate": {"frm": "2013-10-15"},
-        "SSDelwareStewart": {"frm": "2013-10-15"},
-        "DPLADallas": {"frm": "2013-03-16"}
+        "SSDPLABrynMawr": {"frm": "2015-01-04"},
+        "SSDPLACornell": {"frm": "2015-01-04"},
+        "SSDPLAUCSD": {"frm": "2015-01-04"},
+        "SSDPLAWashington": {"frm": "2015-01-04"},
+        "SSDelwareAtlas": {"frm": "2015-01-04"},
+        "SSDelwareGeorge": {"frm": "2015-01-04"},
+        "SSDelwareHistoric": {"frm": "2015-01-04"},
+        "SSDelwareIncorporated1968": {"frm": "2015-01-04"},
+        "SSDelwareIncorporated1959": {"frm": "2015-01-04"},
+        "SSDelwareIncorporated1989": {"frm": "2015-01-04"},
+        "SSDelwareRosenthal": {"frm": "2015-01-04"},
+        "SSDelwarePostcard": {"frm": "2015-01-04"},
+        "SSDelwareBookplate": {"frm": "2015-01-04"},
+        "SSDelwareStewart": {"frm": "2015-01-04"},
+        "SSDelwareDonovan": {"frm": "2015-01-04"},
+        "DPLADallas": {"frm": "2015-01-04"},
+        "DPLAIndiana": {"frm": "2015-01-04"},
+        "DPLAKress": {"frm": "2015-01-04"},
+        "DPLAYCBA": {"frm": "2015-01-04"},
+        "DPLAWalters": {"frm": "2015-01-04"},
+        "DPLAYaleArt": {"frm": "2015-01-04"}
     },
     "contributor": {
         "@id": "http://dp.la/api/contributor/artstor", 

diff --git a/profiles/gpo.pjs b/profiles/gpo.pjs
@@ -6,7 +6,7 @@
     "sets": [],
     "contributor": {
         "@id": "http://dp.la/api/contributor/gpo",
-        "name": "United States Government Printing Office (GPO)"
+        "name": "United States Government Publishing Office (GPO)"
     },
     "enrichments_coll": [
         "/set_context",

diff --git a/profiles/hathi.pjs b/profiles/hathi.pjs
@@ -1,10 +1,10 @@
 {
     "name": "hathitrust", 
     "type": "hathi",
-    "endpoint_url": "file:/home/dpla/data/hathi/",
+    "endpoint_url": "file:/v1/provider-data/hathi/",
     "contributor": {
         "@id": "http://dp.la/api/contributor/hathitrust", 
-        "name": "HathiTrust Digital Library"
+        "name": "HathiTrust"
     }, 
     "enrichments_coll": [
         "/set_context",

diff --git a/profiles/ia.pjs b/profiles/ia.pjs
@@ -38,6 +38,12 @@
         },
         "yivoinstitutelibrary": {
             "title": "YIVO Institute Library"
+        },
+        "guggenheimlibrary": {
+            "title": "Guggenheim Library"
+        },
+        "lbiperiodicals": {
+            "title": "Leo Baeck Institute Library at the Center for Jewish History"
         }
     },
     "contributor": {

diff --git a/profiles/smithsonian.pjs b/profiles/smithsonian.pjs
@@ -1,7 +1,7 @@
 {
     "name": "smithsonian",
     "type": "edan",
-    "endpoint_url": "file:/home/dpla/data/smithsonian/",
+    "endpoint_url": "file:/v1/provider-data/smithsonian/",
     "contributor": {
         "@id": "http://dp.la/api/contributor/smithsonian",
         "name": "Smithsonian Institution"

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
 from distutils.core import setup
 
 setup( name = 'ingestion',
-       version = '33.2.1',
+       version = '33.2.2',
        description='DPLA Ingestion System',
        author='Digital Public Library of America',
        author_email='tech@dp.la',