Merge branch 'enhancement/provide_more_options'

gms_preprocessing/options/config.py

@@ -368,7 +368,7 @@ class JobConfig(object):
             return getattr(self.DB_job_record, attr_db_job_record)
 
         # 3. JSON parameters: parameters that have been defined via JSON Input (command line or advanced UI params)
-        if val_json is not None:
+        if val_json and val_json is not None:
             return val_json
 
         # fallback: if nothing has been returned until here

gms_preprocessing/options/options_default.json

@@ -101,7 +101,7 @@
         }
     },
 
-    "usecase": {  /*NOTE: These options will not respected in the WebApp! Use the WebApp GUI instead.*/
+    "usecase": {  /*NOTE: These options will be not respected in the WebApp! Use the WebApp GUI instead.*/
 
         "virtual_sensor_id": 10,   /*"None": use WebApp input; 1:  Landsat-8,  10: Sentinel-2A 10m*/
         "datasetid_spatial_ref": "None", /*"None": use WebApp input*/

gms_preprocessing/processing/process_controller.py

@@ -40,7 +40,7 @@ __author__ = 'Daniel Scheffler'
 class process_controller(object):
     def __init__(self, job_ID, exec_mode='Python', db_host='localhost',
                  parallelization_level='scenes', delete_old_output=False, job_config_kwargs=None):
-        # type: (str, str, str, str, bool) -> None
+        # type: (int, str, str, str, bool, dict) -> None
 
         """gms_preprocessing process controller
 

tests/test_gms_preprocessing.py

@@ -282,6 +282,18 @@ testdata.append('MultipleDatasetsInOneJob')
 
 summary_testResults, summary_errors, summary_failures, summary_skipped, jobstatus = [[] for _ in range(5)]
 
+
+@unittest.SkipTest
+class Test_in_normal_mode(unittest.TestCase):
+    def setUp(self):
+        # Testjob Landsat-8
+        self.PC = process_controller(26186740, parallelization_level='scenes', db_host='geoms', delete_old_output=True,
+                                     job_config_kwargs=dict(is_test=False))
+
+    def test(self):
+        self.PC.run_all_processors()
+
+
 if __name__ == '__main__':
     # Part 1: Creating and running a testsuite for each dataset-testcase, and querying the job.status of the job.
     for items in testdata: