Changeset 32453 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/BerryBasket.java

Timestamp:

2018-09-13T14:18:16+12:00 (6 years ago)

Author:

kjdon

Message:

replacing hard coded param names with static string variables. set up save params for those params we need to save to the session.

File:

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

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

@@ -66 +66 @@
     protected static final String DELETE_ITEM_SERVICE = "DeleteItem";
 
+  // for AddItem
     protected static final String ITEM_PARAM = "item";
+  // for DeleteItems
+  protected static final String ITEMS_PARAM = "items";
+  // for SendMail
+  protected static final String ADDRESS_PARAM = "address";
+  protected static final String SUBJECT_PARAM = "subject";
+  protected static final String CONTENT_PARAM = "content";
+  protected static final String CC_PARAM = "cc";
+  protected static final String BCC_PARAM = "bcc";
+
+  
     protected static final String delimiter = "|";
     protected static final int delay = 1800000;
@@ -171 +182 @@
 
         }
+
+        // if any params should be saved in the session, add them to save_params here
+        // this.save_params.add(XXX_PARAM);
         return true;
 
@@ -252 +266 @@
         HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
-        String item = (String) params.get("item");
+        String item = (String) params.get(ITEM_PARAM);
         String collection = "";
         int pos = item.indexOf(":");
@@ -334 +348 @@
         HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
-        String param = (String) params.get("items");
+        String param = (String) params.get(ITEMS_PARAM);
 
         if (param == null)
@@ -496 +510 @@
         HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
-        String to = (String) params.get("address");
-        String subject = (String) params.get("subject");
-        String content = (String) params.get("content");
-        String cc = (String) params.get("cc");
-        String bcc = (String) params.get("bcc");
+        String to = (String) params.get(ADDRESS_PARAM);
+        String subject = (String) params.get(SUBJECT_PARAM);
+        String content = (String) params.get(CONTENT_PARAM);
+        String cc = (String) params.get(CC_PARAM);
+        String bcc = (String) params.get(BCC_PARAM);
 
         String mailhost = GlobalProperties.getProperty("mail.smtp.host");