Changeset 33887 for other-projects/maori-lang-detection/src/org/greenstone/atea/WebPageURLsListing.java

Timestamp:

2020-01-31T23:49:11+13:00 (4 years ago)

Author:

ak19

Message:

1. Added support for writing out tables in csv format too. 2. Second table written out now. 3. Moved getFilePath() into Utility.

File:

• other-projects/maori-lang-detection/src/org/greenstone/atea/WebPageURLsListing.java (modified) (9 diffs)

other-projects/maori-lang-detection/src/org/greenstone/atea/WebPageURLsListing.java

@@ -55 +55 @@
     }
 
-    private String getFilePath(File file) {
-    try {
-        return file.getCanonicalPath();
-    } catch(IOException e) {
-        return file.getAbsolutePath();
-    }
-    }
     
     public void produceURLsForPagesInMRI(File domainsFile) {
@@ -69 +62 @@
     
     System.out.println("Wrote all isMRI web page URLs for the sites in input domainsFile\ninto file: "
-               + getFilePath(outFile));
+               + Utility.getFilePath(outFile));
     }
     
@@ -78 +71 @@
 
     System.out.println("Wrote all containsMRI web page URLs for the sites in input domainsFile\ninto file: "
-               + getFilePath(outFile));
+               + Utility.getFilePath(outFile));
     }
     
@@ -120 +113 @@
         System.err.println("");
     } catch(Exception e) {
-        logger.error("Unable to read URLs from file " + getFilePath(domainsFile));
+        logger.error("Unable to read URLs from file " + Utility.getFilePath(domainsFile));
         logger.error(e.getMessage(), e);
     }
@@ -159 +152 @@
     writeURLsToFile(urlsList, outFile, N_totalNumPages);
     System.out.println("Wrote out full listing of web page URLs for sites in input domainsFile"
-               + "\ninto file: " + getFilePath(outFile));
+               + "\ninto file: " + Utility.getFilePath(outFile));
         
     // 3. calculate sample size n for population size N if using 90% confidence and 5% margin of error
@@ -175 +168 @@
     writeURLsToFile(urlsList, outFile, n_numSampleURLs);
     System.out.println("Wrote a sample of n=" + n_numSampleURLs + " of web page URLs "
-               + "for the sites in input domainsFile\ninto file: " + getFilePath(outFile));
+               + "for the sites in input domainsFile\ninto file: " + Utility.getFilePath(outFile));
     }
 
@@ -219 +212 @@
         }
     } catch(Exception e) {
-        logger.error("Unable to write to file " + getFilePath(outFile));
+        logger.error("Unable to write to file " + Utility.getFilePath(outFile));
         logger.error(e.getMessage(), e);
     }
@@ -237 +230 @@
     File outFile = new File(outFolder, "5a_counts_tentativeNonAutotranslatedSites.json");
 
-    String filename = getFilePath(outFile);
+    String filename = Utility.getFilePath(outFile);
     
     try (
@@ -268 +261 @@
     File outFile = new File(outFolder, "5b_counts_overseasSitesWithMiInPath.json");
 
-    String filename = getFilePath(outFile);
+    String filename = Utility.getFilePath(outFile);
     try (
          Writer writer = new BufferedWriter(new FileWriter(outFile));