Removing build_json_ld_metadata
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 7 May 2014 20:21:10 +0000 (15:21 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 7 May 2014 20:21:10 +0000 (15:21 -0500)
mediagoblin/gmg_commands/batchaddmedia.py

index 41fb86c9b032a4101d8b5933fe8339a38c5b53f1..cf362d83c6f5df1f2ff7efc7d5dd8610a6d97fba 100644 (file)
@@ -139,8 +139,7 @@ zip files and directories"
         sanitized_metadata = check_metadata_format(file_metadata)
         if sanitized_metadata == {}: continue
 
-        json_ld_metadata = jsonld.compact(build_json_ld_metadata(file_metadata), 
-                                            metadata_context)
+        json_ld_metadata = jsonld.compact(file_metadata, metadata_context)
         original_location = media_locations[media_id]['media:original']
         url = urlparse(original_location)
 
@@ -219,20 +218,6 @@ def teardown(temp_files):
     for temp_file in temp_files:
         subprocess.call(['rm','-r',temp_file])
 
-def build_json_ld_metadata(metadata_dict):
-    output_dict = {}
-    for p in metadata_dict.keys():
-        if p in ["dcterms:rights", "dcterms:relation"]:
-            m_type = "xsd:uri"
-        elif p in ["dcterms:date", "dcterms:created"]:
-            m_type = "xsd:date"
-        else:
-            m_type = "xsd:string"
-        description = {"@value": metadata_dict[p],
-                       "@type" : m_type}
-        output_dict[p] = description
-    return output_dict
-
 
 ## Set up the MediaGoblin checker
 #