Changeset 32549 for main/trunk/greenstone3/src/java/org/greenstone
- Timestamp:
- 2018-10-30T10:30:53+13:00 (6 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java
r32448 r32549 27 27 protected HashMap<String, Object> config_params = null; 28 28 29 29 /** the xml element languageList */ 30 protected Element language_list = null; 30 31 /** a converter class to parse XML and create Docs */ 31 32 protected XMLConverter converter = null; … … 58 59 } 59 60 61 /** give the action access to the list of languages */ 62 public void setLanguageList(Element lang_list) { 63 this.language_list = lang_list; 64 } 60 65 public boolean configure() 61 66 { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java
r32141 r32549 58 58 else if (page_name.equals(ABOUT_PAGE) || page_name.equals(PREFS_PAGE)) 59 59 { 60 response = about Page(request);60 response = aboutOrPrefsPage(request, page_name); 61 61 //}else if (page_name.equals(PREFS_PAGE)) { 62 62 //response = prefsPage(request); … … 227 227 } // homePage 228 228 229 protected Element aboutPage(Element request)229 protected Element aboutOrPrefsPage(Element request, String page_name) 230 230 { 231 231 Document doc = XMLConverter.newDOM(); … … 239 239 if (coll_name == null || coll_name.equals("")) 240 240 { 241 logger.error("about page requested with no collection or cluster specified!"); 242 // return an empty response 241 // return a response with no collection info - must be prefs from home page 243 242 Element response = doc.createElement(GSXML.RESPONSE_ELEM); 244 243 addSiteMetadata(response, userContext); 245 244 addInterfaceOptions(response); 245 if (this.language_list != null) { 246 response.appendChild(doc.importNode(this.language_list, true)); 247 } 246 248 return response; 247 249 } … … 303 305 addSiteMetadata(response, userContext); 304 306 addInterfaceOptions(response); 307 if (page_name.equals(PREFS_PAGE) && this.language_list != null) { 308 response.appendChild(response.getOwnerDocument().importNode(this.language_list, true)); 309 } 305 310 return response; 306 311 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java
r28966 r32549 71 71 boolean get_service_description = false; 72 72 Element page_response = (Element) GSXML.getChildByTagName(page, GSXML.PAGE_RESPONSE_ELEM); 73 if (this.language_list != null) 74 { 75 page_response.appendChild(doc.importNode(this.language_list, true)); 76 } 73 77 74 Element coll_description = (Element) GSXML.getChildByTagName(page_response, GSXML.COLLECTION_ELEM); 78 75 if (coll_description == null) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java
r32366 r32549 133 133 setUpInterfaceOptions(config_elem); 134 134 135 this.language_list = (Element) GSXML.getChildByTagName(config_elem, "languageList"); 136 if (this.language_list == null) 137 { 138 logger.error(" didn't find a language list in the config file!!"); 139 } 140 135 141 // load up the actions 136 142 Element action_list = (Element) GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM + GSXML.LIST_MODIFIER); … … 157 163 ac.configure(); 158 164 ac.addActionParameters(this.params); 165 ac.setLanguageList(this.language_list); 159 166 this.action_map.put(action_name, ac); 160 167 } 161 168 162 this.language_list = (Element) GSXML.getChildByTagName(config_elem, "languageList");163 if (language_list == null)164 {165 logger.error(" didn't find a language list in the config file!!");166 }167 169 168 170 return true; … … 230 232 ac.configure(); 231 233 ac.addActionParameters(this.params); 234 ac.setLanguageList(this.language_list); 232 235 this.action_map.put(action, ac); 233 236 a = ac; … … 317 320 Element p = (Element)params.item(j); 318 321 if (!p.getAttribute(GSXML.SENSITIVE_ATT).equals("")) { 319 logger. error("removing param "+p.getAttribute("name"));322 logger.debug("removing param "+p.getAttribute("name")); 320 323 param_list.removeChild(p); 321 324 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java
r31871 r32549 133 133 setUpInterfaceOptions(config_elem); 134 134 135 Element lang_list = (Element) GSXML.getChildByTagName(config_elem, "languageList"); 136 if (lang_list == null) 137 { 138 logger.error(" didn't find a language list in the config file!!"); 139 } 140 else 141 { 142 this.language_list = lang_list; 143 } 144 135 145 Element action_list = (Element) GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM + GSXML.LIST_MODIFIER); 136 146 NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM); … … 156 166 ac.configure(); 157 167 ac.addActionParameters(this.params); 168 ac.setLanguageList(this.language_list); 158 169 this.action_map.put(action_name, ac); 159 170 … … 175 186 this.xslt_map.put(map_key, subxslt); 176 187 } 177 }178 Element lang_list = (Element) GSXML.getChildByTagName(config_elem, "languageList");179 if (lang_list == null)180 {181 logger.error(" didn't find a language list in the config file!!");182 }183 else184 {185 //this.language_list = (Element) this.doc.importNode(lang_list, true);186 this.language_list = lang_list;187 188 } 188 189
Note:
See TracChangeset
for help on using the changeset viewer.