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

Timestamp:

2019-03-07T22:47:07+13:00 (5 years ago)

Author:

davidb

Message:

Next round of changes, migrating from OAI imprint to what is needed for IIIF

File:

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

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

@@ -170 +170 @@
             //response.setContentType("text/xml;charset=UTF-8");
         //PrintWriter out = response.getWriter();
-
+        String result = "";
+        
         String[] pairs = new String[2];
         pairs[0] = "verb=GetRecord";
@@ -185 +186 @@
         Element xml_request = request_doc.createElement(GSXML.REQUEST_ELEM);
         // The type attribute is set to be 'oaiService' from OAIServer to OAIReceptionist.
-        ////xml_request.setAttribute(GSXML.TYPE_ATT, OAIXML.OAI_SERVICE);
+        ////xml_request.setAttribute(GSXML.TYPE_ATT, OAIXML.OAI_SERVICE); // ****
         //xml_request.setAttribute(GSXML.LANG_ATT, lang);
         xml_request.setAttribute(GSXML.TO_ATT, verb);
@@ -211 +212 @@
             if (res == null)
             {
-                logger.info("response element in xml_result is null");
-                verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
-            }
-            else
-            {
-                verb_elem = GSXML.getFirstElementChild(res);
+                logger.info("response element in xml_result is null");
+                verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
+            }
+            else {
+                System.err.println("*** res (verb_elem) = " + XMLConverter.getPrettyString(res));
+                
+                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
+
+                System.err.println("*** metadata_list_elem = " + XMLConverter.getPrettyString(metadata_list_elem));
+                String assocfilepath_metadata = GSXML.getMetadataValue(metadata_list_elem,"assocfilepath");
+                String image_metadata = GSXML.getMetadataValue(metadata_list_elem,"Image");
+                //Node assocfilepath_metadata_node = GSXML.getChildByTagName("assocfilepath");
+                //Node image_metadata_node = GSXML.getChildByTagName("Image");
+
+                result = assocfilepath_metadata + "/" + image_metadata;
             }
 
@@ -243 +255 @@
         */
         
-        return XMLConverter.getPrettyString(xml_response);
+        //return XMLConverter.getPrettyString(xml_response);
+        return result;
+        //return xml_response;
     }
 
@@ -264 +278 @@
             if (index != -1)
             { //just a double check
-              Element param = GSXML.createParameter(doc, pairs[i].substring(0, index), IIIFXML.oaiDecode(pairs[i].substring(index + 1)));
+              Element param = GSXML.createParameter(doc, pairs[i].substring(0, index), IIIFXML.iiifDecode(pairs[i].substring(index + 1)));
               request.appendChild(param);
             }