Changeset 27806 for main/trunk

Timestamp:

2013-07-11T15:36:11+12:00 (11 years ago)

Author:

sjm84

Message:

Fixed some bugs and it now keeps track of where you are up to

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.Serializable;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -27 +29 @@
 import org.w3c.dom.Node;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
 public class DepositorAction extends Action
 {
     //Sub actions
-    private final String DE_RETRIEVE_WIZARD = "getWizard";
-    private final String DE_DEPOSIT_FILE = "depositFile";
+    private final String DE_RETRIEVE_WIZARD = "getwizard";
+    private final String DE_DEPOSIT_FILE = "depositfile";
+    private final String DE_CLEAR_DATABASE = "cleardatabase";
 
     public Node process(Node message)
@@ -85 +91 @@
         }
 
+        int highestVisitedPage = -1;
+        String result = "";
+        int counter = 1;
+        while (result != null)
+        {
+            result = database.getUserData(currentUsername, "DE___" + collection + "___" + counter + "___VISITED_PAGE");
+            if (result != null)
+            {
+                counter++;
+            }
+        }
+        highestVisitedPage = counter - 1;
+        if (highestVisitedPage == 0)
+        {
+            highestVisitedPage = 1;
+        }
+
+        if (pageNum > highestVisitedPage + 1)
+        {
+            pageNum = highestVisitedPage + 1;
+        }
+
+        database.addUserData(currentUsername, "DE___" + collection + "___" + pageNum + "___VISITED_PAGE", "VISITED");
+
         String subaction = ((Element) request).getAttribute(GSXML.SUBACTION_ATT);
-        if (subaction.equals(DE_RETRIEVE_WIZARD))
+        if (subaction.toLowerCase().equals(DE_RETRIEVE_WIZARD))
         {
             //Save given metadata
@@ -171 +201 @@
                     pageLi.setAttribute("class", "wizardStepLink ui-state-active ui-corner-all");
                 }
+                else if (i + 1 > highestVisitedPage + 1 && i + 1 > pageNum + 1)
+                {
+                    pageLi.setAttribute("class", "wizardStepLink ui-state-disabled ui-corner-all");
+                }
                 else
                 {
@@ -233 +267 @@
             database.closeDatabase();
         }
-        else if (subaction.equals(DE_DEPOSIT_FILE))
+        else if (subaction.toLowerCase().equals(DE_DEPOSIT_FILE))
         {
             String fileToAdd = (String) params.get("fileToAdd");
@@ -257 +291 @@
                 }
 
-                String xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><!DOCTYPE DirectoryMetadata SYSTEM \"http://greenstone.org/dtd/DirectoryMetadata/1.0/DirectoryMetadata.dtd\"><DirectoryMetadata><FileSet>";
-                xmlString += "<FileName>" + fileToAdd + "</FileName><Description>";
-                Iterator<String> paramIter = params.keySet().iterator();
-                while (paramIter.hasNext())
-                {
-                    String paramName = paramIter.next();
-                    if (paramName.startsWith("md___"))
+                HashMap<String, String> metadataMap = new HashMap<String, String>();
+                for (int i = pageNum; i > 0; i--)
+                {
+                    String cachedValues = database.getUserData(currentUsername, "DE___" + collection + "___" + i + "___CACHED_VALUES");
+                    if (cachedValues != null)
                     {
-                        Object paramValue = params.get(paramName);
-
-                        if (paramValue instanceof String)
+                        Type type = new TypeToken<List<Map<String, String>>>()
                         {
-                            xmlString += "<Metadata name=\"" + paramName.substring(5) + "\" mode=\"accumulate\">" + (String) paramValue + "</Metadata>";
-                        }
-                        else if (paramValue instanceof HashMap)
+                        }.getType();
+
+                        Gson gson = new Gson();
+                        List<Map<String, String>> metadataList = gson.fromJson(cachedValues, type);
+                        for (Map<String, String> metadata : metadataList)
                         {
-                            HashMap<String, String> subMap = (HashMap<String, String>) paramValue;
-                            Iterator<String> subKeyIter = subMap.keySet().iterator();
-                            while (subKeyIter.hasNext())
-                            {
-                                String subName = subKeyIter.next();
-                                xmlString += "<Metadata name=\"" + paramName.substring(5) + "." + subName + "\" mode=\"accumulate\">" + subMap.get(subName) + "</Metadata>";
-                            }
+                            metadataMap.put(metadata.get("name"), metadata.get("value"));
                         }
                     }
                 }
-                xmlString += "</Description></FileSet><DirectoryMetadata>";
+
+                String xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><!DOCTYPE DirectoryMetadata SYSTEM \"http://greenstone.org/dtd/DirectoryMetadata/1.0/DirectoryMetadata.dtd\"><DirectoryMetadata><FileSet>";
+                xmlString += "<FileName>.*</FileName><Description>";
+                for (String key : metadataMap.keySet())
+                {
+                    xmlString += "<Metadata name=\"" + key.substring("MD___".length()) + "\" mode=\"accumulate\">" + metadataMap.get(key) + "</Metadata>";
+                }
+                xmlString += "</Description></FileSet></DirectoryMetadata>";
 
                 File metadataFile = new File(GlobalProperties.getGSDL3Home() + File.separator + "sites" + File.separator + this.config_params.get(GSConstants.SITE_NAME) + File.separator + "collect" + File.separator + collection + File.separator + "import" + File.separator + fileToAdd + File.separator + "metadata.xml");
@@ -317 +350 @@
                 Element buildResponseMessage = (Element) this.mr.process(buildMessage);
 
-                System.err.println("RESPONSE = " + GSXML.xmlNodeToString(buildResponseMessage));
-                
                 response.appendChild(this.doc.importNode(buildResponseMessage, true));
             }
+        }
+        else if (subaction.toLowerCase().equals(DE_CLEAR_DATABASE))
+        {
+            database.clearUserData();
+            System.err.println("\n\nCLEARED\n\n");
         }
         else