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

Timestamp:

2019-03-08T11:40:31+13:00 (5 years ago)

Author:

davidb

Message:

Code tidy up

File:

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

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

@@ -86 +86 @@
     }
 
-    /**
-     * initialise the class
-     */
+    /**
+     * initialise the class
+     */
     public void init(String site_name) throws UnavailableException, Exception
     {
-        ////GlobalProperties.loadGlobalProperties(config.getServletContext().getRealPath(""));
-            
         org.greenstone.util.GlobalProperties.loadGlobalProperties("");
-        //org.greenstone.util.GlobalProperties.loadGlobalProperties(config.getServletContext().getRealPath(""));
-        //org.greenstone.util.GlobalProperties.loadGlobalProperties("/home/osboxes/research/code/greenstone3-svn/web");
         java.io.InputStream in = Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties");
 
-        //String gsdl3_writablehome = System.getProperty("gsdl3.writablehome");
         String tomcat_context = System.getProperty("tomcat.context");
-        System.err.println("*** in = " + in);
-        //System.err.println("*** gsdl3.writablehome = " + gsdl3_writablehome);
-        System.err.println("*** tomcat.context = " + tomcat_context);
         
         // the receptionist -the servlet will talk to this
@@ -121 +113 @@
     } // end of init()
 
+    /*
+      Written but never used/tested
+    */
+    
         public void remote_init(String remote_site_name, String remote_site_type, String remote_site_address) throws UnavailableException
         { 
@@ -166 +162 @@
         public String doGetDocumentMessage(String identifier)
     {
-        // oai always requires the content type be text/xml
-        //request.setCharacterEncoding("UTF-8");
-            //response.setContentType("text/xml;charset=UTF-8");
-        //PrintWriter out = response.getWriter();
         String result = "";
         
@@ -178 +170 @@
         String verb = "GetRecord";
         Document response_doc = XMLConverter.newDOM();
-        Element xml_response = IIIFXML.createBasicResponse(response_doc, verb, pairs);
+        //Element xml_response = IIIFXML.createBasicResponse(response_doc, verb, pairs);
         Element verb_elem = null;
         
@@ -185 +177 @@
         Element xml_message = request_doc.createElement(GSXML.MESSAGE_ELEM);
         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.LANG_ATT, lang);
         xml_request.setAttribute(GSXML.TO_ATT, verb);
         addParams(xml_request, pairs);
 
-        //xml_request.setAttribute(GSXML.OUTPUT_ATT, output);????
         xml_message.appendChild(xml_request);
 
@@ -199 +187 @@
             logger.info("xml_result is null");
             verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");
-            xml_response.appendChild(verb_elem);
+            //xml_response.appendChild(verb_elem);
         }
         else
@@ -206 +194 @@
             //
             // All response elements are in the form (with a corresponding verb
-            // name): <message> <response> <verb> ... <resumptionToken> .. this
-            // is optional! </resumptionToken> </verb> </response> </message>
+            // name): <message> <response> <verb> ... </verb> </response> </message>
             //
             Node res = GSXML.getChildByTagName(xml_result, GSXML.RESPONSE_ELEM);
@@ -216 +203 @@
             }
             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));
-
                 Element assocfilepath_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"assocfilepath");
                 String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem);
@@ -233 +216 @@
             }
 
-            // ******
-            xml_response.appendChild(response_doc.importNode(verb_elem, true));
-            /*
-            if ( verb_elem.getTagName().equals(IIIFXML.ERROR))
-            {
-              xml_response.appendChild(response_doc.importNode(verb_elem, true));
-            }
-            else if (IIIFXML.iiif_version.equals(IIIFXML.IIIF_VERSION2)) {
-              xml_response.appendChild(response_doc.importNode(verb_elem, true));
-            }
-            else
-            {
-                GSXML.copyAllChildren(xml_response, verb_elem);
-                }*/
-        }
-        /*
-        out.println("<?xml version='1.0' encoding='UTF-8' ?>");
-        if (this.use_oai_stylesheet)
-        {
-            out.println("<?xml-stylesheet type='text/xsl' href='" + this.oai_stylesheet + "' ?>\n");
-        }
-        out.println(XMLConverter.getPrettyString(xml_response));
-        */
-        
-        //return XMLConverter.getPrettyString(xml_response);
+            //xml_response.appendChild(response_doc.importNode(verb_elem, true));
+        }
         return result;
-        //return xml_response;
     }