Changeset 4382

Timestamp:

Aug 7, 2008, 9:02:13 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1069: New mode for Import reporters to reporterlist - Add existing without risk of updating or creating

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/ReporterFlatFileImporter.java (modified) (9 diffs)

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

@@ -393 +393 @@
   private ReporterList reporterList;
   private boolean updateExisting;
+  private boolean createMissing;
   private boolean deleteMode;
   private int numInserted;
@@ -422 +423 @@
     reporterType = (ReporterType)configuration.getValue("reporterType");
     reporterList = (ReporterList)job.getValue("reporterList");
+    String mode = (String)job.getValue("mode");
     if (reporterList != null) 
     {
@@ -427 +429 @@
       deferred = new HashMap<String, Float>();
       numAddedToList = 0;
-    }
-    String mode = (String)job.getValue("mode");
-    updateExisting = "update".equals(mode);
-    deleteMode = "delete".equals(mode);
+      deleteMode = "remove".equals(mode);
+      updateExisting = false;
+      createMissing = false;
+    }
+    else
+    {
+      updateExisting = "update".equals(mode);
+      createMissing = updateExisting || "create".equals(mode);
+      deleteMode = "delete".equals(mode);
+    }
     this.ffp = ffp;
     this.numberFormat = ffp.getDefaultNumberFormat();
@@ -592 +600 @@
         {
           // It wasn't in the database either, create a new reporter
-          reporter = Reporter.getNew(externalId);
+          numNotFound++;
+          if (createMissing)
+          {
+            reporter = Reporter.getNew(externalId);
+          }
         }
       }
@@ -666 +678 @@
   {
     String msg;
-    if (deleteMode)
-    {
-      msg = numDeleted + " deleted reporter(s)";
-      if (numUsed > 0) msg += "; " + numUsed + " reporter(s) are used and could not be deleted";
+    if (reporterList != null)
+    {
+      if (deleteMode)
+      {
+        msg = numDeleted + " reporter(s) removed from list";
+      }
+      else
+      {
+        msg = numAddedToList + " reporter(s) added to list";
+      }
       if (numNotFound > 0) msg += "; " + numNotFound + " reporter(s) ignored because they didn't exist";
     }
     else
     {
-      msg = numInserted + " new reporter(s)";
-      if (numUpdated > 0) msg += "; " + numUpdated + " updated reporter(s)";
-      if (numExists > 0) msg += "; " + numExists + " reporter(s) skipped (already existed)";  
-      if (reporterList != null) msg += "; " + numAddedToList + " reporter(s) added to list";
+      if (deleteMode)
+      {
+        msg = numDeleted + " deleted reporter(s)";
+        if (numUsed > 0) msg += "; " + numUsed + " reporter(s) are used and could not be deleted";
+        if (numNotFound > 0) msg += "; " + numNotFound + " reporter(s) ignored because they didn't exist";
+      }
+      else
+      {
+        msg = numInserted + " new reporter(s)";
+        if (numUpdated > 0) msg += "; " + numUpdated + " updated reporter(s)";
+        if (numExists > 0)
+        {
+          msg += "; " + numExists + " reporter(s) skipped (already existed)"; 
+        }
+      }
     }
     if (skippedLines > 0) msg += "; " + skippedLines + " line(s) skipped due to errors";
@@ -721 +750 @@
       // RequestInformation for CONFIGURE_JOB
       List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
-      if (context != null && 
-        (context.getItem() == Item.REPORTERLIST || context.getItem() == Item.REPORTERSCORE))
+      boolean reporterListContext = context != null && 
+      (context.getItem() == Item.REPORTERLIST || context.getItem() == Item.REPORTERSCORE);
+      
+      if (reporterListContext)
       {
         ItemParameterType<ReporterList> reporterListType = new ItemParameterType<ReporterList>(ReporterList.class, null, true, 1, null);
@@ -734 +765 @@
       parameters.add(fileParameter);
       
+      boolean deletePermission = sc.hasPermission(Permission.DELETE, Item.REPORTER);
+      boolean createPermission = sc.hasPermission(Permission.CREATE, Item.REPORTER);
+      boolean writePermission = sc.hasPermission(Permission.WRITE, Item.REPORTER);
+      
       List<String> allowedModes = new ArrayList<String>();
-      String defaultMode = "update";
-      allowedModes.add("create");
-      allowedModes.add("update");
-      if (context.getItem() != Item.REPORTER || sc.hasPermission(Permission.DELETE, Item.REPORTER)) 
-      {
-        allowedModes.add("delete");
+      String modeDescription = "";
+      String defaultMode = null;
+      if (reporterListContext)
+      {
+        allowedModes.add("add");
+        allowedModes.add("remove");
+        defaultMode = "add";
+        modeDescription = 
+          "Select the operating mode of the plug-in. When adding/removing to/from a " +
+          "reporter list, reporters will not be created or updated.\n\n" +
+          "add = Add reporters to the reporter list\n" +
+          "remove = Remove reporter from the reporter list";
+      }
+      else 
+      {
+        modeDescription = "Select the operating mode of the plug-in.\n\n";
+        if (createPermission) 
+        {
+          allowedModes.add("create");
+          modeDescription += "create = Only create missing reporters; existing ones are not updated\n";
+        }
+        if (writePermission) 
+        {
+          allowedModes.add("update");
+          defaultMode = "update";
+          modeDescription += "update = Update existing reporters and create missing ones\n";
+        }
+        if (deletePermission) 
+        {
+          allowedModes.add("delete");
+          modeDescription += "delete = Delete existing reporters\n";
+        }
       }
       StringParameterType modeType = new StringParameterType(255, defaultMode, false, 1, 0, 0, allowedModes);
@@ -746 +807 @@
           "mode",
           "Mode",
-          "Select the operating mode of the plug-in. Depending on permissions not all modes " +
-          "may be available\n\n" +
-          "create = Only create missing reporters; existing ones are not updated\n" +
-          "update = Update existing reporters and create missing ones\n" +
-          "delete = Delete existing reporters",
+          modeDescription,
           modeType
           );
@@ -766 +823 @@
       parameters.add(numberFormatErrorParameter);
       parameters.add(numberOutOfRangeErrorParameter);
-      parameters.add(reporterIsUsedErrorParameter);
-      
+      if (!reporterListContext)
+      {
+        parameters.add(reporterIsUsedErrorParameter);
+      }
       configureJob = new RequestInformation
       (