Changeset 32891
- Timestamp:
- 2019-03-11T09:37:51+13:00 (5 years ago)
- Location:
- gs3-extensions/iiif-servlet/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java
r32883 r32891 171 171 Document response_doc = XMLConverter.newDOM(); 172 172 //Element xml_response = IIIFXML.createBasicResponse(response_doc, verb, pairs); 173 Element verb_elem = null;173 //Element verb_elem = null; 174 174 175 175 // compose the request message to the receptionist … … 185 185 if (xml_result == null) 186 186 { 187 logger. info("xml_result is null");188 verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");187 logger.error("xml_result is null"); 188 //verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", ""); 189 189 //xml_response.appendChild(verb_elem); 190 190 } … … 199 199 if (res == null) 200 200 { 201 logger. info("response element in xml_result is null");202 verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", "");201 logger.error("response element in xml_result is null"); 202 //verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", ""); 203 203 } 204 204 else { 205 verb_elem = GSXML.getFirstElementChild(res); // GetRecord205 Element verb_elem = GSXML.getFirstElementChild(res); // GetRecord 206 206 Node record_node = GSXML.getFirstElementChild(verb_elem); // record 207 207 Element metadata_list_elem = (Element)GSXML.getChildByTagName(record_node,"metadata"); // metadata 208 208 209 209 Element assocfilepath_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"assocfilepath"); 210 String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem); 211 212 Element image_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"Image"); 213 String image_metadata_val = GSXML.getNodeText(image_metadata_elem); 214 215 result = assocfilepath_metadata_val + "/" + image_metadata_val; 210 211 if (assocfilepath_metadata_elem == null) { 212 logger.error("Failed to find metadata 'assocfilepath' for Document " + identifier); 213 //verb_elem = IIIFXML.createErrorElement(response_doc, "Internal error", ""); 214 } 215 else { 216 String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem); 217 218 Element image_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"Image"); 219 if (assocfilepath_metadata_elem == null) { 220 logger.error("Failed to find metadata 'Image' for Document " + identifier); 221 } 222 else { 223 String image_metadata_val = GSXML.getNodeText(image_metadata_elem); 224 225 result = assocfilepath_metadata_val + "/" + image_metadata_val; 226 } 227 } 216 228 } 217 229 -
gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/GSInformationResource.java
r32886 r32891 91 91 final Identifier identifier_image = IdentifierToGSAssocfile.createIdentifierImage(identifier); 92 92 final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy()); 93 /*94 String identifier_str = identifier.toString();95 String[] strs = identifier_str.split(":", 3);96 if(strs == null || strs.length < 3) {97 System.err.println("identifier is not in the form site:coll:id" + identifier_str);98 return null;99 }100 String site_name = strs[0];101 String coll_name = strs[1];102 String doc_id = strs[2];103 104 // Move into Constructor, ,and keep hashmap ???105 IIIFServerBridge gs_iiif_bridge = new IIIFServerBridge();106 gs_iiif_bridge.init(site_name);107 String collect_image_filename = gs_iiif_bridge.doGetDocumentMessage(coll_name + ":" + doc_id);108 String site_image_filename = site_name + "/collect/" + coll_name + "/index/assoc/" + collect_image_filename;109 110 //System.err.println("**** gs_message = " + XMLConverter.getPrettyString(gs_message_elem));111 System.err.println("**** Greenstone site image filename = " + site_image_filename);112 113 final Identifier identifier_image = new Identifier(site_image_filename);114 115 //final Source source = new SourceFactory().newSource(identifier, getDelegateProxy());116 final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy());117 118 System.err.println("***** identifier_image = " + identifier_image);119 System.err.println("***** source path = " + ((edu.illinois.library.cantaloupe.source.FileSource)source).getPath());120 */121 93 122 94 // If we are resolving first, or if the source image is not present in -
gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/IdentifierToGSAssocfile.java
r32886 r32891 43 43 public static Identifier createIdentifierImage(Identifier identifier) throws Exception 44 44 { 45 Identifier identifier_image = null; 46 45 47 String identifier_str = identifier.toString(); 46 48 String[] strs = identifier_str.split(":", 3); … … 59 61 60 62 String collect_image_filename = gs_iiif_bridge.doGetDocumentMessage(coll_name + ":" + doc_id); 61 String site_image_filename = site_name + "/collect/" + coll_name + "/index/assoc/" + collect_image_filename;62 63 //System.err.println("**** Greenstone site image filename = " + site_image_filename);64 63 65 final Identifier identifier_image = new Identifier(site_image_filename); 66 //System.err.println("***** identifier_image = " + identifier_image); 64 if (collect_image_filename != null) { 65 String site_image_filename = site_name + "/collect/" + coll_name + "/index/assoc/" + collect_image_filename; 66 67 identifier_image = new Identifier(site_image_filename); 68 } 67 69 68 70
Note:
See TracChangeset
for help on using the changeset viewer.