JBAS-1688 Backstage quarterly file/url name repair

Quarterly files come from the FTP server, monthly files come from the
HTTP server.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/KCLS/authority-control/backstage/backstage-agent.sh b/KCLS/authority-control/backstage/backstage-agent.sh
index b069f94..964dbf7 100755 (executable)
--- a/KCLS/authority-control/backstage/backstage-agent.sh
+++ b/KCLS/authority-control/backstage/backstage-agent.sh
@@ -8,10 +8,8 @@
 # PGHOST and PGPASSWORD may also need to be set.
 # ----------------------------------------------------------------
 BACKSTAGE_PUT_URL="ftp://ftp.bslw.com/in"
-# TODO: determine pickup location of quarterly result files
-#BACKSTAGE_GET_URL="ftp://ftp.bslw.com/out"
-# XXX: this is where monthly auth files are delivered.
-BACKSTAGE_GET_URL="http://mars.bslw.com/ftpfiles/NTG"
+BACKSTAGE_GET_URL_FTP="ftp://ftp.bslw.com/out"
+BACKSTAGE_GET_URL_HTTP="http://mars.bslw.com/ftpfiles/NTG"
 WORKING_DIR_BASE="/openils/var/data/authority-control/backstage"
 REPORTS_DIR_BASE="/openils/var/web/standalone/backstage"
 
@@ -45,6 +43,7 @@ function bs_check_creds {
 function bs_get_file {
     FILE_NAME="$1"
     DEST_DIR="$2"
+    PROTO="$3"
 
     [ -z "$FILE_NAME" -o -z "$DEST_DIR" ] && \
         die "bs_get_file() requires file name and destination directory"
@@ -58,16 +57,21 @@ function bs_get_file {
     # get the file, then return.
     cd $DEST_DIR;
 
+    if [ "$PROTO" = "HTTP" ]; then
+        URL="$BACKSTAGE_GET_URL_HTTP/$FILE_NAME"
+    else
+        URL="$BACKSTAGE_GET_URL_FTP/$FILE_NAME"
+    fi
+
     if [ -f $FILE_NAME ]; then
         echo "Backstage file already retrieved: $FILE_NAME"
 
     else
         echo "Fetching Backstage file $FILE_NAME"
 
-        $CURL -O "$BACKSTAGE_GET_URL/$FILE_NAME"
+        $CURL -O "$URL"
 
-        [ "$?" != 0 ] && \
-            die "curl failed to retrieve file: $BACKSTAGE_GET_URL/$FILE_NAME"
+        [ "$?" != 0 ] && die "curl failed to retrieve file: $URL"
     fi;
 
     cd $SCRIPT_DIR;
@@ -98,7 +102,7 @@ function bs_import_monthly_auths {
 
     FILE="NTG${CUR_YEAR2}${CUR_MONTH}N.zip"
 
-    bs_get_file "$FILE" "$WORKING_DIR"
+    bs_get_file "$FILE" "$WORKING_DIR" "HTTP"
 
     echo "Processing file $WORKING_DIR/$FILE ..."
 
@@ -120,10 +124,9 @@ function bs_import_qtrly_results {
     [ -z "$EXPORT_DATE" ] && \
         die "No quarterly export data found at $WORKING_DIR/EXPORT_DATE"
 
-    # TODO file name?
-    FILE="NTG${CUR_YEAR2}${CUR_MONTH}N.zip"
+    FILE="NTG${CUR_YEAR2}${CUR_MONTH}C.zip"
 
-    bs_get_file "$FILE" "$WORKING_DIR"
+    bs_get_file "$FILE" "$WORKING_DIR" "FTP"
 
     echo "Processing file $WORKING_DIR/$FILE ..."