Changeset 28972 for main/trunk
- Timestamp:
- 2014-04-14T14:38:36+12:00 (10 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryCommandline.java
r27617 r28972 38 38 * A program to take cgi args from the command line and return html 39 39 * 40 * @author Katherine Don41 * @version $Revision$42 40 */ 43 41 44 42 final public class LibraryCommandline 45 43 { 46 47 protected XMLConverter converter = null;48 protected Document doc = null;49 50 44 protected HashMap<String, String> saved_args = null; 51 45 protected GSParams params = null; … … 54 48 public LibraryCommandline() 55 49 { 56 this.converter = new XMLConverter();57 this.doc = converter.newDOM();58 50 this.saved_args = new HashMap<String, String>(); 59 51 this.params = new GSParams(); … … 143 135 Element xml_message = generateRequest(query); 144 136 System.out.println("*********************"); 145 System.out.println( converter.getPrettyString(xml_message));137 System.out.println(XMLConverter.getPrettyString(xml_message)); 146 138 Node xml_result = recept.process(xml_message); 147 return this.converter.getPrettyString(xml_result);139 return XMLConverter.getPrettyString(xml_result); 148 140 } 149 141 … … 151 143 { 152 144 153 Element xml_message = this.doc.createElement(GSXML.MESSAGE_ELEM); 154 Element xml_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", new UserContext()); 145 Document msg_doc = XMLConverter.newDOM(); 146 Element xml_message = msg_doc.createElement(GSXML.MESSAGE_ELEM); 147 Element xml_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PAGE, "", new UserContext()); 155 148 xml_message.appendChild(xml_request); 156 Element xml_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);149 Element xml_param_list = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 157 150 xml_request.appendChild(xml_param_list); 158 151 … … 200 193 { 201 194 // make a param now 202 Element param = doc.createElement(GSXML.PARAM_ELEM);195 Element param = msg_doc.createElement(GSXML.PARAM_ELEM); 203 196 param.setAttribute(GSXML.NAME_ATT, name); 204 197 param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(value)); … … 220 213 if (name.equals(GSParams.LANGUAGE)) 221 214 continue; 222 Element param = this.doc.createElement(GSXML.PARAM_ELEM);215 Element param = msg_doc.createElement(GSXML.PARAM_ELEM); 223 216 param.setAttribute(GSXML.NAME_ATT, name); 224 217 param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(saved_args.get(name))); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java
r28966 r28972 86 86 protected final String DEFAULT_LANG = "en"; 87 87 88 /** container Document to create XML Nodes */89 protected Document doc = null;90 91 /** a converter class to parse XML and create Docs */92 protected XMLConverter converter = null;93 94 88 /** 95 89 * the cgi stuff - the Receptionist can add new args to this … … 186 180 config_params.put(GSConstants.SITE_NAME, site_name); 187 181 } 188 this.converter = new XMLConverter();189 this.doc = XMLConverter.newDOM();182 //this.converter = new XMLConverter(); 183 //this.doc = XMLConverter.newDOM(); 190 184 191 185 // the receptionist -the servlet will talk to this … … 243 237 Communicator communicator = null; 244 238 // we need to create the XML to configure the communicator 245 Element site_elem = this.doc.createElement(GSXML.SITE_ELEM); 239 Document doc = XMLConverter.newDOM(); 240 Element site_elem = doc.createElement(GSXML.SITE_ELEM); 246 241 site_elem.setAttribute(GSXML.TYPE_ATT, remote_site_type); 247 242 site_elem.setAttribute(GSXML.NAME_ATT, remote_site_name); … … 292 287 //Allow the message router and the document to be accessed from anywhere in this servlet context 293 288 this.getServletContext().setAttribute("GSRouter", this.recept.getMessageRouter()); 294 this.getServletContext().setAttribute("GSDocument", this.doc);289 //this.getServletContext().setAttribute("GSDocument", this.doc); 295 290 } 296 291 … … 464 459 465 460 //Get the groups for the user 466 Element acquireGroupMessage = this.doc.createElement(GSXML.MESSAGE_ELEM); 467 Element acquireGroupRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, "GetUserInformation", userContext); 461 Document msg_doc = XMLConverter.newDOM(); 462 Element acquireGroupMessage = msg_doc.createElement(GSXML.MESSAGE_ELEM); 463 Element acquireGroupRequest = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PROCESS, "GetUserInformation", userContext); 468 464 acquireGroupMessage.appendChild(acquireGroupRequest); 469 465 470 Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);466 Element paramList = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 471 467 acquireGroupRequest.appendChild(paramList); 472 paramList.appendChild(GSXML.createParameter( this.doc, GSXML.USERNAME_ATT, request.getUserPrincipal().getName()));468 paramList.appendChild(GSXML.createParameter(msg_doc, GSXML.USERNAME_ATT, request.getUserPrincipal().getName())); 473 469 474 470 Element aquireGroupsResponseMessage = (Element) this.recept.process(acquireGroupMessage); … … 520 516 521 517 // the request to the receptionist 522 Element xml_message = this.doc.createElement(GSXML.MESSAGE_ELEM); 523 Element xml_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", userContext); 518 Document msg_doc = XMLConverter.newDOM(); 519 Element xml_message = msg_doc.createElement(GSXML.MESSAGE_ELEM); 520 Element xml_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PAGE, "", userContext); 524 521 xml_request.setAttribute(GSXML.OUTPUT_ATT, output); 525 522 … … 655 652 // create the param list for the greenstone request - includes 656 653 // the params from the current request and any others from the saved session 657 Element xml_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);654 Element xml_param_list = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 658 655 xml_request.appendChild(xml_param_list); 659 656 … … 680 677 else 681 678 { 682 Element param = this.doc.createElement(GSXML.PARAM_ELEM);679 Element param = msg_doc.createElement(GSXML.PARAM_ELEM); 683 680 param.setAttribute(GSXML.NAME_ATT, name); 684 681 param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(value)); … … 709 706 710 707 // lang and uid are stored but we dont want it in the param list cos its already in the request 711 Element param = this.doc.createElement(GSXML.PARAM_ELEM);708 Element param = msg_doc.createElement(GSXML.PARAM_ELEM); 712 709 param.setAttribute(GSXML.NAME_ATT, name); 713 710 String value = GSXML.xmlSafe((String) session.getAttribute(name)); … … 784 781 encodeURLs(xml_result, response); 785 782 786 String xml_string = this.converter.getPrettyString(xml_result);783 String xml_string = XMLConverter.getPrettyString(xml_result); 787 784 788 785 if (output.equals("json")) … … 851 848 { 852 849 //The user entered in either the wrong username or the wrong password 853 Element loginPageMessage = this.doc.createElement(GSXML.MESSAGE_ELEM); 854 Element loginPageRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", userContext); 850 Document loginPageDoc = XMLConverter.newDOM(); 851 Element loginPageMessage = loginPageDoc.createElement(GSXML.MESSAGE_ELEM); 852 Element loginPageRequest = GSXML.createBasicRequest(loginPageDoc, GSXML.REQUEST_TYPE_PAGE, "", userContext); 855 853 loginPageRequest.setAttribute(GSXML.ACTION_ATT, "p"); 856 854 loginPageRequest.setAttribute(GSXML.SUBACTION_ATT, "login"); … … 859 857 loginPageMessage.appendChild(loginPageRequest); 860 858 861 Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);859 Element paramList = loginPageDoc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 862 860 loginPageRequest.appendChild(paramList); 863 861 864 Element messageParam = this.doc.createElement(GSXML.PARAM_ELEM);862 Element messageParam = loginPageDoc.createElement(GSXML.PARAM_ELEM); 865 863 messageParam.setAttribute(GSXML.NAME_ATT, "loginMessage"); 866 864 messageParam.setAttribute(GSXML.VALUE_ATT, "Either your username or password was incorrect, please try again."); 867 865 paramList.appendChild(messageParam); 868 866 869 Element urlParam = this.doc.createElement(GSXML.PARAM_ELEM);867 Element urlParam = loginPageDoc.createElement(GSXML.PARAM_ELEM); 870 868 urlParam.setAttribute(GSXML.NAME_ATT, "redirectURL"); 871 869 String queryString = ""; … … 878 876 879 877 Node loginPageResponse = this.recept.process(loginPageMessage); 880 out.println( this.converter.getPrettyString(loginPageResponse));878 out.println(XMLConverter.getPrettyString(loginPageResponse)); 881 879 882 880 return false; … … 888 886 if (request.getAuthType() != null) 889 887 { 890 Element userInformation = this.doc.createElement(GSXML.USER_INFORMATION_ELEM);888 Element userInformation = xml_request.getOwnerDocument().createElement(GSXML.USER_INFORMATION_ELEM); 891 889 userInformation.setAttribute(GSXML.USERNAME_ATT, request.getUserPrincipal().getName()); 892 890 893 Element userInfoMessage = this.doc.createElement(GSXML.MESSAGE_ELEM); 894 Element userInfoRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SECURITY, "GetUserInformation", userContext); 891 Document msg_doc = XMLConverter.newDOM(); 892 Element userInfoMessage = msg_doc.createElement(GSXML.MESSAGE_ELEM); 893 Element userInfoRequest = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_SECURITY, "GetUserInformation", userContext); 895 894 userInfoMessage.appendChild(userInfoRequest); 896 895 897 Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);896 Element paramList = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 898 897 userInfoRequest.appendChild(paramList); 899 898 900 Element param = this.doc.createElement(GSXML.PARAM_ELEM);899 Element param = msg_doc.createElement(GSXML.PARAM_ELEM); 901 900 param.setAttribute(GSXML.NAME_ATT, GSXML.USERNAME_ATT); 902 901 param.setAttribute(GSXML.VALUE_ATT, request.getUserPrincipal().getName()); … … 925 924 { 926 925 //Get the security info for this collection 927 Element securityMessage = this.doc.createElement(GSXML.MESSAGE_ELEM); 928 Element securityRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SECURITY, collection, userContext); 926 Document msg_doc = XMLConverter.newDOM(); 927 Element securityMessage = msg_doc.createElement(GSXML.MESSAGE_ELEM); 928 Element securityRequest = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_SECURITY, collection, userContext); 929 929 securityMessage.appendChild(securityRequest); 930 930 if (document != null && !document.equals("")) … … 957 957 if (!found) 958 958 { 959 Element loginPageMessage = this.doc.createElement(GSXML.MESSAGE_ELEM); 960 Element loginPageRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", userContext); 959 Document loginPageDoc = XMLConverter.newDOM(); 960 Element loginPageMessage = loginPageDoc.createElement(GSXML.MESSAGE_ELEM); 961 Element loginPageRequest = GSXML.createBasicRequest(loginPageDoc, GSXML.REQUEST_TYPE_PAGE, "", userContext); 961 962 loginPageRequest.setAttribute(GSXML.ACTION_ATT, "p"); 962 963 loginPageRequest.setAttribute(GSXML.SUBACTION_ATT, "login"); … … 965 966 loginPageMessage.appendChild(loginPageRequest); 966 967 967 Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);968 Element paramList = loginPageDoc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 968 969 loginPageRequest.appendChild(paramList); 969 970 970 Element messageParam = this.doc.createElement(GSXML.PARAM_ELEM);971 Element messageParam = loginPageDoc.createElement(GSXML.PARAM_ELEM); 971 972 messageParam.setAttribute(GSXML.NAME_ATT, "loginMessage"); 972 973 if (request.getAuthType() == null) … … 980 981 paramList.appendChild(messageParam); 981 982 982 Element urlParam = this.doc.createElement(GSXML.PARAM_ELEM);983 Element urlParam = loginPageDoc.createElement(GSXML.PARAM_ELEM); 983 984 urlParam.setAttribute(GSXML.NAME_ATT, "redirectURL"); 984 985 if (request.getQueryString() != null && request.getQueryString().length() > 0) … … 993 994 994 995 Node loginPageResponse = this.recept.process(loginPageMessage); 995 out.println( this.converter.getPrettyString(loginPageResponse));996 out.println(XMLConverter.getPrettyString(loginPageResponse)); 996 997 997 998 return false;
Note:
See TracChangeset
for help on using the changeset viewer.