Merge e4ed76d into ecaa7ca

adsabs · Dec 28, 2023 · 4fb9023 · 4fb9023
2 parents ecaa7ca + e4ed76d
commit 4fb9023
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 1 deletion.
diff --git a/adsmp/solr_updater.py b/adsmp/solr_updater.py
@@ -59,6 +59,18 @@ def extract_data_pipeline(data, solrdoc):
             feature_name = " ".join([feature, feature_name])
         gpn_facet_hier_2level.extend(generate_hier_facet(planet, feature_name))
 
+    uat = []
+    uat_id = []
+    uat_facet_hier = []
+
+    for x in data.get("uat", []):
+        uat_info = x.split("/")
+        uat_keywords = uat_info[:-1]
+        uat_no = uat_info[-1]
+        uat.append("/".join(uat_keywords))
+        uat_id.append(uat_no)
+        uat_facet_hier.extend(generate_hier_facet(*uat_keywords))
+
     simbid = []
     simbtype = []
     simbad_object_facet_hier = []
@@ -111,6 +123,9 @@ def extract_data_pipeline(data, solrdoc):
         gpn_id=gpn_id,
         gpn_facet_hier_2level=gpn_facet_hier_2level,
         gpn_facet_hier_3level=gpn_facet_hier_3level,
+        uat=uat,
+        uat_id=uat_id,
+        uat_facet_hier=uat_facet_hier,
         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
@@ -742,6 +742,66 @@ def test_extract_data_pipeline(self):
             d["gpn_facet_hier_2level"],
         )
 
+        # Test uat
+        nonbib = {
+            "uat": [
+                "cosmology/origin of the universe/early universe/recombination (cosmology)/cosmic background radiation/cosmic microwave background radiation/322",
+                "cosmology/origin of the universe/big bang theory/recombination (cosmology)/cosmic background radiation/cosmic microwave background radiation/322",
+                "observational astronomy/astronomical methods/radio astronomy/cosmic noise/cosmic background radiation/cosmic microwave background radiation/322",
+                "cosmology/astronomical radiation sources/radio sources/radio continuum emission/5",
+                "interstellar medium/interstellar emissions/radio continuum emission/5",
+                "stellar astronomy/stellar types/stellar evolutionary types/evolved stars/subgiant stars/1646",
+            ]
+        }
+        d = solr_updater.extract_data_pipeline(nonbib, None)
+        self.assertEqual(
+            [
+                "cosmology/origin of the universe/early universe/recombination (cosmology)/cosmic background radiation/cosmic microwave background radiation",
+                "cosmology/origin of the universe/big bang theory/recombination (cosmology)/cosmic background radiation/cosmic microwave background radiation",
+                "observational astronomy/astronomical methods/radio astronomy/cosmic noise/cosmic background radiation/cosmic microwave background radiation",
+                "cosmology/astronomical radiation sources/radio sources/radio continuum emission",
+                "interstellar medium/interstellar emissions/radio continuum emission",
+                "stellar astronomy/stellar types/stellar evolutionary types/evolved stars/subgiant stars",
+            ],
+            d["uat"],
+        )
+        self.assertEqual(["322", "322", "322", "5", "5", "1646"], d["uat_id"])
+        self.assertEqual(
+            [
+                "0/cosmology",
+                "1/cosmology/origin of the universe",
+                "2/cosmology/origin of the universe/early universe",
+                "3/cosmology/origin of the universe/early universe/recombination (cosmology)",
+                "4/cosmology/origin of the universe/early universe/recombination (cosmology)/cosmic background radiation",
+                "5/cosmology/origin of the universe/early universe/recombination (cosmology)/cosmic background radiation/cosmic microwave background radiation",
+                "0/cosmology",
+                "1/cosmology/origin of the universe",
+                "2/cosmology/origin of the universe/big bang theory",
+                "3/cosmology/origin of the universe/big bang theory/recombination (cosmology)",
+                "4/cosmology/origin of the universe/big bang theory/recombination (cosmology)/cosmic background radiation",
+                "5/cosmology/origin of the universe/big bang theory/recombination (cosmology)/cosmic background radiation/cosmic microwave background radiation",
+                "0/observational astronomy",
+                "1/observational astronomy/astronomical methods",
+                "2/observational astronomy/astronomical methods/radio astronomy",
+                "3/observational astronomy/astronomical methods/radio astronomy/cosmic noise",
+                "4/observational astronomy/astronomical methods/radio astronomy/cosmic noise/cosmic background radiation",
+                "5/observational astronomy/astronomical methods/radio astronomy/cosmic noise/cosmic background radiation/cosmic microwave background radiation",
+                "0/cosmology",
+                "1/cosmology/astronomical radiation sources",
+                "2/cosmology/astronomical radiation sources/radio sources",
+                "3/cosmology/astronomical radiation sources/radio sources/radio continuum emission",
+                "0/interstellar medium",
+                "1/interstellar medium/interstellar emissions",
+                "2/interstellar medium/interstellar emissions/radio continuum emission",
+                "0/stellar astronomy",
+                "1/stellar astronomy/stellar types",
+                "2/stellar astronomy/stellar types/stellar evolutionary types",
+                "3/stellar astronomy/stellar types/stellar evolutionary types/evolved stars",
+                "4/stellar astronomy/stellar types/stellar evolutionary types/evolved stars/subgiant stars",
+            ],
+            d["uat_facet_hier"],
+        )
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-adsputils==1.5.1
+adsputils==1.5.2
 alembic==0.9.1
 httplib2==0.18.1
 portalocker==1.7.1