Changeset 25717 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/FileLoaderServlet.java

Timestamp:

2012-05-30T15:34:25+12:00 (12 years ago)

Author:

sjm84

Message:

Added a BaseGreenstoneServlet servlet that the other servlets now inherit from so that we can be sure that GlobalProperties is properly initialised. There is also some reformatting and import cleaning

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/FileLoaderServlet.java (modified) (9 diffs)

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

@@ -1 +1 @@
 package org.greenstone.gsdl3;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.nio.channels.FileChannel;
 import java.util.Iterator;
@@ -7 +11 @@
 import java.util.Map;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.fileupload.FileItem;
@@ -48 +54 @@
                             storageLocation = current.getString();
                         }
-                        
+
                         if (current.getFieldName().equals("ajaxUpload") && current.getString().equals("true"))
                         {
@@ -65 +71 @@
 
                         uploadedFile = file;
-                        
-                        if(!json.toString().equals("["))
+
+                        if (!json.toString().equals("["))
                         {
                             json.append(",");
                         }
-                        
+
                         json.append("{");
                         json.append("\"name\":\"" + file.getName() + "\",");
@@ -82 +88 @@
                 }
                 json.append("]");
-                
-                if(ajaxUpload)
+
+                if (ajaxUpload)
                 {
                     response.setContentType("application/json");
@@ -89 +95 @@
                     writer.write(json.toString());
                     writer.flush();
-                    
+
                     return;
                 }
@@ -141 +147 @@
             Map<String, String[]> queryMap = request.getParameterMap();
             Iterator<String> queryIter = queryMap.keySet().iterator();
-            
-            while(queryIter.hasNext())
+
+            while (queryIter.hasNext())
             {
                 String q = queryIter.next();
@@ -149 +155 @@
                     String fileLocation = queryMap.get(q)[0];
                     File fileToGet = new File(GlobalProperties.getGSDL3Home() + File.separator + fileLocation);
-    
+
                     if (fileToGet.exists())
                     {
                         response.setContentType("application/octet-stream");
-                        response.addHeader("Content-Disposition","attachment;filename=" + fileToGet.getName());
+                        response.addHeader("Content-Disposition", "attachment;filename=" + fileToGet.getName());
                         FileInputStream fis = new FileInputStream(fileToGet);
                         ServletOutputStream sos = response.getOutputStream();
-    
+
                         byte[] buffer = new byte[4096];
                         int len;
@@ -166 +172 @@
                         fis.close();
                         sos.close();
-                        
+
                         return;
                     }