- Timestamp:
- 2014-04-10T14:39:33+12:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/UserTracker.java
r28210 r28966 9 9 import org.greenstone.gsdl3.util.DerbyWrapper; 10 10 import org.greenstone.gsdl3.util.GSXML; 11 import org.greenstone.gsdl3.util.XMLConverter; 11 12 import org.greenstone.util.GlobalProperties; 13 import org.w3c.dom.Document; 12 14 import org.w3c.dom.Element; 13 15 … … 38 40 for (int i = 0; i < services.length; i++) 39 41 { 40 Element service = this.d oc.createElement(GSXML.SERVICE_ELEM);42 Element service = this.desc_doc.createElement(GSXML.SERVICE_ELEM); 41 43 service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE); 42 44 service.setAttribute(GSXML.NAME_ATT, services[i]); … … 47 49 } 48 50 49 protected Element getServiceDescription( String service_id, String lang, String subset)51 protected Element getServiceDescription(Document doc, String service_id, String lang, String subset) 50 52 { 51 53 for (int i = 0; i < services.length; i++) … … 53 55 if (service_id.equals(services[i])) 54 56 { 55 Element service_elem = this.doc.createElement(GSXML.SERVICE_ELEM);57 Element service_elem = doc.createElement(GSXML.SERVICE_ELEM); 56 58 service_elem.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE); 57 59 service_elem.setAttribute(GSXML.NAME_ATT, services[i]); … … 65 67 protected synchronized Element processRecordUserAction(Element request) 66 68 { 67 Element result = GSXML.createBasicResponse(this.doc, RECORD_USER_ACTION); 69 Document result_doc = XMLConverter.newDOM(); 70 Element result = GSXML.createBasicResponse(result_doc, RECORD_USER_ACTION); 68 71 69 72 Element paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 70 73 if (paramList == null) 71 74 { 72 GSXML.addError( this.doc,result, "Request has no parameter list");75 GSXML.addError(result, "Request has no parameter list"); 73 76 return result; 74 77 } … … 90 93 protected synchronized Element processGetActivityOnPage(Element request) 91 94 { 92 Element result = GSXML.createBasicResponse(this.doc, GET_ACTIVITY_ON_PAGE); 95 Document result_doc = XMLConverter.newDOM(); 96 Element result = GSXML.createBasicResponse(result_doc, GET_ACTIVITY_ON_PAGE); 93 97 try 94 98 { … … 97 101 if (paramList == null) 98 102 { 99 GSXML.addError( this.doc,result, "Request has no parameter list");103 GSXML.addError(result, "Request has no parameter list"); 100 104 return result; 101 105 } … … 109 113 ArrayList<HashMap<String, String>> userActions = database.getMostRecentUserActions(site, collection, oid); 110 114 111 Element userList = this.doc.createElement("userList");115 Element userList = result_doc.createElement("userList"); 112 116 for (HashMap<String, String> userAction : userActions) 113 117 { 114 Element user = this.doc.createElement("user");118 Element user = result_doc.createElement("user"); 115 119 user.setAttribute("username", userAction.get("username")); 116 120 user.setAttribute("action", userAction.get("action"));
Note:
See TracChangeset
for help on using the changeset viewer.