Issue153 (#154)

* fix #153 * note fix
smnorris · Dec 30, 2023 · c6a65b8 · c6a65b8
1 parent dc11f40
commit c6a65b8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,10 @@
 Changes
 =======
 
+0.9.1 ()
+------------------
+- fix problem with multiple-resource bcdc packages (#153)
+
 0.9.0 (2023-11-17)
 ------------------
 - use default pagesize provided by server and remove pagesize option from all functions and commands (#90)

diff --git a/bcdata/bcdc.py b/bcdata/bcdc.py
@@ -109,16 +109,25 @@ def get_table_definition(table_name):
                 # multiple format resource
                 elif resource["format"] == "multiple":
                     # if multiple format, check for table name match in this location
-                    if json.loads(resource["preview_info"])["layer_name"] == table_name:
-                        if "object_table_comments" in resource.keys():
-                            table_comments = resource["object_table_comments"]
-                        else:
-                            table_comments = None
-                        # only add to matches if schema details found
-                        if "details" in resource.keys() and resource["details"] != "":
-                            table_details = resource["details"]
-                            matches.append((notes, table_comments, table_details))
-                            log.debug(resource)
+                    if resource[
+                        "preview_info"
+                    ]:  # first check that the key is not empty
+                        if (
+                            json.loads(resource["preview_info"])["layer_name"]
+                            == table_name
+                        ):
+                            if "object_table_comments" in resource.keys():
+                                table_comments = resource["object_table_comments"]
+                            else:
+                                table_comments = None
+                            # only add to matches if schema details found
+                            if (
+                                "details" in resource.keys()
+                                and resource["details"] != ""
+                            ):
+                                table_details = resource["details"]
+                                matches.append((notes, table_comments, table_details))
+                                log.debug(resource)
 
         # uniquify the result
         if len(matches) > 0:

diff --git a/tests/test_bcdc.py b/tests/test_bcdc.py
@@ -40,3 +40,12 @@ def test_get_table_definition_format_multi():
     assert table_definition["description"]
     assert table_definition["comments"]
     assert table_definition["schema"]
+
+
+def test_get_table_definition_format_multi_nopreview():
+    table_definition = bcdc.get_table_definition(
+        "WHSE_BASEMAPPING.FWA_NAMED_POINT_FEATURES_SP"
+    )
+    assert table_definition["description"]
+    assert table_definition["comments"]
+    assert table_definition["schema"]