Changeset 1508

Timestamp:

Feb 9, 2011, 11:10:38 AM (12 years ago)

Author:

robert@…

Message:

• Made file upload directory configurable (#282)
• Fixed bug in uploading multiple files with the same name (#288)

This will only be fully functional after an update of the gdt plugin.

Location:

trunk

Files:

• grails-app/conf/Config.groovy (modified) (1 diff)
• grails-app/services/dbnp/studycapturing/FileService.groovy (modified) (2 diffs)
• web-app/js/studywizard.js (modified) (1 diff)

trunk/grails-app/conf/Config.groovy

@@ -127 +127 @@
         '/securityinfo/**': ['ROLE_ADMIN']
 ]
+
+// Temporary directory to upload files to.
+// If the directory is given relative (e.g. 'fileuploads/temp'), it is taken relative to the web-app directory
+// Otherwise, it should be given as an absolute path (e.g. '/home/user/sequences')
+// The directory should be writable by the webserver user
+uploads.uploadDir = "fileuploads"

trunk/grails-app/services/dbnp/studycapturing/FileService.groovy

@@ -15 +15 @@
 package dbnp.studycapturing
 
+import java.io.File;
+
 import org.codehaus.groovy.grails.commons.ApplicationHolder
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
 
 class FileService implements Serializable {
@@ -29 +32 @@
      */
     def File getUploadDir() {
-        // Find the absolute path to the fileuploads directory. This code is found on
-        // http://stackoverflow.com/questions/491067/how-to-find-the-physical-path-of-a-gsp-file-in-a-deployed-grails-application
-        //
-        // The code used in NMC-DSP didn't work, because that code only works in
-        // controllers:
-        //    grailsAttributes.getApplicationContext().getResource("/fileuploads").getFile();
-        return ApplicationHolder.application.parentContext.getResource("fileuploads").getFile()
+                // Find the file upload directory name from the configuration
+                String dir = ConfigurationHolder.config.uploads.uploadDir
+
+                if( !dir )
+                        dir = "fileuploads"
+
+                return absolutePath( dir );
     }
+
+        /**
+        * Returns the absolute path for the given pathname. If the pathname is relative, it is taken relative to the web-app directory
+        * @param pathname
+        * @return
+        */
+   private File absolutePath( String pathname ) {
+           if( pathname == null)
+                        return null
+
+           // Check if this is an absolute path
+           File f = new File( pathname );
+
+           if( f.isAbsolute() ) {
+                   return f
+           } else {
+                   // Find the absolute path relative to the web-app directory. This code is found on
+                   // http://stackoverflow.com/questions/491067/how-to-find-the-physical-path-of-a-gsp-file-in-a-deployed-grails-application
+                   return ApplicationHolder.application.parentContext.getResource(pathname).getFile()
+           }
+   }
 
     /**

trunk/web-app/js/studywizard.js

@@ -274 +274 @@
                 onChange : function(file, ext) {
                         oldFile = $('#' + field_id).val();
-                        if (oldFile != '') {
+                        if (oldFile != '' && oldFile != 'existing*' && oldFile != '*deleted*' ) {
                                 if (!confirm('The old file is deleted when uploading a new file. Do you want to continue?')) {
                                         return false;