From 942bdcf9c736810d3ae00da26ecf4491c9e3ad7d Mon Sep 17 00:00:00 2001
From: Adam Stewart <ajstewart@users.noreply.github.com>
Date: Mon, 2 Mar 2020 13:45:01 +1100
Subject: [PATCH] Removed int requirement from Epoch string (#123)

* Removed int requirement from Epoch string

* Fixed download epoch

* Fix find fields ada issue #120
---
 bin/get_vast_pilot_dbx.py | 4 ++--
 vasttools/__init__.py     | 2 +-
 vasttools/query.py        | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/get_vast_pilot_dbx.py b/bin/get_vast_pilot_dbx.py
index abd655ba..b6cf94c7 100755
--- a/bin/get_vast_pilot_dbx.py
+++ b/bin/get_vast_pilot_dbx.py
@@ -475,7 +475,7 @@ def filter_files_list(
     epochs = []
     for i in base_file_list.entries:
         if isinstance(i, dropbox.files.FolderMetadata) and "EPOCH" in i.name:
-            epochs.append(int(i.name.split('EPOCH')[-1]))
+            epochs.append(i.name.split('EPOCH')[-1])
     dropbox_name = RELEASED_EPOCHS[args.download_epoch]
     if dropbox_name not in epochs:
         logger.error(
@@ -489,7 +489,7 @@ def filter_files_list(
         logger.info(
             "Gathering {} files to download...".format(epoch_string))
         files_list, folders_list = vast_dropbox.recursive_build_files(
-            epoch_file_list, dbx, preappend=epoch_string)
+            epoch_file_list, preappend=epoch_string)
         logger.info("{} files to download".format(len(files_list)))
 
         for folder in folders_list:
diff --git a/vasttools/__init__.py b/vasttools/__init__.py
index 640d72a6..fe8b13ca 100644
--- a/vasttools/__init__.py
+++ b/vasttools/__init__.py
@@ -9,4 +9,4 @@
 '''
 
 __author__ = 'Dougal Dobie, Adam Stewart'
-__version__ = "1.1.0"
+__version__ = "1.1.1"
diff --git a/vasttools/query.py b/vasttools/query.py
index 1a95c5b1..2ab8644c 100644
--- a/vasttools/query.py
+++ b/vasttools/query.py
@@ -573,9 +573,10 @@ def __init__(self, args, pilot_epoch, stokes_param):
 
         if not BASE_FOLDER:
             if HOST != HOST_ADA:
-                self.logger.critical(
-                    "Base folder must be specified if not running on ada")
-                sys.exit()
+                if not FIND_FIELDS:
+                    self.logger.critical(
+                        "Base folder must be specified if not running on ada")
+                    sys.exit()
             BASE_FOLDER = "/import/ada1/askap/"
 
         if not IMAGE_FOLDER: