Changeset 32891 for gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java

Timestamp:

2019-03-11T09:37:51+13:00 (5 years ago)

Author:

davidb

Message:

Additional error checking

File:

• gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java (modified) (3 diffs)

gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java

@@ -171 +171 @@
         Document response_doc = XMLConverter.newDOM();
         //Element xml_response = IIIFXML.createBasicResponse(response_doc, verb, pairs);
-        Element verb_elem = null;
+        //Element verb_elem = null;
         
         // compose the request message to the receptionist
@@ -185 +185 @@
         if (xml_result == null)
         {
-            logger.info("xml_result is null");
-            verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
+            logger.error("xml_result is null");
+            //verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
             //xml_response.appendChild(verb_elem);
         }
@@ -199 +199 @@
             if (res == null)
             {
-                logger.info("response element in xml_result is null");
-                verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
+                logger.error("response element in xml_result is null");
+                //verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
             }
             else {
-                verb_elem = GSXML.getFirstElementChild(res); // GetRecord
+                Element verb_elem = GSXML.getFirstElementChild(res); // GetRecord
                 Node record_node = GSXML.getFirstElementChild(verb_elem); // record
                 Element metadata_list_elem = (Element)GSXML.getChildByTagName(record_node,"metadata"); // metadata
 
                 Element assocfilepath_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"assocfilepath");
-                String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem);
-
-                Element image_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"Image");
-                String image_metadata_val = GSXML.getNodeText(image_metadata_elem);
-
-                result = assocfilepath_metadata_val + "/" + image_metadata_val;
+
+                if (assocfilepath_metadata_elem == null) {
+                logger.error("Failed to find metadata 'assocfilepath' for Document " + identifier);
+                //verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
+                }
+                else {
+                String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem);
+
+                Element image_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"Image");
+                if (assocfilepath_metadata_elem == null) {
+                    logger.error("Failed to find metadata 'Image' for Document " + identifier);
+                }
+                else {
+                    String image_metadata_val = GSXML.getNodeText(image_metadata_elem);
+
+                    result = assocfilepath_metadata_val + "/" + image_metadata_val;
+                }
+                }
             }