Skip to content

Commit 696d43c

Browse files
ecpantaloneecpantalone
authored
Merge pull request #193 from brain-image-library/master
bringing changes on prod vm down master
2 parents b081369 + 5d54315 commit 696d43c

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed

‎ingest/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def __str__(self):
3131
class Collection(models.Model):
3232
""" A grouping of one or more datasets and associated metadata. """
3333
def __str__(self):
34-
#collreturn = "Collection Name: " + self.name + ' : BIL UUID: ' + self.bil_uuid
35-
#return collreturn
36-
return self.name
34+
collreturn = "Collection Name: " + self.name + ' : BIL UUID: ' + self.bil_uuid
35+
return collreturn
36+
#return self.name
3737
# Required and the user should supply these
3838
name = models.CharField(max_length=256, unique=True)
3939
description = models.TextField()

‎ingest/views.py‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,18 +1710,18 @@ def save_specimen_sheet_method_1(specimen_set, sheet, saved_datasets):
17101710
data_set_id = d.id
17111711

17121712
s = specimen_set[d_index]
1713-
localid = s['LocalID'].lower()
1714-
species = s['Species'].lower()
1715-
ncbitaxonomy = s['NCBITaxonomy'].lower()
1716-
age = s['Age'].lower()
1717-
ageunit = s['Ageunit'].lower()
1718-
sex = s['Sex'].lower()
1719-
genotype = s['Genotype'].lower()
1720-
organlocalid = s['OrganLocalID'].lower()
1721-
organname = s['OrganName'].lower()
1722-
samplelocalid = s['SampleLocalID'].lower()
1723-
atlas = s['Atlas'].lower()
1724-
locations = s['Locations'].lower()
1713+
localid = s['LocalID']
1714+
species = s['Species']
1715+
ncbitaxonomy = s['NCBITaxonomy']
1716+
age = s['Age']
1717+
ageunit = s['Ageunit']
1718+
sex = s['Sex']
1719+
genotype = s['Genotype']
1720+
organlocalid = s['OrganLocalID']
1721+
organname = s['OrganName']
1722+
samplelocalid = s['SampleLocalID']
1723+
atlas = s['Atlas']
1724+
locations = s['Locations']
17251725

17261726
specimen_object = Specimen(localid=localid, species=species, ncbitaxonomy=ncbitaxonomy, age=age, ageunit=ageunit, sex=sex, genotype=genotype, organlocalid=organlocalid, organname=organname, samplelocalid=samplelocalid, atlas=atlas, locations=locations, sheet_id=sheet.id, data_set_id=data_set_id)
17271727
specimen_object.save()
@@ -1738,18 +1738,18 @@ def save_specimen_sheet_method_2(specimen_set, sheet, saved_datasets):
17381738
for s in specimen_set:
17391739
data_set_id = saved_datasets.id
17401740

1741-
localid = s['LocalID'].lower()
1742-
species = s['Species'].lower()
1743-
ncbitaxonomy = s['NCBITaxonomy'].lower()
1744-
age = s['Age'].lower()
1745-
ageunit = s['Ageunit'].lower()
1746-
sex = s['Sex'].lower()
1747-
genotype = s['Genotype'].lower()
1748-
organlocalid = s['OrganLocalID'].lower()
1749-
organname = s['OrganName'].lower()
1750-
samplelocalid = s['SampleLocalID'].lower()
1751-
atlas = s['Atlas'].lower()
1752-
locations = s['Locations'].lower()
1741+
localid = s['LocalID']
1742+
species = s['Species']
1743+
ncbitaxonomy = s['NCBITaxonomy']
1744+
age = s['Age']
1745+
ageunit = s['Ageunit']
1746+
sex = s['Sex']
1747+
genotype = s['Genotype']
1748+
organlocalid = s['OrganLocalID']
1749+
organname = s['OrganName']
1750+
samplelocalid = s['SampleLocalID']
1751+
atlas = s['Atlas']
1752+
locations = s['Locations']
17531753

17541754
specimen_object = Specimen(localid=localid, species=species, ncbitaxonomy=ncbitaxonomy, age=age, ageunit=ageunit, sex=sex, genotype=genotype, organlocalid=organlocalid, organname=organname, samplelocalid=samplelocalid, atlas=atlas, locations=locations, sheet_id=sheet.id, data_set_id=data_set_id)
17551755
specimen_object.save()
@@ -1769,18 +1769,18 @@ def save_specimen_sheet_method_3(specimen_set, sheet, saved_datasets):
17691769
data_set_id = d.id
17701770

17711771
s = specimen_set[d_index]
1772-
localid = s['LocalID'].lower()
1773-
species = s['Species'].lower()
1774-
ncbitaxonomy = s['NCBITaxonomy'].lower()
1775-
age = s['Age'].lower()
1776-
ageunit = s['Ageunit'].lower()
1777-
sex = s['Sex'].lower()
1778-
genotype = s['Genotype'].lower()
1779-
organlocalid = s['OrganLocalID'].lower()
1780-
organname = s['OrganName'].lower()
1781-
samplelocalid = s['SampleLocalID'].lower()
1782-
atlas = s['Atlas'].lower()
1783-
locations = s['Locations'].lower()
1772+
localid = s['LocalID']
1773+
species = s['Species']
1774+
ncbitaxonomy = s['NCBITaxonomy']
1775+
age = s['Age']
1776+
ageunit = s['Ageunit']
1777+
sex = s['Sex']
1778+
genotype = s['Genotype']
1779+
organlocalid = s['OrganLocalID']
1780+
organname = s['OrganName']
1781+
samplelocalid = s['SampleLocalID']
1782+
atlas = s['Atlas']
1783+
locations = s['Locations']
17841784

17851785
specimen_object = Specimen(localid=localid, species=species, ncbitaxonomy=ncbitaxonomy, age=age, ageunit=ageunit, sex=sex, genotype=genotype, organlocalid=organlocalid, organname=organname, samplelocalid=samplelocalid, atlas=atlas, locations=locations, sheet_id=sheet.id, data_set_id=data_set_id)
17861786
specimen_object.save()
@@ -1795,18 +1795,18 @@ def save_specimen_sheet_method_4(specimen_set, sheet):
17951795
# single specimen
17961796
try:
17971797
for s in specimen_set:
1798-
localid = s['LocalID'].lower()
1799-
species = s['Species'].lower()
1800-
ncbitaxonomy = s['NCBITaxonomy'].lower()
1801-
age = s['Age'].lower()
1802-
ageunit = s['Ageunit'].lower()
1803-
sex = s['Sex'].lower()
1804-
genotype = s['Genotype'].lower()
1805-
organlocalid = s['OrganLocalID'].lower()
1806-
organname = s['OrganName'].lower()
1807-
samplelocalid = s['SampleLocalID'].lower()
1808-
atlas = s['Atlas'].lower()
1809-
locations = s['Locations'].lower()
1798+
localid = s['LocalID']
1799+
species = s['Species']
1800+
ncbitaxonomy = s['NCBITaxonomy']
1801+
age = s['Age']
1802+
ageunit = s['Ageunit']
1803+
sex = s['Sex']
1804+
genotype = s['Genotype']
1805+
organlocalid = s['OrganLocalID']
1806+
organname = s['OrganName']
1807+
samplelocalid = s['SampleLocalID']
1808+
atlas = s['Atlas']
1809+
locations = s['Locations']
18101810

18111811
specimen = Specimen(localid=localid, species=species, ncbitaxonomy=ncbitaxonomy, age=age, ageunit=ageunit, sex=sex, genotype=genotype, organlocalid=organlocalid, organname=organname, samplelocalid=samplelocalid, atlas=atlas, locations=locations, sheet_id=sheet.id)
18121812

0 commit comments

Comments
 (0)