A few fixes :

upload file for v2 did not properly return the id of the uploaded file.

added a text file (looks like the original was not checked in) gave it a more descriptive name.

Author: tcnichol

pyclowder/files.py

@@ -287,7 +287,8 @@ def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate
     """
     client = ClowderClient(host=host, key=key)
     if clowder_version == 2:
-        v2files.upload_to_dataset(connector, client, datasetid, filepath, check_duplicate)
+        uploadedfileid = v2files.upload_to_dataset(connector, client, datasetid, filepath, check_duplicate)
+        return uploadedfileid
     else:
         logger = logging.getLogger(__name__)
 

sample-extractors/test-dataset-extractor/test-dataset-extractor.py

@@ -4,6 +4,7 @@
 
 import logging
 import subprocess
+import os
 
 from pyclowder.extractors import Extractor
 import pyclowder.files
@@ -32,7 +33,7 @@ def process_message(self, connector, host, secret_key, resource, parameters):
         dataset_id = resource['id']
 
         # Local file path to file which you want to upload to dataset
-        file_path = 'a7.txt'
+        file_path = os.path.join(os.getcwd(), 'test_dataset_extractor_file.txt')
 
         # Upload a new file to dataset
         file_id = pyclowder.files.upload_to_dataset(connector, host, secret_key, dataset_id, file_path, True)
@@ -44,6 +45,7 @@ def process_message(self, connector, host, secret_key, resource, parameters):
         # Get file list under dataset
         file_list = pyclowder.datasets.get_file_list(connector, host, secret_key, dataset_id)
         logger.info("File list : %s", file_list)
+        is_in = file_id in [file['id'] for file in file_list]
         if file_id in [file['id'] for file in file_list]:
             logger.info("File uploading and retrieving file list succeeded")
         else:

sample-extractors/test-dataset-extractor/test_dataset_extractor_file.txt

@@ -0,0 +1 @@
+This is a test file for the test dataset extractor.