Changeset 27145 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Timestamp:
- 2013-03-28T14:01:26+13:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java
r26026 r27145 70 70 } 71 71 72 // get the format info - there may be global format info in the collection that searching needs 73 Element format_elem = getFormatInfo(to, userContext); 74 // set the format type 75 format_elem.setAttribute(GSXML.TYPE_ATT, "search"); 76 // for now just add to the response 77 page_response.appendChild(this.doc.importNode(format_elem, true)); 78 72 79 if (request_type.indexOf("d") != -1) 73 80 { … … 115 122 mr_query_request.appendChild(query_param_list); 116 123 117 // also get the format stuff now if there is some118 Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, userContext);119 mr_query_message.appendChild(format_request);120 121 124 logger.debug(GSXML.xmlNodeToString(mr_query_message)); 122 125 … … 133 136 } 134 137 135 NodeList responses = mr_query_response.getElementsByTagName(GSXML.RESPONSE_ELEM); 136 Element query_response = (Element) responses.item(0); 137 Element format_response = (Element) responses.item(1); 138 138 Element query_response = (Element) GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM); 139 139 Element query_result_metadata_list = (Element) GSXML.getChildByTagName(query_response, GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER); 140 140 if (query_result_metadata_list == null) … … 196 196 HashSet<String> metadata_names = new HashSet<String>(); 197 197 metadata_names.add("Title"); 198 // add in the format info to the stylesheet if there is any 199 Element format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM); 198 // we already got the format element earlier 200 199 if (format_elem != null) 201 200 { 202 Element global_format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.GLOBAL_FORMAT_ELEM); 203 if (global_format_elem != null) 204 { 205 GSXSLT.mergeFormatElements(format_elem, global_format_elem, false); 206 } 207 // set the format type 208 format_elem.setAttribute(GSXML.TYPE_ATT, "search"); 209 // for now just add to the response 210 page_response.appendChild(this.doc.importNode(format_elem, true)); 211 getRequiredMetadataNames(format_elem, metadata_names); 201 getRequiredMetadataNames(format_elem, metadata_names); 212 202 } 213 203
Note:
See TracChangeset
for help on using the changeset viewer.