partially fixed problem of metadata need better solution (also need to make sure future metadata that matches is not reprocessed)

Author: tcnichol

pyclowder/api/v2/files.py

@@ -198,9 +198,11 @@ def upload_metadata(connector, host, key, fileid, metadata, token=None):
         headers = {'Content-Type': 'application/json',
                    'Authorization':'Bearer ' + key}
     print(metadata)
+    as_json = json.dumps(metadata)
     url = '%sapi/v2/files/%s/metadata' % (host, fileid)
     result = connector.post(url, headers=headers, data=json.dumps(metadata),
                             verify=connector.ssl_verify if connector else True)
+    print('done')
 
 
 # TODO not implemented in v2

pyclowder/extractors.py

@@ -228,11 +228,16 @@ def start(self):
 
     def _get_extractor_info_v2(self):
         current_extractor_info = self.extractor_info.copy()
-        repository = self.extractor_info['repository'][0]
-        new_repository = dict()
-        new_repository['repository_url'] = repository['repUrl']
-        new_repository['repository_type'] = repository['repType']
-        current_extractor_info['repository'] = new_repository
+        old_repository = self.extractor_info['repository']
+        new_repository_list = []
+        for repo in old_repository:
+            repo_type = repo['repType']
+            repo_url = repo['repUrl']
+            new_repo = dict()
+            new_repo['repository_url'] = repo_url
+            new_repo['repository_type'] = repo_type
+            new_repository_list.append(new_repo)
+        current_extractor_info['repository'] = new_repository_list
         return current_extractor_info
 
 

pyclowder/files.py

@@ -199,7 +199,15 @@ def upload_metadata(connector, host, key, fileid, metadata):
     """
 
     if clowder_version >= 2.0:
-        v2files.upload_metadata(connector, host, key, fileid, metadata)
+        connector.message_process({"type": "file", "id": fileid}, "Uploading file metadata.")
+        as_json = json.dumps(metadata)
+
+        headers = {'Content-Type': 'application/json',
+                   'Authorization': 'Bearer ' + key}
+        print(metadata)
+        url = '%sapi/v2/files/%s/metadata' % (host, fileid)
+        result = connector.post(url, headers=headers, data=json.dumps(metadata),
+                                verify=connector.ssl_verify if connector else True)
     else:
         connector.message_process({"type": "file", "id": fileid}, "Uploading file metadata.")