From c5eeef5d6b2eb424928b3635e388758526e84764 Mon Sep 17 00:00:00 2001 From: Mark Carroll Date: Mon, 5 Sep 2016 15:09:31 +0100 Subject: [PATCH 1/4] add further acquisition modes to model object mapping --- components/model/resources/mappings/acquisition.ome.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/model/resources/mappings/acquisition.ome.xml b/components/model/resources/mappings/acquisition.ome.xml index a01d6762624..682c50d9829 100644 --- a/components/model/resources/mappings/acquisition.ome.xml +++ b/components/model/resources/mappings/acquisition.ome.xml @@ -717,9 +717,11 @@ + + @@ -735,6 +737,7 @@ + From 0382ad9278f4c1f886ba53e8cafd7c4d05517ce9 Mon Sep 17 00:00:00 2001 From: Mark Carroll Date: Mon, 5 Sep 2016 15:48:59 +0100 Subject: [PATCH 2/4] add further acquisition modes to database scripts --- sql/psql/OMERO5.3DEV__10/enums_update.sql | 12 ++++++++++++ sql/psql/OMERO5.3DEV__10/psql-footer.sql | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/sql/psql/OMERO5.3DEV__10/enums_update.sql b/sql/psql/OMERO5.3DEV__10/enums_update.sql index faf9257eed5..a3df3a85a49 100644 --- a/sql/psql/OMERO5.3DEV__10/enums_update.sql +++ b/sql/psql/OMERO5.3DEV__10/enums_update.sql @@ -9,6 +9,10 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'WideField' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'WideField') limit 1; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-35,'BrightField' from acquisitionmode where not exists( + select 1 from acquisitionmode where value = 'BrightField') limit 1; + insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'LaserScanningConfocalMicroscopy' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'LaserScanningConfocalMicroscopy') limit 1; @@ -21,6 +25,10 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'SlitScanConfocal' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'SlitScanConfocal') limit 1; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-35,'SweptFieldConfocal' from acquisitionmode where not exists( + select 1 from acquisitionmode where value = 'SweptFieldConfocal') limit 1; + insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'MultiPhotonMicroscopy' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'MultiPhotonMicroscopy') limit 1; @@ -81,6 +89,10 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'LCM' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'LCM') limit 1; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-35,'SPIM' from acquisitionmode where not exists( + select 1 from acquisitionmode where value = 'SPIM') limit 1; + insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'Other' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'Other') limit 1; diff --git a/sql/psql/OMERO5.3DEV__10/psql-footer.sql b/sql/psql/OMERO5.3DEV__10/psql-footer.sql index 11e636e65f0..6ff3f56e842 100644 --- a/sql/psql/OMERO5.3DEV__10/psql-footer.sql +++ b/sql/psql/OMERO5.3DEV__10/psql-footer.sql @@ -2109,12 +2109,16 @@ alter table pixelstype alter column bitsize drop not null; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'WideField'; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-52,'BrightField'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'LaserScanningConfocalMicroscopy'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'SpinningDiskConfocal'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'SlitScanConfocal'; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-52,'SweptFieldConfocal'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'MultiPhotonMicroscopy'; insert into acquisitionmode (id,permissions,value) @@ -2145,6 +2149,8 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'FSM'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'LCM'; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-52,'SPIM'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'Other'; insert into acquisitionmode (id,permissions,value) From a7829684d7ecb8093118265beaa54fe923d64054 Mon Sep 17 00:00:00 2001 From: Mark Carroll Date: Thu, 8 Sep 2016 08:57:55 +0100 Subject: [PATCH 3/4] reorder enumeration values in mapping so new follow previous --- components/model/resources/mappings/acquisition.ome.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/model/resources/mappings/acquisition.ome.xml b/components/model/resources/mappings/acquisition.ome.xml index 682c50d9829..12a45d4e0fb 100644 --- a/components/model/resources/mappings/acquisition.ome.xml +++ b/components/model/resources/mappings/acquisition.ome.xml @@ -717,11 +717,9 @@ - - @@ -737,9 +735,11 @@ - + + + From 99b95c47bacf48ab67175ff8a73b7b800095c19d Mon Sep 17 00:00:00 2001 From: Mark Carroll Date: Thu, 8 Sep 2016 09:13:53 +0100 Subject: [PATCH 4/4] reorder enumeration values in SQL scripts so new follow previous --- sql/psql/OMERO5.3DEV__10/enums_update.sql | 24 +++++++++++------------ sql/psql/OMERO5.3DEV__10/psql-footer.sql | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sql/psql/OMERO5.3DEV__10/enums_update.sql b/sql/psql/OMERO5.3DEV__10/enums_update.sql index a3df3a85a49..7742ebfd642 100644 --- a/sql/psql/OMERO5.3DEV__10/enums_update.sql +++ b/sql/psql/OMERO5.3DEV__10/enums_update.sql @@ -9,10 +9,6 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'WideField' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'WideField') limit 1; -insert into acquisitionmode (id,permissions,value) - select ome_nextval('seq_acquisitionmode'),-35,'BrightField' from acquisitionmode where not exists( - select 1 from acquisitionmode where value = 'BrightField') limit 1; - insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'LaserScanningConfocalMicroscopy' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'LaserScanningConfocalMicroscopy') limit 1; @@ -25,10 +21,6 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'SlitScanConfocal' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'SlitScanConfocal') limit 1; -insert into acquisitionmode (id,permissions,value) - select ome_nextval('seq_acquisitionmode'),-35,'SweptFieldConfocal' from acquisitionmode where not exists( - select 1 from acquisitionmode where value = 'SweptFieldConfocal') limit 1; - insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'MultiPhotonMicroscopy' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'MultiPhotonMicroscopy') limit 1; @@ -89,10 +81,6 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'LCM' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'LCM') limit 1; -insert into acquisitionmode (id,permissions,value) - select ome_nextval('seq_acquisitionmode'),-35,'SPIM' from acquisitionmode where not exists( - select 1 from acquisitionmode where value = 'SPIM') limit 1; - insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'Other' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'Other') limit 1; @@ -101,6 +89,18 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-35,'Unknown' from acquisitionmode where not exists( select 1 from acquisitionmode where value = 'Unknown') limit 1; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-35,'BrightField' from acquisitionmode where not exists( + select 1 from acquisitionmode where value = 'BrightField') limit 1; + +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-35,'SweptFieldConfocal' from acquisitionmode where not exists( + select 1 from acquisitionmode where value = 'SweptFieldConfocal') limit 1; + +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-35,'SPIM' from acquisitionmode where not exists( + select 1 from acquisitionmode where value = 'SPIM') limit 1; + insert into arctype (id,permissions,value) select ome_nextval('seq_arctype'),-35,'Hg' from arctype where not exists( select 1 from arctype where value = 'Hg') limit 1; diff --git a/sql/psql/OMERO5.3DEV__10/psql-footer.sql b/sql/psql/OMERO5.3DEV__10/psql-footer.sql index 6ff3f56e842..ad559928d37 100644 --- a/sql/psql/OMERO5.3DEV__10/psql-footer.sql +++ b/sql/psql/OMERO5.3DEV__10/psql-footer.sql @@ -2109,16 +2109,12 @@ alter table pixelstype alter column bitsize drop not null; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'WideField'; -insert into acquisitionmode (id,permissions,value) - select ome_nextval('seq_acquisitionmode'),-52,'BrightField'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'LaserScanningConfocalMicroscopy'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'SpinningDiskConfocal'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'SlitScanConfocal'; -insert into acquisitionmode (id,permissions,value) - select ome_nextval('seq_acquisitionmode'),-52,'SweptFieldConfocal'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'MultiPhotonMicroscopy'; insert into acquisitionmode (id,permissions,value) @@ -2149,12 +2145,16 @@ insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'FSM'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'LCM'; -insert into acquisitionmode (id,permissions,value) - select ome_nextval('seq_acquisitionmode'),-52,'SPIM'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'Other'; insert into acquisitionmode (id,permissions,value) select ome_nextval('seq_acquisitionmode'),-52,'Unknown'; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-52,'BrightField'; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-52,'SweptFieldConfocal'; +insert into acquisitionmode (id,permissions,value) + select ome_nextval('seq_acquisitionmode'),-52,'SPIM'; insert into arctype (id,permissions,value) select ome_nextval('seq_arctype'),-52,'Hg'; insert into arctype (id,permissions,value)