- Timestamp:
- 2012-01-26T11:50:17+13:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java
r24989 r24993 69 69 { 70 70 71 String lang = request.getAttribute(GSXML.LANG_ATT); 72 String uid = request.getAttribute(GSXML.USER_ID_ATT); 71 UserContext userContext = new UserContext(request); 73 72 // first, get the message router info 74 73 Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM); 75 Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, uid);74 Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext); 76 75 info_message.appendChild(coll_list_request); 77 76 Element info_response_message = (Element) this.mr.process(info_message); … … 97 96 if (colls.getLength() > 0) 98 97 { 99 sendMultipleRequests(colls, null, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);98 sendMultipleRequests(colls, null, GSXML.REQUEST_TYPE_DESCRIBE, userContext); 100 99 } 101 100 } … … 108 107 if (services.getLength() > 0) 109 108 { 110 sendMultipleRequests(services, null, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);109 sendMultipleRequests(services, null, GSXML.REQUEST_TYPE_DESCRIBE, userContext); 111 110 } 112 111 } … … 119 118 if (clusters.getLength() > 0) 120 119 { 121 sendMultipleRequests(clusters, null, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);120 sendMultipleRequests(clusters, null, GSXML.REQUEST_TYPE_DESCRIBE, userContext); 122 121 123 122 } … … 132 131 { 133 132 134 String lang = request.getAttribute(GSXML.LANG_ATT); 135 String uid = request.getAttribute(GSXML.USER_ID_ATT); 133 UserContext userContext = new UserContext(request); 136 134 // extract the params from the cgi-request, 137 135 Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); … … 144 142 // return an empty response 145 143 Element response = this.doc.createElement(GSXML.RESPONSE_ELEM); 146 addSiteMetadata(response, lang, uid);144 addSiteMetadata(response, userContext); 147 145 return response; 148 146 } … … 151 149 Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM); 152 150 153 Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, lang, uid);151 Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext); 154 152 coll_about_message.appendChild(coll_about_request); 155 153 Element coll_about_response = (Element) this.mr.process(coll_about_message); … … 196 194 if (services.getLength() > 0) 197 195 { 198 sendMultipleRequests(services, coll_name, GSXML.REQUEST_TYPE_DESCRIBE, lang, uid);196 sendMultipleRequests(services, coll_name, GSXML.REQUEST_TYPE_DESCRIBE, userContext); 199 197 } 200 198 201 199 Element response = (Element) GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM); 202 200 //add the site metadata 203 addSiteMetadata(response, lang, uid);201 addSiteMetadata(response, userContext); 204 202 return response; 205 203 } … … 213 211 protected Element unknownPage(Element request) 214 212 { 215 216 String lang = request.getAttribute(GSXML.LANG_ATT); 217 String uid = request.getAttribute(GSXML.USER_ID_ATT); 213 UserContext userContext = new UserContext(request); 218 214 String page_name = request.getAttribute(GSXML.SUBACTION_ATT); 219 215 … … 227 223 // just return an empty response 228 224 Element response = this.doc.createElement(GSXML.RESPONSE_ELEM); 229 addSiteMetadata(response, lang, uid);225 addSiteMetadata(response, userContext); 230 226 return response; 231 227 } … … 237 233 Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM); 238 234 239 Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, lang, uid);235 Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext); 240 236 coll_about_message.appendChild(coll_about_request); 241 237 … … 245 241 246 242 //add the site metadata 247 addSiteMetadata(response, lang, uid);243 addSiteMetadata(response, userContext); 248 244 249 245 return response; … … 251 247 } 252 248 253 protected boolean sendMultipleRequests(NodeList items, String path_prefix, String request_type, String lang, String uid)249 protected boolean sendMultipleRequests(NodeList items, String path_prefix, String request_type, UserContext userContext) 254 250 { 255 251 … … 264 260 path = GSPath.appendLink(path_prefix, path); 265 261 } 266 Element request = GSXML.createBasicRequest(this.doc, request_type, path, lang, uid);262 Element request = GSXML.createBasicRequest(this.doc, request_type, path, userContext); 267 263 message.appendChild(request); 268 264 }
Note:
See TracChangeset
for help on using the changeset viewer.