- Timestamp:
- 2011-12-13T10:01:05+13:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java
r24813 r24889 186 186 boolean get_structure = false; 187 187 boolean get_structure_info = false; 188 if (document_type.equals( "paged"))188 if (document_type.equals(GSXML.DOC_TYPE_PAGED)) 189 189 { 190 190 get_structure_info = true; 191 192 if (expand_contents) 193 { 194 ds_param = this.doc.createElement(GSXML.PARAM_ELEM); 195 ds_param_list.appendChild(ds_param); 196 ds_param.setAttribute(GSXML.NAME_ATT, "structure"); 197 ds_param.setAttribute(GSXML.VALUE_ATT, "entire"); 198 } 199 191 200 // get teh info needed for paged naviagtion 192 201 ds_param = this.doc.createElement(GSXML.PARAM_ELEM); … … 203 212 ds_param.setAttribute(GSXML.VALUE_ATT, "siblingPosition"); 204 213 205 } 206 else if (document_type.equals("hierarchy")) 214 if (get_siblings) 215 { 216 ds_param = this.doc.createElement(GSXML.PARAM_ELEM); 217 ds_param_list.appendChild(ds_param); 218 ds_param.setAttribute(GSXML.NAME_ATT, "structure"); 219 ds_param.setAttribute(GSXML.VALUE_ATT, "siblings"); 220 } 221 222 } 223 else if (document_type.equals(GSXML.DOC_TYPE_HIERARCHY)) 207 224 { 208 225 get_structure = true; … … 330 347 if (format_elem != null) 331 348 { 332 extractMetadataNames(format_elem, meta_names);349 getRequiredMetadataNames(format_elem, meta_names); 333 350 } 334 351 … … 391 408 } 392 409 doc_list.appendChild(doc_node); 410 393 411 Element dm_response_message = (Element) this.mr.process(dm_message); 394 412 if (processErrorElements(dm_response_message, page_response)) … … 671 689 * ends in query). should this action do the query or should it send a 672 690 * message to the query action? but that will involve lots of extra stuff. 673 * also doesn't handle phrases properly - just highlights all the terms found674 * in the text.691 * also doesn't handle phrases properly - just highlights all the terms 692 * found in the text. 675 693 */ 676 694 protected Element highlightQueryTerms(Element request, Element dc_response_doc_content) … … 860 878 } 861 879 862 System.err.println(query_term_variants + " *** " + phrase_query_term_variants_hierarchy);863 880 return highlightQueryTermsInternal(content, query_term_variants, phrase_query_term_variants_hierarchy); 864 881 } … … 897 914 898 915 boolean is_character_letter_or_digit = Character.isLetterOrDigit(content_characters[i]); 899 916 900 917 // Has a word just started? 901 918 if (in_word == false && is_character_letter_or_digit == true)
Note:
See TracChangeset
for help on using the changeset viewer.