From 07e0da06b56cab941734ccdba3cbf0b3cf958894 Mon Sep 17 00:00:00 2001 From: Shen Date: Tue, 12 Nov 2024 12:19:33 -0500 Subject: [PATCH 1/2] rm --- SQL/0000-00-03-ConfigTables.sql | 1 - raisinbread/RB_files/RB_Config.sql | 1 - raisinbread/RB_files/RB_ConfigSettings.sql | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/SQL/0000-00-03-ConfigTables.sql b/SQL/0000-00-03-ConfigTables.sql index f170f9775bf..e46a31f2dd9 100644 --- a/SQL/0000-00-03-ConfigTables.sql +++ b/SQL/0000-00-03-ConfigTables.sql @@ -210,7 +210,6 @@ INSERT INTO Config (ConfigID, Value) SELECT ID, "365" FROM ConfigSettings WHERE INSERT INTO Config (ConfigID, Value) SELECT ID, "/data/%PROJECTNAME%/data/" FROM ConfigSettings WHERE Name="imagePath"; INSERT INTO Config (ConfigID, Value) SELECT ID, "%LORISROOT%" FROM ConfigSettings WHERE Name="base"; -INSERT INTO Config (ConfigID, Value) SELECT ID, "%LORISROOT%" FROM ConfigSettings WHERE Name="DownloadPath"; INSERT INTO Config (ConfigID, Value) SELECT ID, "tools/logs/" FROM ConfigSettings WHERE Name="log"; INSERT INTO Config (ConfigID, Value) SELECT ID, "/data/%PROJECTNAME%/bin/mri/" FROM ConfigSettings WHERE Name="MRICodePath"; INSERT INTO Config (ConfigID, Value) SELECT ID, "/data/incoming/" FROM ConfigSettings WHERE Name="MRIUploadIncomingPath"; diff --git a/raisinbread/RB_files/RB_Config.sql b/raisinbread/RB_files/RB_Config.sql index 4dc95a9d038..75f0a607c08 100644 --- a/raisinbread/RB_files/RB_Config.sql +++ b/raisinbread/RB_files/RB_Config.sql @@ -23,7 +23,6 @@ INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (22,12,'Ymd'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (23,27,'/data-raisinbread/'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (24,28,'/var/www/loris/'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (26,30,'/PATH/TO/EXTERNAL/LIBRARY/'); -INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (28,32,'/data/'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (29,33,'tools/logs/'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (30,34,'/data/incoming/'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (31,35,'/data/demo/bin/mri/'); diff --git a/raisinbread/RB_files/RB_ConfigSettings.sql b/raisinbread/RB_files/RB_ConfigSettings.sql index 06f11cabd06..e93338aff37 100644 --- a/raisinbread/RB_files/RB_ConfigSettings.sql +++ b/raisinbread/RB_files/RB_ConfigSettings.sql @@ -119,9 +119,8 @@ INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMult INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (127,'default_project','Default project used when creating scan candidate or visit',1,0,'text',69,'Default project',12); INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (128,'default_cohort','Default cohort used when creating scan visit',1,0,'text',69,'Default cohort',13); INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (129,'UserMaximumDaysInactive','The maximum number of days since last login before making a user inactive.',1,0,'text',1,'Maximum Days Before Making User Inactive',30); -INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (130,'DownloadPath','Where files are downloaded',1,0,'text',26,'Downloads',4); -INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (131,'EEGUploadIncomingPath','Path to the upload directory for incoming EEG studies',1,0,'text',45,'EEG Incoming Directory',15); -INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (132,'EEGS3DataPath','EEG S3 data path for assembly data',1,0,'text',45,'EEG S3 data path',15); +INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (130,'EEGUploadIncomingPath','Path to the upload directory for incoming EEG studies',1,0,'text',45,'EEG Incoming Directory',15); +INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (131,'EEGS3DataPath','EEG S3 data path for assembly data',1,0,'text',45,'EEG S3 data path',15); UNLOCK TABLES; SET FOREIGN_KEY_CHECKS=1; From f2f0044ebfa4d3a2e6a8482cfa1c0276509fa16c Mon Sep 17 00:00:00 2001 From: Shen Date: Tue, 12 Nov 2024 12:34:32 -0500 Subject: [PATCH 2/2] fix order --- raisinbread/RB_files/RB_Config.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raisinbread/RB_files/RB_Config.sql b/raisinbread/RB_files/RB_Config.sql index 75f0a607c08..86aad611b1b 100644 --- a/raisinbread/RB_files/RB_Config.sql +++ b/raisinbread/RB_files/RB_Config.sql @@ -108,8 +108,8 @@ INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (122,126,'0'); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (123,127,''); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (124,128,''); INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (126,129,'365'); -INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (127,130,'/var/www/loris/'); -INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (128,131,'/data/EEGUploadIncomingPath/'); +INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (127,130,'/data/EEGUploadIncomingPath/'); +INSERT INTO `Config` (`ID`, `ConfigID`, `Value`) VALUES (128,131,'EEGS3DataPath'); UNLOCK TABLES; SET FOREIGN_KEY_CHECKS=1;