Changeset 31962 for other-projects/the-macronizer/trunk/src/java/web/servlets/FileUpload.java

Timestamp:

2017-09-12T17:19:04+12:00 (7 years ago)

Author:

rmw36

Message:

Macronizer changes: 1. adding an ethical disclaimer to the main web page (temporarily still in English for the Maori jsp file too, but Te Taka will be translating this.) 2. Adding more logging to the macronizer. This required setting up a log4j.properties file (and adding its jar file copied from GS3), and modifying the existing java code DirectInput and FileUpload to make calls to logger. Modifications to build.xml to copy the new template log4j.properties.in file into web/WEB-INF/classes where the log4j.props needs to live. 3. Corrected the svn mime-type property on build.xml so that it's no longer mistaken for a binary file

File:

• other-projects/the-macronizer/trunk/src/java/web/servlets/FileUpload.java (modified) (6 diffs)

other-projects/the-macronizer/trunk/src/java/web/servlets/FileUpload.java

@@ -1 +1 @@
 package web.servlets;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
+import java.lang.StringBuilder;
 import java.util.List;
 import javax.servlet.RequestDispatcher;
@@ -16 +19 @@
 import util.FileUtil;
 import monogram.plugin.PluginManager;
+import org.apache.log4j.*;
 
 /**
@@ -25 +29 @@
 
     private File tmpdir;
+
+    //Create an instance of the Logger object created for this class in log4j.properties            
+    static Logger logger = Logger.getLogger(web.servlets.DirectInput.class.getName());
 
     @Override
@@ -77 +84 @@
             request.setAttribute("options", properties.getOptions());
             forward(address + "/main.jsp", request, response);
+        String outputText = stringFromFile(restoredFile);
+        logger.error("Output:"+outputText);
         } catch (UnsupportedOperationException e) {
             FileUtil.deleteFile(restoredFile);
@@ -126 +135 @@
                     requestData.setFile(file);
                     requestData.setFilename(item.getName());
+            String logText=stringFromFile(file);
+            logger.error("Input:"+logText);
                 }
             }
@@ -133 +144 @@
         return requestData;
     }
-
+    
+    private String stringFromFile(File file)throws IOException{
+    BufferedReader reader = new BufferedReader(new FileReader(file));
+    String line = null;
+    StringBuilder sb = new StringBuilder();
+    try{
+        while((line=reader.readLine())!=null){
+        sb.append(line);
+        }
+        return sb.toString();
+    }
+    catch (Exception e){
+        e.printStackTrace();
+    }
+    finally{
+        reader.close();
+    }
+    }
+    
     private PluginConfiguration configure(Properties properties) {
         final File file = properties.getFile();