Commit 7e18bab0 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Bugfix

bin.run_gms:
- modified run_from_entityids()

geomultisens.misc.database_tools:
- delete_processing_results(): Fix for warning ".fuse_hidden.. remaining"

updated __version__ and __versionalias__


Former-commit-id: 5acce159
parent 14dec515
...@@ -63,7 +63,9 @@ def run_from_sceneids(args): ...@@ -63,7 +63,9 @@ def run_from_sceneids(args):
def run_from_entityids(args): def run_from_entityids(args):
# create a new job from entity IDs # create a new job from entity IDs
# TODO # TODO
db_connection = "dbname='geomultisens' user='gmsdb' password='gmsdb' host='localhost' connect_timeout=3" # TODO
dbJob = GMS_JOB(db_connection)
dbJob.from_entityIDlist() # TODO
# set up process controller instance # set up process controller instance
...@@ -78,7 +80,7 @@ def run_from_entityids(args): ...@@ -78,7 +80,7 @@ def run_from_entityids(args):
def run_from_filenames(args): def run_from_filenames(args):
# find out sceneIDs belonging to filenames # find out sceneIDs belonging to filenames
# create a new job from entity IDs # create a new job from entity IDs
# TODO # TODO
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
__author__ = """Daniel Scheffler""" __author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de' __email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.2.0' __version__ = '0.2.1'
__versionalias__ = '20170530.01' __versionalias__ = '20170531.01'
from . import algorithms from . import algorithms
......
...@@ -720,7 +720,7 @@ class GMS_JOB(object): ...@@ -720,7 +720,7 @@ class GMS_JOB(object):
# type: (list, int, int, str) -> object # type: (list, int, int, str) -> object
""" """
Create a GMS_JOB instance based on the given list of scene IDs. Create a GMS_JOB instance based on the given list of scene IDs.
:param list_sceneIDs: <list> of scene IDs, e.g. [26781907, 26781917, 26542650, 26542451, 26541679] :param list_sceneIDs: <list> of scene IDs, e.g. [26781907, 26781917, 26542650, 26542451, 26541679]
:param virtual_sensor_id : <int> a valid ID from the 'virtual_sensors' table of the postgreSQL database :param virtual_sensor_id : <int> a valid ID from the 'virtual_sensors' table of the postgreSQL database
:param datasetid_spatial_ref: <int> a valid dataset ID of the dataset to be chosen as spatial reference :param datasetid_spatial_ref: <int> a valid dataset ID of the dataset to be chosen as spatial reference
...@@ -768,7 +768,7 @@ class GMS_JOB(object): ...@@ -768,7 +768,7 @@ class GMS_JOB(object):
def from_entityIDlist(self): def from_entityIDlist(self):
""" """
Create a GMS_JOB instance based on the given list of entity IDs. Create a GMS_JOB instance based on the given list of entity IDs.
""" """
raise NotImplementedError # TODO raise NotImplementedError # TODO
...@@ -1048,7 +1048,11 @@ def delete_processing_results(scene_ID, proc_level='all', force=False): ...@@ -1048,7 +1048,11 @@ def delete_processing_results(scene_ID, proc_level='all', force=False):
if delete=='J': if delete=='J':
try: try:
if proc_level == 'all': if proc_level == 'all':
shutil.rmtree(path_procdata) try:
shutil.rmtree(path_procdata)
except OSError: # directory not deletable because it is not empty
if [F for F in glob.glob(path_procdata) if not F.startswith('.fuse_hidden')]:
raise # raise OSError if there are other files that .fuse_hidden... remaining
else: else:
files2delete = glob.glob(os.path.join(path_procdata,'*%s*' %proc_level)) files2delete = glob.glob(os.path.join(path_procdata,'*%s*' %proc_level))
errors = False # default errors = False # default
......
...@@ -20,7 +20,7 @@ test_requirements = [ ...@@ -20,7 +20,7 @@ test_requirements = [
setup( setup(
name='geomultisens', name='geomultisens',
version='0.2.0', version='0.2.1',
description="GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data", description="GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data",
long_description=readme + '\n\n' + history, long_description=readme + '\n\n' + history,
author="Daniel Scheffler", author="Daniel Scheffler",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment