diff --git a/fishbook/backend/database.py b/fishbook/backend/database.py index f7461f1..a84ab45 100644 --- a/fishbook/backend/database.py +++ b/fishbook/backend/database.py @@ -3,9 +3,9 @@ import datajoint as dj import nixio as nix import os import glob -from .util import read_info_file, read_dataset_info, read_stimuli_file -from .util import find_key_recursive, deep_get, find_mtags_for_tag -from .util import mtag_settings_to_yaml, nix_metadata_to_yaml +from fishbook.backend.util import read_info_file, read_dataset_info, read_stimuli_file +from fishbook.backend.util import find_key_recursive, deep_get, find_mtags_for_tag +from fishbook.backend.util import mtag_settings_to_yaml, nix_metadata_to_yaml import uuid import yaml @@ -454,7 +454,7 @@ def scan_folder_for_repros(dataset): rp["repro_id"] = rp["repro_name"] + str(repro_counts[rp["repro_name"]]) rp["start"] = 0. rp["duration"] = 0. - rp["settings"] = yaml.dump(rs) + rp["settings"] = yaml.dump(rs).replace("'", "") Repros.insert1(rp, skip_duplicates=True) # import stimuli @@ -484,7 +484,7 @@ def scan_folder_for_repros(dataset): stim["start_time"] = stim_start stim["start_index"] = s stim["duration"] = stim_duration - stim["settings"] = yaml.dump(rs) + stim["settings"] = yaml.dump(rs).replace("'", "") stim["mtag_id"] = "" stim["stimulus_name"] = "" stim.update(repro) @@ -528,6 +528,6 @@ if __name__ == "__main__": # data_dir = "../high_freq_chirps/data" # drop_tables() # datasets = glob.glob("/Users/jan/zwischenlager/2012-*")2010-06-21-ac/info.dat - datasets = glob.glob(os.path.join(data_dir, '/data/apteronotus/2019-10*')) + datasets = glob.glob(os.path.join(data_dir, '/data/apteronotus/2019-10-2*')) populate(datasets, update=False)