updated gpn tests

adsabs · Dec 5, 2023 · 640526b · 640526b
1 parent dd167a6
commit 640526b
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 22 deletions.
diff --git a/adsmp/solr_updater.py b/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
 
@@ -35,18 +35,17 @@ def extract_data_pipeline(data, solrdoc):
         grant_facet_hier.extend(generate_hier_facet(agency, grant_no))
 
     gpn = []
-    gpn_ids = []
+    gpn_id = []
     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)
-
+        planet, feature, feature_name, id_no = x.split("/", 3)
+        gpn.append("/".join([planet, feature, feature_name]))
+        gpn_id.append(id_no)
         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])))
+        gpn_facet_hier_2level.extend(
+            generate_hier_facet(planet, "/".join([feature, feature_name]))
+        )
 
     simbid = []
     simbtype = []
@@ -96,10 +95,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,
+        gpn=gpn,
+        gpn_id=gpn_id,
+        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,

diff --git a/adsmp/tests/test_solr_updater.py b/adsmp/tests/test_solr_updater.py
@@ -663,33 +663,85 @@ def test_extract_data_pipeline(self):
             d["ned_object_facet_hier"],
         )
 
-        nonbib = {
-            "gpn": ["Moon/Crater/Langrenus/3273"]
-        }
+        # Test simple gpn
+        nonbib = {"gpn": ["Moon/Crater/Langrenus/3273"]}
         d = solr_updater.extract_data_pipeline(nonbib, None)
+        self.assertEqual(["Moon/Crater/Langrenus"], d["gpn"])
         self.assertEqual(["3273"], d["gpn_id"])
         self.assertEqual(
-            ['0/Moon', '1/Moon/Crater', '2/Moon/Crater/Langrenus'],
+            ["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"],
+        )
+
+        # Test gpn with space in feature name
+        nonbib = {"gpn": ["Mars/Terra/Terra Cimmeria/5930"]}
+        d = solr_updater.extract_data_pipeline(nonbib, None)
+        self.assertEqual(["Mars/Terra/Terra Cimmeria"], d["gpn"])
+        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/Moon', '1/Moon/Crater/Langrenus'],
+            ["0/Mars", "1/Mars/Terra/Terra Cimmeria"],
             d["gpn_facet_hier_2level"],
         )
 
+        # Test one bibcode with multiple gpns assigned
         nonbib = {
-            "gpn": ["Mars/Terra/Terra Cimmeria/5930"]
+            "gpn": [
+                "Moon/Mare/Mare Imbrium/3678",
+                "Moon/Crater/Alder/171",
+                "Moon/Crater/Finsen/1959",
+                "Moon/Crater/Leibnitz/3335",
+            ]
         }
         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'],
+            [
+                "Moon/Mare/Mare Imbrium",
+                "Moon/Crater/Alder",
+                "Moon/Crater/Finsen",
+                "Moon/Crater/Leibnitz",
+            ],
+            d["gpn"],
+        )
+        self.assertEqual(["3678", "171", "1959", "3335"], d["gpn_id"])
+        self.assertEqual(
+            [
+                "0/Moon",
+                "1/Moon/Mare",
+                "2/Moon/Mare/Mare Imbrium",
+                "0/Moon",
+                "1/Moon/Crater",
+                "2/Moon/Crater/Alder",
+                "0/Moon",
+                "1/Moon/Crater",
+                "2/Moon/Crater/Finsen",
+                "0/Moon",
+                "1/Moon/Crater",
+                "2/Moon/Crater/Leibnitz",
+            ],
             d["gpn_facet_hier_3level"],
         )
         self.assertEqual(
-            ['0/Mars', '1/Mars/Terra/Terra Cimmeria'],
+            [
+                "0/Moon",
+                "1/Moon/Mare/Mare Imbrium",
+                "0/Moon",
+                "1/Moon/Crater/Alder",
+                "0/Moon",
+                "1/Moon/Crater/Finsen",
+                "0/Moon",
+                "1/Moon/Crater/Leibnitz",
+            ],
             d["gpn_facet_hier_2level"],
         )
 
+
 if __name__ == "__main__":
     unittest.main()