Changeset 3655

Timestamp:

Aug 10, 2007, 2:22:57 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #720: Progress reporter when emptying trashcan

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Trashcan.java (modified) (8 diffs)
• src/plugins/core/net/sf/basedb/plugins/IlluminaRawDataImporter.java (modified) (1 diff)
• www/common/progress_reporter.jsp (added)
• www/views/trashcan/index.jsp (modified) (3 diffs)
• www/views/trashcan/list_trash.jsp (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/Trashcan.java

@@ -143 +143 @@
     @param items The items to remove
     @param ignoreFlag TRUE to also remove items that hasn't been flagged for removal
+    @param progress An optional progress reporter
     @return The number of deleted items
     @since 2.4
   */
-  public static int delete(SessionControl sc, Collection<? extends Identifiable> items, boolean ignoreFlag)
+  public static int delete(SessionControl sc, Collection<? extends Identifiable> items, 
+    boolean ignoreFlag, ProgressReporter progress)
     throws BaseException
   {
+    if (progress != null) progress.display(0, "Checking which items to remove...");
+    
     // Copy items to a set with predictable iteration order
     Set<Identifiable> itemsToRemove = new TreeSet<Identifiable>(Item.DELETION_ORDER);
@@ -167 +171 @@
     
     if (itemsToRemove.size() == 0) return 0;
+    int numToRemove = itemsToRemove.size();
+    float progressFactor = 100.0f / numToRemove;
     int numRemoved = 0;
     int removedInTransaction = 0;
@@ -185 +191 @@
         {
           Identifiable item = iterator.next();
+          if (progress != null)
+          {
+            String name = item instanceof Nameable ? ((Nameable)item).getName() : item.toString();
+            progress.display((int)(numRemoved * progressFactor), "Remove " +
+                item.getType() + ": " + name + 
+                " (" + (numRemoved + 1) + " of " + numToRemove + ")");
+          }
           BasicItem basicItem = item.getType().getById(dc, item.getId());
           if (!basicItem.isUsed()) 
@@ -197 +210 @@
           {
             if (isDebug) log.debug("Item is used: " + basicItem);
+            if (progress != null) progress.append(" [USED]");
             if (removedInTransaction > 0)
             {
@@ -207 +221 @@
           " items scheduled for deletion; " + numRemoved + " total so far; " +
           itemsToRemove.size() + " remains in list");
+        if (progress != null)
+        {
+          progress.display((int)(numRemoved * progressFactor), 
+            numRemoved + " of " + numToRemove + " items removed; flushing to database");
+        }
         dc.commit();
       }
@@ -214 +233 @@
       }
     } while (removedInTransaction > 0 && itemsToRemove.size() > 0);
+    
+    if (progress != null)
+    {
+      String msg = "";
+      if (numRemoved < numToRemove)
+      {
+        msg = numRemoved + " of " + numToRemove + " items removed. " + 
+          (numToRemove - numRemoved) + " items are used and can't be removed";
+      }
+      else
+      {
+        msg = "All " + numToRemove + " items removed";
+      }
+      progress.display(100, msg);
+    }
     return numRemoved;
   }
@@ -220 +254 @@
     Delete all items in the trashcan of the logged in user. This method
     calls {@link #getItems(DbControl, Item, int, int)} to load all items
-    that have been flagged for removal and then {@link #delete(SessionControl, Collection, boolean)}
+    that have been flagged for removal and then 
+    {@link #delete(SessionControl, Collection, boolean, ProgressReporter)}
     to remove those items. See the <code>delete</code> for
     more information about transactions.
     
     @param sc The session control to use for connecting to the database
+    @param progress An optional progress reporter
     @return The number of deleted items
     @since 2.4
   */
-  public static int deleteAll(SessionControl sc)
+  public static int deleteAll(SessionControl sc, ProgressReporter progress)
   {
     DbControl dc = sc.newDbControl();
@@ -235 +271 @@
       List<Removable> items = getItems(dc, null, 0, 0);
       dc.close();
-      return delete(sc, items, false);
+      return delete(sc, items, false, progress);
     }
     finally

trunk/src/plugins/core/net/sf/basedb/plugins/IlluminaRawDataImporter.java

@@ -473 +473 @@
       if (!success && rawBioAssays != null)
       {
-        Trashcan.delete(sc, rawBioAssays, true);        
+        Trashcan.delete(sc, rawBioAssays, true, null);        
       }
       super.end(success);

trunk/www/views/trashcan/index.jsp

@@ -36 +36 @@
   import="net.sf.basedb.core.ItemInUseException"
   import="net.sf.basedb.core.PermissionDeniedException"
+  import="net.sf.basedb.core.SimpleProgressReporter"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.WebException"
@@ -115 +116 @@
     
     int numTotal = items.size();
-    int numRemoved = Trashcan.delete(sc, items, false);
+    SimpleProgressReporter progress = new SimpleProgressReporter(null);
+    sc.setSessionSetting("progress.trashcan", progress);
+    int numRemoved = Trashcan.delete(sc, items, false, progress);
 
     if (numTotal != numRemoved)
@@ -243 +246 @@
     dc.close();
     int numTotal = items.size();
-    int numRemoved = Trashcan.delete(sc, items, false);
+    SimpleProgressReporter progress = new SimpleProgressReporter(null);
+    sc.setSessionSetting("progress.trashcan", progress);
+    int numRemoved = Trashcan.delete(sc, items, false, progress);
     
     if (numTotal != numRemoved)

trunk/www/views/trashcan/list_trash.jsp

@@ -101 +101 @@
         return;
       }
+      Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=trashcan&title=Empty trashcan', 'Progress', 400, 200);
       var frm = document.forms[formId];
       frm.action = submitPage;
@@ -123 +124 @@
         }
       }
+      Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=trashcan&title=Delete items', 'Progress', 400, 200);
       frm.action = submitPage;
       frm.cmd.value = 'DeleteItemsPermanently';