Changeset 32448 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DepositorAction.java

Timestamp:

2018-09-13T14:05:59+12:00 (6 years ago)

Author:

kjdon

Message:

params class changed, now returns false by default for shouldsave. so don't need to add any that we don't want saving in the session. turned hard coded strings into static string variables

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DepositorAction.java

@@ -21 +21 @@
 import org.greenstone.gsdl3.util.DerbyWrapper;
 import org.greenstone.gsdl3.util.GSConstants;
+import org.greenstone.gsdl3.util.GSParams;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSXSLT;
@@ -40 +41 @@
     private final String DE_CLEAR_DATABASE = "cleardatabase";
 
+  // cgi args
+  private final String DE_PAGE_ARG = "dePage";
+  private final String CURRENT_PAGE_ARG = "currentPage";
+  private final String FILE_TO_ADD_ARG = "fileToAdd";
+  
     public Node process(Node message)
     {
@@ -55 +61 @@
         HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
-        String collection = (String) params.get("c");
+        String collection = (String) params.get(GSParams.COLLECTION);
 
         int pageNum = -1;
@@ -61 +67 @@
         try
         {
-            pageNum = Integer.parseInt(((String) params.get("dePage")));
+            pageNum = Integer.parseInt(((String) params.get(DE_PAGE_ARG)));
         }
         catch (Exception ex)
@@ -72 +78 @@
         try
         {
-            prevPageNum = Integer.parseInt((String) params.get("currentPage"));
+            prevPageNum = Integer.parseInt((String) params.get(CURRENT_PAGE_ARG));
         }
         catch (Exception ex)
@@ -125 +131 @@
             {
                 String paramName = paramIter.next();
-                if (paramName.startsWith("md___"))
+                if (paramName.startsWith(GSParams.MD_PREFIX))
                 {
                     Object paramValue = params.get(paramName);
@@ -270 +276 @@
         else if (subaction.toLowerCase().equals(DE_DEPOSIT_FILE))
         {
-            String fileToAdd = (String) params.get("fileToAdd");
+            String fileToAdd = (String) params.get(FILE_TO_ADD_ARG);
             File tempFile = new File(GlobalProperties.getGSDL3Home() + File.separator + "tmp" + File.separator + fileToAdd);
             if (tempFile.exists())