pass in folder id to dataset

Author: longshuicy

pyclowder/api/v2/files.py

@@ -324,7 +324,7 @@ def upload_thumbnail(connector, client, fileid, thumbnail):
         logger.error("unable to upload thumbnail %s to file %s", thumbnail, fileid)
 
 
-def upload_to_dataset(connector, client, datasetid, filepath, folder_id=None, check_duplicate=False):
+def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=False, folder_id=None):
     """Upload file to existing Clowder dataset.
 
     Keyword arguments:

pyclowder/files.py

@@ -256,7 +256,7 @@ def upload_thumbnail(connector, host, key, fileid, thumbnail):
     return thumbnail_id
 
 
-def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate=False):
+def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate=False, folder_id=None):
     """Upload file to existing Clowder dataset.
 
     Keyword arguments:
@@ -266,10 +266,11 @@ def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate
     datasetid -- the dataset that the file should be associated with
     filepath -- path to file
     check_duplicate -- check if filename already exists in dataset and skip upload if so
+    folder_id -- the folder that the file should be associated with
     """
     client = ClowderClient(host=host, key=key)
     if clowder_version == 2:
-        return files.upload_to_dataset(connector, client, datasetid, filepath, check_duplicate)
+        return files.upload_to_dataset(connector, client, datasetid, filepath, check_duplicate, folder_id)
     else:
         logger = logging.getLogger(__name__)