diff json_data_source.py @ 5:33fa019735a4

Save extra files path as extra_files, not extra_data. Changed type of dataset for new primary datasets. db_key becomes dbkey. Added example json files.

--- a/json_data_source.py	Wed Jul 02 09:33:03 2014 -0400
+++ b/json_data_source.py	Thu Jul 10 11:41:54 2014 -0400
@@ -73,7 +73,7 @@
                       name = metadata.get( 'name' ),
                       metadata = metadata.get( 'metadata' ) )
     if metadata.get( 'extra_data', None ):
-        meta_dict[ 'extra_data' ] = '_'.join( [ filename, 'files' ] )
+        meta_dict[ 'extra_files' ] = '_'.join( [ filename, 'files' ] )
     if primary:
         meta_dict[ 'base_dataset_id' ] = dataset_id
     else:
@@ -96,14 +96,19 @@
         filename = ''.join( c in VALID_CHARS and c or '-' for c in filename )
         name = construct_multi_filename( hda_id, filename, extension )
         target_output_filename = os.path.normpath( '/'.join( [ output_base_path, name ] ) )
+        metadata_parameter_file.write( metadata_to_json( dataset_id, query_item,
+                                                         target_output_filename,
+                                                         ds_type='new_primary_dataset'
+                                                         primary=primary) )
     else:
         target_output_filename = output_filename
+        metadata_parameter_file.write( metadata_to_json( dataset_id, query_item,
+                                                         target_output_filename,
+                                                         ds_type='dataset'
+                                                         primary=primary) )
     download_from_query( query_item, target_output_filename )
     if extra_data:
         download_extra_data( extra_data, '_'.join( [ target_output_filename, 'files' ] ) )
-    metadata_parameter_file.write( metadata_to_json( dataset_id, query_item,
-                                                     target_output_filename,
-                                                     primary=primary) )
     return True