Changeset 33758 for main/trunk

Timestamp:

2019-12-07T01:56:06+13:00 (4 years ago)

Author:

ak19

Message:

Removed debugging and last bit of cleanup.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• metadata/DocXMLFile.java (modified) (9 diffs)
• util/Utility.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -64 +64 @@
         ArrayList description_elements_list = null;
                 
-        System.err.println("Looking for key " + file_relative_path);
+        ///System.err.println("Looking for key " + file_relative_path);
         description_elements_list = (ArrayList) source_file_name_to_description_elements_mapping.get(file_relative_path);
         if(description_elements_list != null) {
-            System.err.println("   Found key matching REGULAR filepath: " + file_relative_path);
+            ///System.err.println("   Found key matching REGULAR filepath: " + file_relative_path);
             return description_elements_list;           
         }
         else if(!Utility.isWindows()) { // couldn't find a matching key, we're done
-            System.err.println("Unable to find meta for regular file path form " + file_relative_path);
+            ///System.err.println("Unable to find ex.meta for regular file path form " + file_relative_path);
             return null;
         }
@@ -92 +92 @@
         }
             
-        System.err.println("### Looking for Windows short file name |" + win_short_file_relative_path +  "| in map of sourcefilenames to doc.xml's ex meta.");
+        ///System.err.println("### Looking for Windows short file name |" + win_short_file_relative_path +  "| in map of sourcefilenames to doc.xml's ex meta.");
         description_elements_list = (ArrayList) source_file_name_to_description_elements_mapping.get(win_short_file_relative_path);
         if (description_elements_list != null) {
-            System.err.println("   Found key matching FULL win shortfile path: " + win_short_file_relative_path);
+            ///System.err.println("   Found key matching FULL win shortfile path: " + win_short_file_relative_path);
             return description_elements_list; // found
         }
@@ -120 +120 @@
         
         String path = shortFileRelDirPath + fileTailName;
-        System.err.println("### Looking for Windows short file name |" + path +  "| in map of sourcefilenames to doc.xml's ex meta.");
+        ///System.err.println("### Looking for Windows short file name |" + path +  "| in map of sourcefilenames to doc.xml's ex meta.");
         description_elements_list = (ArrayList) source_file_name_to_description_elements_mapping.get(path);
         
         if(description_elements_list != null) {
-            System.err.println("   Found key matching MIX of win shortfile path and regular path: " + path);
+            ///System.err.println("   Found key matching MIX of win shortfile path and regular path: " + path);
             return description_elements_list; // found
         }
@@ -130 +130 @@
         // try the other combination
         path = fileRelDirPath + shortFileTailName;
-        System.err.println("### Looking for Windows short file name |" + path +  "| in map of sourcefilenames to doc.xml's ex meta.");
+        ///System.err.println("### Looking for Windows short file name |" + path +  "| in map of sourcefilenames to doc.xml's ex meta.");
         description_elements_list = (ArrayList) source_file_name_to_description_elements_mapping.get(path);
         
         if(description_elements_list != null) {
-            System.err.println("   Found key matching MIX of regular path and win shortfile path: " + path);
+            ///System.err.println("   Found key matching MIX of regular path and win shortfile path: " + path);
             return description_elements_list; // found
         }       
         
-        return description_elements_list;
+        // could not find gsdlsourcefilename in map
+        ///System.err.println("Unable to find ex.meta for regular file path form " + file_relative_path);
+        ///System.err.println("    Or for windows shortFile path form, or for combinations with regular file path form");       
+        
+        return description_elements_list; // returns null at this point
     }
     
@@ -153 +157 @@
     }
 
-    for (Object relFilename : source_file_name_to_description_elements_mapping.keySet()) {
-        System.err.println("\n@@@ relFilename: " + relFilename);
-    }
+    ///for (Object relFilename : source_file_name_to_description_elements_mapping.keySet()) {
+    ///    System.err.println("\n@@@ relFilename: " + relFilename);
+    ///}
     
     // Check whether this file (i.e. doc.xml or docmets.xml on inheritance) file contains extracted metadata for the specified file
@@ -162 +166 @@
     if (description_elements_list == null) {
             // ...it doesn't
-            System.err.println("Unable to find meta for (regular file path form) " + file_relative_path);
-            if(Utility.isWindows()) {
-                System.err.println("    Or for windows shortFile path form, or for combinations with regular file path form");
-            }
             return metadata_values; // we're done
     }
@@ -363 +363 @@
             }
             
-            System.err.println("@@@@ Found gsdlsourcefilename: " + gsdlsourcefilename_value);
+            ///System.err.println("@@@@ Found gsdlsourcefilename: " + gsdlsourcefilename_value);
             // Remember this for quick access later
             if (source_file_name_to_description_elements_mapping.get(gsdlsourcefilename_value) == null) {
@@ -467 +467 @@
         // General info: https://stackoverflow.com/questions/43089541/difference-between-basic-and-url-base64-encoding-in-java-8
         byte[] bytes = Base64.decodeBase64(importFilePathParts[i].getBytes());
-        System.err.println("Got base64 string: " + importFilePathParts[i]);
-        System.err.println("Decoded from base64 to bytes: " + new String(bytes, System.getProperty("file.encoding")));
+        ///System.err.println("Got base64 string: " + importFilePathParts[i]);
+        ///System.err.println("Decoded from base64 to bytes: " + new String(bytes, System.getProperty("file.encoding")));
         // Using system file.encoding to interpret the resulting bytestring as a String,
         // just as we always did with URL decoding method
@@ -485 +485 @@
     decoded_gsdlsourcefilename += file_ext;
     
-    System.err.println("@@@@ decoded_gsdlsourcefilename: " + Utility.debugUnicodeString(decoded_gsdlsourcefilename));
+    ///System.err.println("@@@@ decoded_gsdlsourcefilename: " + Utility.debugUnicodeString(decoded_gsdlsourcefilename));
 
     return decoded_gsdlsourcefilename;

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -147 +147 @@
         throws IOException, InterruptedException {
 
-        /*
-        String path = getAbsolutePath(fileName);
-        
-        changed "+ fileName.toUpperCase() +" to "path"
-        Process process =
-            Runtime.getRuntime().exec(
-                "cmd /c for %I in (\"" + path + "\") do @echo %~fsI");
-        
-        process.waitFor();
-        
-        byte[] data = new byte[65536];
-        int size = process.getInputStream().read(data);
-
-        if (size <= 0) {
-            return null;
-        }
-
-        return new String(data, 0, size).replaceAll("\\r\\n", "");
-        */
         String path = getAbsolutePath(fileName);