Changeset 25069 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentBasket.java

Timestamp:

2012-02-10T15:33:02+13:00 (12 years ago)

Author:

sjm84

Message:

Added a function to clear all the documents

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentBasket.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentBasket.java

@@ -31 +31 @@
 
 import org.greenstone.util.GlobalProperties;
+import org.greenstone.gsdl3.util.GSParams;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSPath;
@@ -62 +63 @@
     protected static final String DELETE_ITEMS_SERVICE = "DeleteDocuments";
     protected static final String DELETE_ITEM_SERVICE = "DeleteDocument";
+    protected static final String CLEAR_ITEMS_SERVICE = "ClearDocuments";
     //added
     protected static final String MERGE_ITEM_SERVICE = "MergeDocument";
@@ -141 +143 @@
         deleteone_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEM_SERVICE);
         this.short_service_info.appendChild(deleteone_service);
+        
+        // set up short_service_info_ - for now just has name and type
+        Element deleteall_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        deleteall_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
+        deleteall_service.setAttribute(GSXML.NAME_ATT, CLEAR_ITEMS_SERVICE);
+        this.short_service_info.appendChild(deleteall_service);
 
         // set up short_service_info_ - for now just has name and type
@@ -187 +195 @@
             return del_service;
         }
+        
+        if (service_id.equals(CLEAR_ITEMS_SERVICE))
+        {
+
+            Element clear_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            clear_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
+            clear_service.setAttribute(GSXML.NAME_ATT, CLEAR_ITEMS_SERVICE);
+            return clear_service;
+        }
 
         if (service_id.equals(DELETE_ITEM_SERVICE))
@@ -235 +252 @@
             item = item.substring(pos + 1);
         }
+        System.err.println("COLLECTION ADD IS " + collection);
         //logger.error("COLLECTION = " + collection + " *** ITEM = " + item);
         if (docsMap.containsKey(collection))
@@ -401 +419 @@
         return item;
     }
+    
+    protected Element processClearDocuments(Element request)
+    {
+        Hashtable docsMap = updateDocMap(request);
+        
+        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        
+        // Get the parameters of the request
+        Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        
+        if (param_list == null)
+        {
+            logger.error("DocumentBasket Error: DeleteDocument request had no paramList.");
+            return result; // Return the empty result
+        }
+
+        HashMap params = GSXML.extractParams(param_list, false);
+        String collection = (String) params.get(GSParams.COLLECTION);
+
+        System.err.println("COLLECTION = " + collection);
+        if (collection == null)
+            return result;
+        
+        docsMap.put(collection, new Hashtable());
+        
+        return result;
+    }
 
     protected Element processDeleteDocuments(Element request)
@@ -480 +525 @@
         HashMap params = GSXML.extractParams(param_list, false);
 
-        String param = (String) params.get("item");
-
-        if (param == null)
+        String item = (String) params.get("item");
+
+        if (item == null)
             return result;
-
-        String item = param;
 
         String collection = "";