Changeset 32883 for gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/util/IIIFXML.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/util/IIIFXML.java (modified) (6 diffs)

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

@@ -56 +56 @@
   // IIIF error codes
   public static final String ID_DOES_NOT_EXIST = "idDoesNotExist";
-
+  public static final String BAD_ARGUMENT      = "badArgument";
+  public static final String BAD_VERB          = "badVerb";
+    
   // General
   public static final String IIIF_PMH = "IIIF-PMH"; // ****
-    public static final String RESPONSE_DATE = "responseDate"; // ****
+    //public static final String RESPONSE_DATE = "responseDate"; // ****
   public static final String REQUEST = "request";
     
@@ -71 +73 @@
   public static final String METADATA = "metadata";
 
-    //public static final String OAIPMH = "OAIPMH"; // ****
-    
-    //public static final String OAI_SET_LIST = "oaiSetList"; // ****
-    //public static final String OAI_SERVICE_UNAVAILABLE = "OAI service unavailable";
-    public static final String OID = "OID"; // ****
+  public static final String OID = "OID"; // ****
     
   public static final String IIIF_SERVICE_RACK = "IIIFPMH";
-  //system-dependent file separator, maybe '/' or '\'
-  //public static final String FILE_SEPARATOR = File.separator;
-    //public static final String OAI_VERSION1 = "1.0";
-    //public static final String IIIF_VERSION2 = "2.1"; // ****
+
   /*************************above are final values****************************/
-    
-    
-  //initialized in getIIIFConfigXML()
+
   public static Element iiif_config_elem = null;
     
-    public static final String iiif_version = "2.1"; // ****
+  public static final String iiif_version = "2.1"; // ****
   public static String baseURL = "";
     
@@ -169 +162 @@
     GSXML.setNodeText(request_elem, baseURL);
       
-    //Node resp_date = GSXML.getChildByTagName(response, RESPONSE_DATE); // ****
-    
     return response;
   }
@@ -211 +202 @@
   }
 
-  // This is the response message sent when there's a request to activate/deactivate a non-OAI collection
-  // A request to activate a non-existent/non-OAI collection is not invalid, it's just that we won't process it.
+  // This is the response message sent when there's a request to activate/deactivate a non-IIIF collection
+  // A request to activate a non-existent/non-IIIF collection is not invalid, it's just that we won't process it.
   // So we still return status code OK (OK status code is needed for servercontrol.pm of activate.pl to recognise
   // that the command had been "successful" when it runs de/activate).
@@ -278 +269 @@
    *  escaped sequences (eg, '%3A'). 
    */
+    /*
     public static String iiifEncode(String original_str) { // ****
     logger.info("iiifEncode() " + original_str);      
@@ -287 +279 @@
     return original_str;  
   }
-
+    */
+    
   public static Element createResponseHeader(Document response_doc, String verb) {
-      //String tag_name = (iiif_version.equals(IIIF_VERSION2))? IIIF_PMH : verb; // ****
-      String tag_name = IIIF_PMH;
+    String tag_name = IIIF_PMH;
     Element iiif = response_doc.createElement(tag_name);
-    //Element resp_date = response_doc.createElement(RESPONSE_DATE); // ****
     Element req = response_doc.createElement(REQUEST);
-    //oai.appendChild(resp_date);
     iiif.appendChild(req);
 
     return iiif;
-  }
-
-    /*
-  public static Element createOAIIdentifierXML(Document doc, String repository_id, String sample_collection, String sample_doc_id) {
-    String xml = "<oai-identifier xmlns=\"http://www.openarchives.org/OAI/2.0/oai-identifier\"\n xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai-identifier\n http://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n <scheme>oai</scheme>\n<repositoryIdentifier>" + repository_id + "</repositoryIdentifier>\n<delimiter>:</delimiter>\n<sampleIdentifier>oai:"+repository_id+":"+sample_collection+":"+sample_doc_id+"</sampleIdentifier>\n</oai-identifier>";
-
-    Document xml_doc = converter.getDOM(xml);
-    return (Element)doc.importNode(xml_doc.getDocumentElement(), true);
-    
-
-  }
-    */
-
-    /*
-  public static Element createGSDLElement(Document doc) {
-    String xml = "<gsdl xmlns=\"http://www.greenstone.org/namespace/gsdl_oaiinfo/1.0/gsdl_oaiinfo\"\n xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n xsi:schemaLocation=\"http://www.greenstone.org/namespace/gsdl_oaiinfo/1.0/gsdl_oaiinfo\n   http://www.greenstone.org/namespace/gsdl_oaiinfo/1.0/gsdl_oaiinfo.xsd\"></gsdl>";
-    Document xml_doc = converter.getDOM(xml);
-    return (Element)doc.importNode(xml_doc.getDocumentElement(), true);    
-  }
-    */
-    
+  }    
 }