Changeset 27908

Timestamp:

2013-07-19T16:48:54+12:00 (11 years ago)

Author:

sjm84

Message:

Added a way to clear the data saved by the depositor

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/DepositorAction.java (modified) (2 diffs)
• util/DerbyWrapper.java (modified) (1 diff)

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

@@ -37 +37 @@
     private final String DE_RETRIEVE_WIZARD = "getwizard";
     private final String DE_DEPOSIT_FILE = "depositfile";
+    private final String DE_CLEAR_CACHE = "clearcache";
     private final String DE_CLEAR_DATABASE = "cleardatabase";
 
@@ -353 +354 @@
             }
         }
+        else if (subaction.toLowerCase().equals(DE_CLEAR_CACHE))
+        {
+            database.clearUserDataWithPrefix(currentUsername, "DE___");
+        }
         else if (subaction.toLowerCase().equals(DE_CLEAR_DATABASE))
         {
             database.clearUserData();
-            System.err.println("\n\nCLEARED\n\n");
         }
         else

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

@@ -688 +688 @@
         }
     }
+
+    public void clearUserDataWithPrefix(String username, String prefix)
+    {
+        try
+        {
+            conn.setAutoCommit(false);
+            state.execute("DELETE FROM data WHERE username = '" + username + "' AND SUBSTR(name, 1, " + prefix.length() + ") = '" + prefix + "'");
+            conn.commit();
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
+    }
 }