Changeset 25069 for main/trunk/greenstone3/src/java/org/greenstone
- Timestamp:
- 2012-02-10T15:33:02+13:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentBasket.java
r24993 r25069 31 31 32 32 import org.greenstone.util.GlobalProperties; 33 import org.greenstone.gsdl3.util.GSParams; 33 34 import org.greenstone.gsdl3.util.GSXML; 34 35 import org.greenstone.gsdl3.util.GSPath; … … 62 63 protected static final String DELETE_ITEMS_SERVICE = "DeleteDocuments"; 63 64 protected static final String DELETE_ITEM_SERVICE = "DeleteDocument"; 65 protected static final String CLEAR_ITEMS_SERVICE = "ClearDocuments"; 64 66 //added 65 67 protected static final String MERGE_ITEM_SERVICE = "MergeDocument"; … … 141 143 deleteone_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEM_SERVICE); 142 144 this.short_service_info.appendChild(deleteone_service); 145 146 // set up short_service_info_ - for now just has name and type 147 Element deleteall_service = this.doc.createElement(GSXML.SERVICE_ELEM); 148 deleteall_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what?? 149 deleteall_service.setAttribute(GSXML.NAME_ATT, CLEAR_ITEMS_SERVICE); 150 this.short_service_info.appendChild(deleteall_service); 143 151 144 152 // set up short_service_info_ - for now just has name and type … … 187 195 return del_service; 188 196 } 197 198 if (service_id.equals(CLEAR_ITEMS_SERVICE)) 199 { 200 201 Element clear_service = this.doc.createElement(GSXML.SERVICE_ELEM); 202 clear_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what?? 203 clear_service.setAttribute(GSXML.NAME_ATT, CLEAR_ITEMS_SERVICE); 204 return clear_service; 205 } 189 206 190 207 if (service_id.equals(DELETE_ITEM_SERVICE)) … … 235 252 item = item.substring(pos + 1); 236 253 } 254 System.err.println("COLLECTION ADD IS " + collection); 237 255 //logger.error("COLLECTION = " + collection + " *** ITEM = " + item); 238 256 if (docsMap.containsKey(collection)) … … 401 419 return item; 402 420 } 421 422 protected Element processClearDocuments(Element request) 423 { 424 Hashtable docsMap = updateDocMap(request); 425 426 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); 427 428 // Get the parameters of the request 429 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 430 431 if (param_list == null) 432 { 433 logger.error("DocumentBasket Error: DeleteDocument request had no paramList."); 434 return result; // Return the empty result 435 } 436 437 HashMap params = GSXML.extractParams(param_list, false); 438 String collection = (String) params.get(GSParams.COLLECTION); 439 440 System.err.println("COLLECTION = " + collection); 441 if (collection == null) 442 return result; 443 444 docsMap.put(collection, new Hashtable()); 445 446 return result; 447 } 403 448 404 449 protected Element processDeleteDocuments(Element request) … … 480 525 HashMap params = GSXML.extractParams(param_list, false); 481 526 482 String param = (String) params.get("item");483 484 if ( param == null)527 String item = (String) params.get("item"); 528 529 if (item == null) 485 530 return result; 486 487 String item = param;488 531 489 532 String collection = "";
Note:
See TracChangeset
for help on using the changeset viewer.