Skip to content

Commit 57d05e1

Browse files
authored
Merge pull request #81 from clowder-framework/80-do-not-post-full-extractor_info-with-metadata-v2
posting listener and not extractor_info
2 parents 814b4e3 + 1565e99 commit 57d05e1

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

pyclowder/extractors.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,11 @@ def start(self):
217217

218218
def _get_extractor_info_v2(self):
219219
current_extractor_info = self.extractor_info.copy()
220-
old_repository = self.extractor_info['repository']
221-
new_repository_list = []
222-
for repo in old_repository:
223-
repo_type = repo['repType']
224-
repo_url = repo['repUrl']
225-
new_repo = dict()
226-
new_repo['repository_url'] = repo_url
227-
new_repo['repository_type'] = repo_type
228-
new_repository_list.append(new_repo)
229-
current_extractor_info['repository'] = new_repository_list
230-
return current_extractor_info
220+
listener_data = dict()
221+
listener_data['name'] = current_extractor_info['name']
222+
listener_data['version'] = current_extractor_info['version']
223+
listener_data['description'] = current_extractor_info['version']
224+
return listener_data
231225

232226

233227
def get_metadata(self, content, resource_type, resource_id, server=None, contexts=None):
@@ -263,7 +257,7 @@ def get_metadata(self, content, resource_type, resource_id, server=None, context
263257
md["context_url"] = context_url
264258
md["content"] = content
265259
md["contents"] = content
266-
md["extractor_info"] = new_extractor_info
260+
md["listener"] = new_extractor_info
267261
return md
268262
else:
269263
# TODO handle cases where contexts are either not available or are dynamnically generated

0 commit comments

Comments
 (0)