Changeset 2951

Timestamp:

Nov 24, 2006, 10:03:18 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Moved overwrite of existing file check to job configuration dialogue.

File:

• branches/2.1/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java (modified) (2 diffs)

branches/2.1/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java

@@ -126 +126 @@
           return;
         }
+
+        // checking that we are allowed to overwrite a possibly
+        // existing file
+        DbControl dc = sc.newDbControl();
+        String p = (String)request.getParameterValue(saveAsParameter.getName());
+        if (p.startsWith("~/"))
+        {
+          User user = User.getById(dc, sc.getLoggedInUserId());
+          p = "~" + user.getLogin() + p.substring(1);
+        }
+        Path path = new Path(p, Path.Type.FILE);
+        File file = File.getByPath(dc, path, true);
+        if (!(Boolean)request.getParameterValue(overwriteParameter.getName()) &&
+            file.isInDatabase() && !file.isRemoved())
+        {
+          response.setError("File exists: " + p, null);
+          return;
+        }
+
         storeValue(job, request, bioAssaySetParameter);
         storeValue(job, request, saveAsParameter);
@@ -569 +588 @@
     try
     {
+      // Checks for file existence and file replacement is done in
+      // configure(). Here we either replace an existing file or
+      // create a new file.
       String p = (String)job.getValue("path");
-      if (p.startsWith("~/"))
-      {
-        User user = User.getById(dc, sc.getLoggedInUserId());
-        p = "~" + user.getLogin() + p.substring(1);
-      }
       Path path = new Path(p, Path.Type.FILE);
-
-      boolean overwrite = false;
-      if ((Boolean)job.getValue("overwrite") != null)
-      {
-        overwrite = (Boolean)job.getValue("overwrite");
-      }
-
-      // Get file and set an error if the file already exist but
-      // shouldn't be replaced
       File file = File.getByPath(dc, path, true);
       file.setMimeType("text/plain");
-      if (file.isInDatabase() && !overwrite && !file.isRemoved())
-      {
-        throw new ItemAlreadyExistsException("File[path="+path+"]");
-      }
-      else if(!file.isInDatabase())
-      {
-        dc.saveItem(file);
-      }
+      if(!file.isInDatabase()) dc.saveItem(file);
 
       BioAssaySet bioassayset=(BioAssaySet)job.getValue("bioAssaySet");