Changeset 32883 for gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/core/IIIFReceptionist.java
- Timestamp:
- 2019-03-08T11:40:31+13:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/core/IIIFReceptionist.java
r32860 r32883 136 136 if (!message.getTagName().equals(GSXML.MESSAGE_ELEM)) { 137 137 logger.error(" Invalid message. GSDL message should start with <"+GSXML.MESSAGE_ELEM+">, instead it starts with:"+message.getTagName()+"."); 138 return IIIFXML.createErrorMessage( OAIXML.BAD_ARGUMENT, "Internal messaging error");138 return IIIFXML.createErrorMessage(IIIFXML.BAD_ARGUMENT, "Internal messaging error"); 139 139 } 140 140 … … 143 143 if (request == null) { 144 144 logger.error(" message had no request!"); 145 return IIIFXML.createErrorMessage( OAIXML.BAD_ARGUMENT, "Internal messaging error");145 return IIIFXML.createErrorMessage(IIIFXML.BAD_ARGUMENT, "Internal messaging error"); 146 146 } 147 147 … … 150 150 if (!reset.equals("")) { 151 151 resetMessageRouter(); 152 // configureSetInfo(); // ****153 152 return IIIFXML.createResetResponse(true); 154 153 } … … 156 155 157 156 //At this stage, the value of 'to' attribute of the request must be the 'verb' 158 //The only thing that the oaireceptionist can be sure is that these verbs are valid, nothing else.157 //The only thing that the iiif receptionist can be sure is that these verbs are valid, nothing else. 159 158 String verb = request.getAttribute(GSXML.TO_ATT); 160 159 161 if (verb.equals( OAIXML.GET_RECORD)) {160 if (verb.equals(IIIFXML.GET_RECORD)) { 162 161 return doGetRecord(request); 163 162 } 164 163 165 164 // should never get here as verbs were checked in IIIFServerBridge 166 return IIIFXML.createErrorMessage( OAIXML.BAD_VERB, "Unexpected things happened");165 return IIIFXML.createErrorMessage(IIIFXML.BAD_VERB, "Unexpected things happened"); 167 166 168 167 } … … 174 173 Element get_record = doc.createElement(IIIFXML.GET_RECORD); 175 174 176 HashSet<String> valid_strs = new HashSet<String>();177 valid_strs.add(OAIXML.IDENTIFIER);178 valid_strs.add(OAIXML.METADATA_PREFIX);175 //HashSet<String> valid_strs = new HashSet<String>(); // **** 176 //valid_strs.add(IIIFXML.IDENTIFIER); 177 //valid_strs.add(IIIFXML.METADATA_PREFIX); 179 178 180 179 NodeList params = GSXML.getChildrenByTagName(req, GSXML.PARAM_ELEM); 181 180 HashMap<String, String> param_map = GSXML.getParamMap(params); 182 181 183 // Any need to check all params are valid, like OAI?? 184 185 String identifier = param_map.get( OAIXML.IDENTIFIER);182 // Any need to check all params are valid, like OAI?? // **** 183 184 String identifier = param_map.get(IIIFXML.IDENTIFIER); 186 185 187 186 // get the names … … 189 188 if(strs == null || strs.length < 2) { 190 189 logger.error("identifier is not in the form coll:id" + identifier); 191 return OAIXML.createErrorMessage(OAIXML.ID_DOES_NOT_EXIST, "");190 return IIIFXML.createErrorMessage(IIIFXML.ID_DOES_NOT_EXIST, ""); 192 191 } 193 192 String coll_name = strs[0]; … … 199 198 req.setAttribute(GSXML.TO_ATT, coll_name + "/" + verb); 200 199 // reset the identifier element 201 Element param = GSXML.getNamedElement(req, GSXML.PARAM_ELEM, GSXML.NAME_ATT, OAIXML.IDENTIFIER);200 Element param = GSXML.getNamedElement(req, GSXML.PARAM_ELEM, GSXML.NAME_ATT, IIIFXML.IDENTIFIER); 202 201 if (param != null) { 203 param.setAttribute(GSXML.NAME_ATT, OAIXML.OID);202 param.setAttribute(GSXML.NAME_ATT, IIIFXML.OID); 204 203 param.setAttribute(GSXML.VALUE_ATT, oid); 205 204 }
Note:
See TracChangeset
for help on using the changeset viewer.