Changeset 4597

Timestamp:

Oct 22, 2008, 11:46:10 AM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #1142 Lack of permission when trying to write to an item or use a reference is now handled. The last case covers also when an array slide is used by another hyb.

Location:

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport

Files:

• AbstractItemImporter.java (modified) (8 diffs)
• HybridizationImporter.java (modified) (1 diff)

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java

@@ -241 +241 @@
     );
   
-  private static final PluginParameter<String> lackOfUsePermissionOnReferencedItemErrorParameter = new PluginParameter<String>(
-      "lackOfUsePermissionOnReferencedItemError",
-      "Lack of use permission on referenced item",
-      "What to do if the plug-in finds a referenced item and has no permission to use it.\n\n"+
+  private static final PluginParameter<String> noWritePermissionToItemErrorParameter = new PluginParameter<String>(
+      "noWritePermissionToItemError",
+      "Not granted write permission to item",
+      "What to do if the plug-in finds an existing item but has no write permission to it.\n\n"+
+      "skip = Skip the current data line and continue.\n"+
+      "fail = Stop with an error message",
+      new StringParameterType(255, null, false, 1, 0, 0, 
+        Arrays.asList( new String[] { "skip", "fail"} ))
+    );
+  
+  private static final PluginParameter<String> noUsePermissionToReferenceErrorParameter = new PluginParameter<String>(
+      "noUsePermissionToReferenceError",
+      "Not granted use permission to reference",
+      "What to do if the plug-in finds a reference but has no permission to use it.\n\n"+
       "ignore = Do not set/update the reference\n" +
       "fail = Stop with an error message",
@@ -414 +424 @@
         storeValue(job, request, numberFormatErrorParameter);
         storeValue(job, request, numberOutOfRangeErrorParameter);
-        storeValue(job, request, lackOfUsePermissionOnReferencedItemErrorParameter);
+        storeValue(job, request, noWritePermissionToItemErrorParameter);
+        storeValue(job, request, noUsePermissionToReferenceErrorParameter);
         
         // Save context info
@@ -476 +487 @@
   private boolean failIfNotFoundReference;
   private boolean failIfMultipleFoundReferences;
-  private boolean failIfNoUsePermissionOnReference;
+  private boolean failIfNoWritePermissionToItem;
+  private boolean failIfNoUsePermissionToReference;
   
   // Status report
@@ -530 +542 @@
     this.failIfNotFoundReference = "fail".equals(getErrorOption("referenceNotFoundError"));
     this.failIfMultipleFoundReferences = "fail".equals(getErrorOption("multipleReferencesFoundError"));
-    this.failIfNoUsePermissionOnReference = "fail".equals(getErrorOption("lackOfUsePermissionOnReferencedItemError"));
+    this.failIfNoWritePermissionToItem = "fail".equals(getErrorOption("noWritePermissionToItemError"));
+    this.failIfNoUsePermissionToReference = "fail".equals(getErrorOption("noUsePermissionToReferenceError"));
+    
     this.cropStrings = "crop".equals(getErrorOption("stringTooLongError"));
 
@@ -565 +579 @@
     if (Boolean.TRUE.equals((Boolean)job.getValue("includeOthers"))) includes.add(Include.OTHERS);
     itemQuery = idMethod.prepareQuery(dc, createItemQuery());
-    itemQuery.setItemPermission(Permission.WRITE);
     itemQuery.include(includes);
   }
@@ -606 +619 @@
       else
       {
+        // and only query the database if not found
         List<I> items = idMethod.find(dc, itemQuery, identifier);
-        // and only query the database if not found
-        if (items.size() == 1)
-        {
-          item = items.get(0);
+        // pick out items on which write permission is granted
+        List<I> writableItems = new ArrayList<I>();
+        for (I i : items)
+        {
+          if (i.hasPermission(Permission.WRITE))
+          {
+            writableItems.add(i);
+          }
+        }
+        if (writableItems.size() == 1)
+        {
+          item = writableItems.get(0);
           itemCache.put(cacheKey, item);
         }
-        else if (items.size() > 1)
+        else if (writableItems.size() > 1)
         {
           // If we find multiple items, we either throw an error or do nothing
           if (failIfMultipleFoundItems)
           {
-            throw new BaseException("Found " + items.size() + " items [" + idMethod + "=" + identifier + "]");
+            throw new BaseException("Found " + writableItems.size() + " items [" + idMethod + "=" + identifier + "]");
           }
-          log("Found " + items.size() + " items: " + idMethod + "=" + identifier, data);
+          log("Found " + writableItems.size() + " items: " + idMethod + "=" + identifier, data);
+          return;
+        }
+        else if (items.size() > 0) 
+        {
+          // Found item(s) but none with write permission to. Either throw an exception or do nothing
+          if (failIfNoWritePermissionToItem)
+          {
+            throw new PermissionDeniedException(Permission.WRITE, 
+                itemQuery.getItemType()+"[" + idMethod + "=" + identifier + "]");
+          }
+          log("Not granted write permission to " + itemQuery.getItemType()+"[" + idMethod + "=" + identifier + "]", data);
           return;
         }
@@ -1576 +1609 @@
         {
           // No use permission on item
-          if (failIfNoUsePermissionOnReference)
+          if (failIfNoUsePermissionToReference)
           {
             throw new PermissionDeniedException(Permission.USE, itemType+"[" +idMethod + "=" + identifier + "]");
@@ -1776 +1809 @@
       if (!updateMode) parameters.add(itemExistsErrorParameter);
       parameters.add(multipleItemsFoundErrorParameter);
-      parameters.add(lackOfUsePermissionOnReferencedItemErrorParameter);
+      if (updateMode) parameters.add(noWritePermissionToItemErrorParameter);
       parameters.add(referenceNotFoundErrorParameter);
+      parameters.add(noUsePermissionToReferenceErrorParameter);
       parameters.add(multipleReferencesFoundErrorParameter);
       parameters.add(Parameters.invalidUseOfNullError(null, null, null));

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/HybridizationImporter.java

@@ -255 +255 @@
       if (slide != null && slide.isUsedByOther(hyb))
       {
-        // NOTE! There is currently no error handling option to bypass this
-        // It will be implemented in 2.9
-        throw new PermissionDeniedException(Permission.USE, 
-          slide + ". It is already used by another hybridization.");
+        if ("fail".equals(getErrorOption("noUsePermissionToReferenceError")))
+        {
+          throw new PermissionDeniedException(Permission.USE, 
+            slide + ". It is already used by another hybridization.");
+        }
       }
-      if (nameOrId == null || slide != null) hyb.setArraySlide(slide);
+      else if (nameOrId == null || slide != null) hyb.setArraySlide(slide);
     }
     updateMultiLineItem(dc, hyb, data, 0);