Added planetary names (gpn and gpn_id) to extract_data_pipeline

.gitignore

@@ -111,3 +111,7 @@ local_config.py
 .pre-commit-config.yaml
 
 .idea/
+
+Dockerfile
+docker-compose.yaml
+scripts/support/*

adsmp/solr_updater.py

@@ -2,7 +2,7 @@
 import os
 import sys
 import time
-
+import pdb
 import requests
 from adsputils import date2solrstamp, load_config, setup_logging
 
@@ -34,6 +34,20 @@ def extract_data_pipeline(data, solrdoc):
         grant.append(grant_no)
         grant_facet_hier.extend(generate_hier_facet(agency, grant_no))
 
+    gpn = []
+    gpn_ids = []
+    gpn_facet_hier_2level = []
+    gpn_facet_hier_3level = []
+    for x in data.get("gpn", []):
+        planet, feature, feature_name, gpn_id = x.split("/", 3)
+        gpn.append(planet)
+        gpn.append(feature)
+        gpn.append(feature_name)
+        gpn_ids.append(gpn_id)
+
+        gpn_facet_hier_3level.extend(generate_hier_facet(planet, feature, feature_name))
+        gpn_facet_hier_2level.extend(generate_hier_facet(planet, "/".join([feature, feature_name])))
+
     simbid = []
     simbtype = []
     simbad_object_facet_hier = []
@@ -82,6 +96,10 @@ def extract_data_pipeline(data, solrdoc):
         data_facet=[x.split(":")[0] for x in data.get("data", [])],
         esources=data.get("esource", []),
         property=data.get("property", []),
+        gpn = gpn,
+        gpn_id = gpn_ids,
+        gpn_facet_hier_2level = gpn_facet_hier_2level,
+        gpn_facet_hier_3level = gpn_facet_hier_3level,
         grant=grant,
         grant_facet_hier=grant_facet_hier,
         simbid=simbid,

adsmp/tests/test_solr_updater.py

@@ -663,6 +663,33 @@ def test_extract_data_pipeline(self):
             d["ned_object_facet_hier"],
         )
 
+        nonbib = {
+            "gpn": ["Moon/Crater/Langrenus/3273"]
+        }
+        d = solr_updater.extract_data_pipeline(nonbib, None)
+        self.assertEqual(["3273"], d["gpn_id"])
+        self.assertEqual(
+            ['0/Moon', '1/Moon/Crater', '2/Moon/Crater/Langrenus'],
+            d["gpn_facet_hier_3level"],
+        )
+        self.assertEqual(
+            ['0/Moon', '1/Moon/Crater/Langrenus'],
+            d["gpn_facet_hier_2level"],
+        )
+
+        nonbib = {
+            "gpn": ["Mars/Terra/Terra Cimmeria/5930"]
+        }
+        d = solr_updater.extract_data_pipeline(nonbib, None)
+        self.assertEqual(["5930"], d["gpn_id"])
+        self.assertEqual(
+            ['0/Mars', '1/Mars/Terra', '2/Mars/Terra/Terra Cimmeria'],
+            d["gpn_facet_hier_3level"],
+        )
+        self.assertEqual(
+            ['0/Mars', '1/Mars/Terra/Terra Cimmeria'],
+            d["gpn_facet_hier_2level"],
+        )
 
 if __name__ == "__main__":
     unittest.main()

requirements.txt

@@ -1,4 +1,4 @@
-adsputils==1.3.0
+adsputils==1.5.1
 alembic==0.9.1
 httplib2==0.18.1
 portalocker==1.7.1