Changeset 31962 for other-projects/the-macronizer/trunk/src/java/web/servlets/DirectInput.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/DirectInput.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import monogram.plugin.PluginConfiguration;
 import monogram.plugin.PluginManager;
+import org.apache.log4j.*;
 
 /**
@@ -32 +33 @@
     private final String UNEXPECTED_ERROR = "An unexpected error has occurred. Please try again or contact the web administrator if the problem persists.";
     private final String UTF8_ENCODING = "utf-8";
-    public static boolean DI; // This will be used in a test in the mongramRestorer to add html to highligth the changes on the webpage output. 
+    public static boolean DI; // This will be used in a test in the mongramRestorer to add html to highlight the changes on the webpage output. 
     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
@@ -86 +89 @@
         File file = File.createTempFile("mi-tmp-", ".txt", tmpdir);
         write(file, "utf-8", fragment);
-
+        
         //Create a fileview
         PluginConfiguration configuration = new PluginConfiguration();
@@ -107 +110 @@
             RequestDispatcher dispatcher = this.getServletContext().getRequestDispatcher(path + "/main.jsp");
             dispatcher.forward(request, response);
+        //Generate an "info" level logger message including the input('fragment') and output('restoredFragment')
+        logger.info("Input:"+fragment+"Output: "+restoredFragment);
         } catch (Exception e) {
            request.setAttribute("errorMessage", UNEXPECTED_ERROR);
            forward(path + "/error.jsp", request, response);
         } finally {
-            file.delete();
-        if (restoredFile != null) {
-        restoredFile.delete();
-        }
+     file.delete();
+      if (restoredFile != null) {
+        restoredFile.delete();
+      }
         }
     }