Changeset 4617

Timestamp:

Oct 30, 2008, 8:19:35 AM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #1149 Mark related items for removal when "parent" item is marked for removal.

File:

• trunk/src/core/net/sf/basedb/util/RemovableUtil.java (modified) (11 diffs)

trunk/src/core/net/sf/basedb/util/RemovableUtil.java

@@ -30 +30 @@
 import net.sf.basedb.core.Experiment;
 import net.sf.basedb.core.File;
+import net.sf.basedb.core.FileSetMember;
+import net.sf.basedb.core.FileStoreEnabled;
 import net.sf.basedb.core.Include;
 import net.sf.basedb.core.Item;
@@ -135 +137 @@
       {
         BasicItem item = itemType.getById(dc, id);
+        if (item instanceof FileStoreEnabled)
+        {
+          try
+          {
+            removeFileSetMembers(dc, (FileStoreEnabled)item, true);
+          }
+          catch(BaseException ex)
+          {}
+        }
         try
         {
@@ -221 +232 @@
         for (Directory dir : subDirectories)
         {
-          numSubItemsRemoved = removeDependingItems(dc, dir, removed);          
+          int[]numTemp = removeDependingItems(dc, dir, removed);
+          numSubItemsRemoved[0] += numTemp[0];
+          numSubItemsRemoved[1] += numTemp[1];
           numItemsRemoved += setRemovedFlag(dir, removed) ? 1 : 0;
         }       
@@ -233 +246 @@
     else if (item instanceof Transformation)
     {
+      // Remove AnyToAny items this item links to.
+      ItemQuery<AnyToAny> linkedItemQuery = AnyToAny.getLinksFrom((Transformation)item);      
+      numSubItemsRemoved = sumArrays(numSubItemsRemoved, removeAnyToAnyLinkedTo(dc, linkedItemQuery, removed));
       if (removed)
       {
@@ -251 +267 @@
           for (BioAssaySet bsa : bioAssaySets)
           {
-            numSubItemsRemoved = removeDependingItems(dc, bsa, removed);
+            numSubItemsRemoved = sumArrays(numSubItemsRemoved, removeDependingItems(dc, bsa, removed));           
             numItemsRemoved  += setRemovedFlag(bsa, removed) ? 1 : 0;
           }
@@ -264 +280 @@
         if (bas != null)
         {
-          numSubItemsRemoved = removeDependingItems(dc, bas, removed);
+          int[]numTemp = removeDependingItems(dc, bas, removed);
+          numSubItemsRemoved[0] += numTemp[0];
+          numSubItemsRemoved[1] += numTemp[1];
+          
           numItemsRemoved += setRemovedFlag(bas, removed) ? 1 : 0;
           numSubItemsRemoved[1]++;
         }
       }
-      // Remove AnyToAny items this item links to.
-      ItemQuery<AnyToAny> linkedItemQuery = AnyToAny.getLinksFrom((Transformation)item);
-      int[] numAnyToAnyRemoved = removeAnyToAnyLinkedTo(linkedItemQuery.list(dc), removed);
-      numSubItemsRemoved[0] += numAnyToAnyRemoved[0];
-      numSubItemsRemoved[1] += numAnyToAnyRemoved[1];
     }
     
@@ -282 +296 @@
     else if (item instanceof BioAssaySet)
     {
+      numSubItemsRemoved = sumArrays(numSubItemsRemoved, removeFileSetMembers(dc, (BioAssaySet)item, removed));     
       if (removed)
       {
@@ -300 +315 @@
           for (Transformation tf : transformations)
           {
-            numSubItemsRemoved = removeDependingItems(dc, tf, removed);
+            numSubItemsRemoved = sumArrays(numSubItemsRemoved, removeDependingItems(dc, tf, removed));
             numItemsRemoved += setRemovedFlag(tf, removed) ? 1 : 0;
           }
@@ -312 +327 @@
         if (tf != null)
         {
-          numSubItemsRemoved = removeDependingItems(dc, tf, removed);
+          int[]numTemp = removeDependingItems(dc, tf, removed);
+          numSubItemsRemoved[0] += numTemp[0];
+          numSubItemsRemoved[1] += numTemp[1];
           numItemsRemoved += setRemovedFlag(tf, removed) ? 1 : 0;
           numSubItemsRemoved[1]++;
@@ -340 +357 @@
         for (Transformation tf : transformations)
         {
-          numSubItemsRemoved = removeDependingItems(dc, tf, removed);
+          int[]numTemp = removeDependingItems(dc, tf, removed);
+          numSubItemsRemoved[0] += numTemp[0];
+          numSubItemsRemoved[1] += numTemp[1];
           numItemsRemoved += setRemovedFlag(tf, removed) ? 1 : 0;
         }
@@ -350 +369 @@
     return numSubItemsRemoved;
   }
+  
+  private static boolean setRemovedFlag(Removable item, boolean removed)
+  {
+    boolean isRemoved = false;
+    if (item.isRemoved() != removed)
+    {
+      try
+      {
+        item.setRemoved(removed);
+        isRemoved = true;
+      }
+      catch (PermissionDeniedException ex)
+      {}
+    }
+    else
+    {
+      isRemoved = true;
+    }
+    return isRemoved;
+  } 
+  
+  // Adds numbers with same index and returns the summarized array.
+  private static int[] sumArrays(int[] baseArray, int[] newResult)
+  {
+    for (int i=0; i<baseArray.length; i++)
+    {
+      baseArray[i] += newResult[i];
+    } 
+    return baseArray;
+  }
+  
+
   
   /*
     Removes all removable items that are linked to items in a list
    */
-  private static int[] removeAnyToAnyLinkedTo(List<AnyToAny> anyToAnyItems, boolean removed)
-  {
-    int numRemoved = 0;
-    int numTotal  = 0;    
+  private static int[] removeAnyToAnyLinkedTo(DbControl dc, ItemQuery<AnyToAny> any2AnyQuery, boolean removed)
+  {
+    int[] numA2AItemsRemoved = {0,0};
     try
     {
-      for (AnyToAny a2a : anyToAnyItems)
+      for (AnyToAny a2a : any2AnyQuery.list(dc))
       {
         if (a2a.getTo() instanceof Removable) 
         {
           Removable removableItem = (Removable)a2a.getTo();
-          numRemoved += setRemovedFlag(removableItem, removed) ? 1 : 0;
-          numTotal++;
+          if (removableItem instanceof Directory)
+          {
+            numA2AItemsRemoved = removeDependingItems(dc, removableItem, removed);
+          }
+          numA2AItemsRemoved[0] += setRemovedFlag(removableItem, removed) ? 1 : 0;
+          numA2AItemsRemoved[1]++;
         }
       }
     }
     catch (BaseException ex)
+    {} 
+    return numA2AItemsRemoved;
+  }
+  
+  /*
+    Sets all fileset members to be removed
+   */
+  private static int[] removeFileSetMembers(DbControl dc, FileStoreEnabled fileStore, boolean removed)
+  {
+    int[] counter = {0,0};
+    try
+    {
+      ItemQuery<FileSetMember> memberQuery = fileStore.getFileSet().getMembers();
+      for (FileSetMember member : memberQuery.list(dc))
+      {
+        counter[0] += setRemovedFlag(member.getFile(), removed) ? 1 : 0;
+        counter[1]++;
+      }
+    }
+    catch(BaseException ex)
     {}
-    int[] result = new int[]{numRemoved, numTotal}; 
-    return result;
-  }
-
-  private static boolean setRemovedFlag(Removable item, boolean removed)
-  {
-    boolean isRemoved = false;
-    if (item.isRemoved() != removed)
-    {
-      try
-      {
-        item.setRemoved(removed);
-        isRemoved = true;
-      }
-      catch (PermissionDeniedException ex)
-      {}
-    }
-    else
-    {
-      isRemoved = true;
-    }
-    return isRemoved;
-  }
-  
+    return counter;
+  }
+
 }