Changeset 24962 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2012-01-24T10:10:05+13:00 (12 years ago)

Author:

sjm84

Message:

Some fixes to file uploading

File:

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

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

@@ -357 +357 @@
 
         String query_string;
-        if(request.getMethod().equals("GET"))
-        {
-            query_string = request.getQueryString();    
-        }
-        else if(request.getMethod().equals("POST"))
+        if (request.getMethod().equals("GET"))
+        {
+            query_string = request.getQueryString();
+        }
+        else if (request.getMethod().equals("POST"))
         {
             query_string = "";
             Map paramMap = request.getParameterMap();
             Iterator keyIter = paramMap.keySet().iterator();
-            
-            while(keyIter.hasNext())
-            {
-                String current = (String)keyIter.next();
-                query_string += current + "=" + ((String[])paramMap.get(current))[0];
-                if(keyIter.hasNext())
+
+            while (keyIter.hasNext())
+            {
+                String current = (String) keyIter.next();
+                query_string += current + "=" + ((String[]) paramMap.get(current))[0];
+                if (keyIter.hasNext())
                 {
                     query_string += "&";
                 }
             }
-            
+
             DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
 
@@ -386 +386 @@
             ServletFileUpload uploadHandler = new ServletFileUpload(fileItemFactory);
 
+            String storageLocation = "";
+            File uploadedFile = null;
             try
             {
                 List items = uploadHandler.parseRequest(request);
                 Iterator iter = items.iterator();
-                while(iter.hasNext())
+                while (iter.hasNext())
                 {
                     FileItem current = (FileItem) iter.next();
-                    if(current.isFormField())
+                    if (current.isFormField())
                     {
                         query_string += current.getFieldName() + "=" + current.getString();
-                        if(iter.hasNext())
+                        if (iter.hasNext())
                         {
                             query_string += "&";
                         }
+                        
+                        if(current.getFieldName().equals(GSParams.FILE_LOCATION))
+                        {
+                            storageLocation = current.getString();
+                        }
                     }
                     else
                     {
                         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())
+                        {
+                            tmpFolder.mkdirs();
+                        }
                         current.write(file);
-                    }
-                }
-            }
-            catch (Exception e) 
+                        
+                        uploadedFile = file;
+                    }
+                }
+                
+                if(!storageLocation.equals("") && uploadedFile != null)
+                {
+                    File toFile = new File(GlobalProperties.getGSDL3Home() + storageLocation);
+                    if(toFile.exists())
+                    {
+                        logger.error("Cannot move the stored file because the file \"" + storageLocation + "\" already exists");
+                    }
+                    else
+                    {
+                        logger.info("Moving uploaded file (" + uploadedFile.getAbsolutePath() + ") to " + toFile.getAbsolutePath());
+                        uploadedFile.renameTo(toFile);
+                    }
+                }
+            }
+            catch (Exception e)
             {
                 logger.error("Exception in LibraryServlet -> " + e.getMessage());
             }
-            
-            if(query_string.equals(""))
+
+            if (query_string.equals(""))
             {
                 query_string = null;
@@ -422 +450 @@
             query_string = null;
         }
-        
+
         if (query_string != null)
         {
@@ -473 +501 @@
             session.setAttribute(GSXML.USER_ID_ATT, uid);
         }
+
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html;charset=UTF-8");