Changeset 24967 for main

Timestamp:

2012-01-24T15:19:50+13:00 (12 years ago)

Author:

sjm84

Message:

Multiple files can now be specified using the fl parameter, separated by :

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -402 +402 @@
                             query_string += "&";
                         }
-                        
-                        if(current.getFieldName().equals(GSParams.FILE_LOCATION))
+
+                        if (current.getFieldName().equals(GSParams.FILE_LOCATION))
                         {
                             storageLocation = current.getString();
@@ -412 +412 @@
                         File file = new File(GlobalProperties.getGSDL3Home() + File.separator + "tmp" + File.separator + current.getName());
                         File tmpFolder = new File(GlobalProperties.getGSDL3Home() + File.separator + "tmp");
-                        if(!tmpFolder.exists())
+                        if (!tmpFolder.exists())
                         {
                             tmpFolder.mkdirs();
                         }
                         current.write(file);
-                        
+
                         uploadedFile = file;
                     }
                 }
-                
-                if(!storageLocation.equals("") && uploadedFile != null)
-                {
-                    File toFile = new File(GlobalProperties.getGSDL3Home() + storageLocation);
-                    if(toFile.exists())
-                    {
-                        File backupFile = new File(toFile.getAbsolutePath() + System.currentTimeMillis());
-                        
+
+                if (!storageLocation.equals("") && uploadedFile != null)
+                {
+                    String[] locations = storageLocation.split(":");
+
+                    for (String location : locations)
+                    {
+                        File toFile = new File(GlobalProperties.getGSDL3Home() + location);
+                        if (toFile.exists())
+                        {
+                            File backupFile = new File(toFile.getAbsolutePath() + System.currentTimeMillis());
+
+                            logger.info("Backing up file (" + toFile.getAbsolutePath() + ") to " + backupFile.getAbsolutePath());
+                            toFile.renameTo(backupFile);
+                        }
+
                         logger.info("Moving uploaded file (" + uploadedFile.getAbsolutePath() + ") to " + toFile.getAbsolutePath());
-                        toFile.renameTo(backupFile);
-                    }
-                    
-                    logger.info("Moving uploaded file (" + uploadedFile.getAbsolutePath() + ") to " + toFile.getAbsolutePath());
-                    uploadedFile.renameTo(toFile);
+                        uploadedFile.renameTo(toFile);
+                    }
                 }
             }