diff --git a/fishbook/frontend/frontend_classes.py b/fishbook/frontend/frontend_classes.py index f4496d3..542e87b 100644 --- a/fishbook/frontend/frontend_classes.py +++ b/fishbook/frontend/frontend_classes.py @@ -251,7 +251,7 @@ class Dataset: total = len(dataset_list) if not test: for i, d in enumerate(dataset_list): - progress(i+1, total, "fetching data") + progress(i+1, total, "fetching %i matches" % total) results.append(Dataset(tuple=d)) return results, total @@ -287,8 +287,8 @@ class Dataset: def __str__(self): str = "id: %s\n" % self.id - str += "recorded: %s \t by:%s\n" % (self.recording_date, self.experimenter) - str += "duration: %ss \t quality:%s\n" % (self.recording_duration, self.quality) + str += "recorded: %s \t by: %s\n" % (self.recording_date, self.experimenter) + str += "duration: %ss \t quality: %s\n" % (self.recording_duration, self.quality) str += "comment: %s" % self.comment return str @@ -543,16 +543,17 @@ class Subject: return self.__tuple.copy() @staticmethod - def find(species=None): + def find(species=None, test=False): subjs = Subjects & True if species: subjs = (Subjects & "species like '%{0:s}%'".format(species)) results = [] total = len(subjs) - for i, s in enumerate(subjs): - results.append(Subject(tuple=s)) - progress(i+1, total, "fetching %i matches" % total) + if not test: + for i, s in enumerate(subjs): + results.append(Subject(tuple=s)) + progress(i+1, total, "fetching %i matches" % total) return results, total