Changeset 33410 for gs3-extensions

Timestamp:

2019-08-13T21:48:19+12:00 (5 years ago)

Author:

ak19

Message:

Committing some variable name changes before I replace this file with the newer version that doesn't mirror sites with wget but gets WET files and unzips them instead.

File:

• gs3-extensions/maori-lang-detection/src/org/greenstone/atea/NZTLDProcessor.java (modified) (6 diffs)

gs3-extensions/maori-lang-detection/src/org/greenstone/atea/NZTLDProcessor.java

@@ -28 +28 @@
 
     private final ExtractableTextFileFilter extractableTxtFilesFilter = new ExtractableTextFileFilter();    
-    private final String sitesDir = "../dwn-sites";
+    private final String SITES_DIR = "../dwn-sites";
 
     private void log(String msg) {
@@ -116 +116 @@
     log("Processing seed URL: " + nzDomainURL);
 
-    //if(wgetURL(nzDomainURL)) {
-    if(!DEBUG_MODE) { wgetURL(nzDomainURL); } // TODO: take out debug_mode condition
+    //if(wgetMirrorSite(nzDomainURL)) {
+    if(!DEBUG_MODE) { wgetMirrorSite(nzDomainURL); } // TODO: take out debug_mode condition
     
     processDownloadedDir(nzDomainURL);
@@ -125 +125 @@
     }
 
-    // wget will be launched from the specified directory, ../dwn_sites
+    // wget will be launched from the specified directory, SITES_DIR
     // Wget exit status/return codes: https://www.gnu.org/software/wget/manual/html_node/Exit-Status.html
-    public boolean wgetURL(String nzDomainURL) {
+    public boolean wgetMirrorSite(String nzDomainURL) {
     // use SafeProcess and wget command in lib/config.properties
     // DONE: set up logging
 
     
-    String wgetCmd = configProps.getProperty("wget.cmd");
+    String wgetCmd = configProps.getProperty("wget.mirror.cmd");
     if(wgetCmd == null || wgetCmd.equals("")) {
-        System.err.println("Invalid or empty wget.cmd in config.properties");
+        System.err.println("Invalid or empty wget.mirror.cmd in config.properties");
         return false;
     }
@@ -144 +144 @@
 
     String[] wgetCommandArgs = wgetCmd.split(" ");
-    SafeProcess wgetProcess = new SafeProcess(wgetCommandArgs, null, new File(sitesDir));
+    SafeProcess wgetProcess = new SafeProcess(wgetCommandArgs, null, new File(SITES_DIR));
     
     SafeProcess.LineByLineHandler outLineHandler = new ProcessLineHandler(logger, SafeProcess.STDOUT);
@@ -194 +194 @@
     // recurse through the downloaded directory, then process each file
 
-    File downloadedSiteDir = new File(sitesDir, nzDomainURL);
+    File downloadedSiteDir = new File(SITES_DIR, nzDomainURL);
     log("*** Will process download dir " + downloadedSiteDir);
     
@@ -238 +238 @@
     // recurse through the downloaded directory, then process each file
 
-    File downloadedSiteDir = new File(sitesDir, nzDomainURL);
+    File downloadedSiteDir = new File(SITES_DIR, nzDomainURL);
     if(!downloadedSiteDir.exists()) {
         error("*** Expected downloaded site " + downloadedSiteDir + ", but it did not exist!");