Changeset 32757

Timestamp:

2019-02-07T21:32:29+13:00 (5 years ago)

Author:

ak19

Message:

Minor improvements to code and correction to mysql.properties file path

Location:

other-projects/the-macronizer/trunk

Files:

• build.xml (modified) (1 diff)
• src/java/util/MacroniserLogFileProcessor.java (modified) (7 diffs)

other-projects/the-macronizer/trunk/build.xml

@@ -140 +140 @@
             source ${scripts.dir}/MySQL_Code.sql
       
-      3. Edit ${build.dir.exp}/WEB-INF/classes/mysql.properties to set the db password.
+      3. Edit ${basedir}/mysql.properties to set the db password.
         - If you set up a different username for the mysql db, set that in mysql.properties too.
         - If nothing is set, MacronLogFileProcessor will assume the username is root.   

other-projects/the-macronizer/trunk/src/java/util/MacroniserLogFileProcessor.java

@@ -13 +13 @@
 //import MySQLAccess.Tuple;
 
-
 public class MacroniserLogFileProcessor {
     static boolean debug = false;
+    
     /** ARGUMENTS:
      *              /home/wjkw1/RESEARCH_2018-19/bash_test/loggingtest.log
@@ -21 +21 @@
      */
 
-    static final String directInputRegexp = "INFO : \\[\\d\\d\\d\\d\\-\\d\\d\\-\\d\\d \\d\\d:\\d\\d:\\d\\d\\] DirectInput.doPost\\(\\)";
-    static final String fileUploadRegexp = "ERROR: \\[\\d\\d\\d\\d\\-\\d\\d\\-\\d\\d \\d\\d:\\d\\d:\\d\\d\\] FileUpload.doPost\\(\\)";
+    static final String directInputRegexp = "INFO : \\[\\d\\d\\d\\d\\-\\d\\d\\-\\d\\d \\d\\d:\\d\\d:\\d\\d\\] DirectInput.doPost\\(\\)\\s*";
+    static final String fileUploadRegexp = "ERROR: \\[\\d\\d\\d\\d\\-\\d\\d\\-\\d\\d \\d\\d:\\d\\d:\\d\\d\\] FileUpload.doPost\\(\\)\\s*";
 
     static ArrayList<MacroniserLogFileData> extractedEntries;
@@ -33 +33 @@
 
 
-        if(debug) {
+        if(debug) {     
             int count = 0;
             for (MacroniserLogFileData entry : extractedEntries) {
@@ -130 +130 @@
     private static void extractFromLogFile(String filename) {
 
+    ///System.out.println("** In extractFromLogFile: " + filename);
+    
         BufferedReader br = null;
         try {
@@ -140 +142 @@
 
             while ((line = br.readLine())!= null){
+        ///System.out.println("@@@ Read line: " + line);
+        
                 if(!firstTagFound){
                     //check for tag
@@ -145 +149 @@
                     //add to list if the first match
                     if(firstTagFound) {
+            ///System.out.println("Found first tag: " + line);
                         extractedSB.append(line);
                         continue;
@@ -152 +157 @@
                     if(doesLineMatch(line)){
                         //turn the string builder text into MacroniserLogFileData object
+            ///System.out.println("LINE MATCHED: " + line);
+            
                         MacroniserLogFileData entry = transformLogFileStringToObject(extractedSB.toString());
                         //perform operations if not null, else error