From a2dfc4f5e864709ccb4326459942f52254f4c54d Mon Sep 17 00:00:00 2001 From: camarasu Date: Thu, 21 Dec 2023 18:02:05 +0100 Subject: [PATCH 1/3] Add Materials.xml to Gate inputs if it exists --- vip-portal/src/main/webapp/js/macroParser.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/vip-portal/src/main/webapp/js/macroParser.js b/vip-portal/src/main/webapp/js/macroParser.js index d3fd7e6ca..bde087371 100644 --- a/vip-portal/src/main/webapp/js/macroParser.js +++ b/vip-portal/src/main/webapp/js/macroParser.js @@ -81,7 +81,7 @@ function parseMacFile(macId, parentFolderId) { } else { var macFileName = parsedValuesArray["macFilesArray"][fileIndex]; var macFile = getFileByName(macFileName, parentFolderId); - checkAndThrow(macFile, "Macro file " + macFileName + " not found in the mac folder"); + checkAndThrow(macFile, "Macro file " + macFileName + " not found in the mac folder."); var reader = new FileReader(); reader.onload = function (e) { // Read by lines @@ -144,7 +144,7 @@ function getFileByName(fileName, parentFolderId) { return myFile; } } - checkAndThrow(myFile, "Warning: file " + fileName + " not found in parent folder"); + checkAndThrow(myFile, "Warning: file " + fileName + " not found in parent folder."); return myFile; } @@ -157,7 +157,7 @@ function getFilesByNameWithoutExtension(fileName, parentFolderId) { myFiles.push(listOfFiles[searchIndex]); } } - checkAndThrow(myFiles, "Warning: file " + fileName + " not found in parent folder"); + checkAndThrow(myFiles, "Warning: file " + fileName + " not found in parent folder."); return myFiles; } @@ -189,6 +189,16 @@ function getListOfFiles(dataArray, parentFolderId) { } } + //Add Materials.xml file needed by default by Gate 9.2 onwards + var materialsFileName = "Materials.xml"; + try { + var myMaterialsFile = getFileByName(materialsFileName, parentFolderId); + myListOfFiles.push(myMaterialsFile); + } catch (e) { + alert(e.toString() + " This shouldn't be an issue for Gate version inferior to 9.2. Please add this file to your data folder for Gate 9.2 and above."); + } + + //Add Wfl config file containing the name of the main Mac file. //Note that the created file has a name and a content, but no path var mainMacFileName = dataArray.macFilesArray[0]; From be7dc7680448fb447acb5113c526c7de8cfc9b40 Mon Sep 17 00:00:00 2001 From: axlbonnet Date: Tue, 12 Mar 2024 10:15:01 +0100 Subject: [PATCH 2/3] [no ci] target minor release 2.6.1 (#466) --- pom.xml | 4 ++-- .../insalyon/creatis/vip/core/client/view/CoreConstants.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 87313f94b..15609384a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,8 @@ knowledge of the CeCILL-B license and that you accept its terms. - 2.6 - + 2.6.1 + -SNAPSHOT diff --git a/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java b/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java index 4c2da6613..70057a328 100644 --- a/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java +++ b/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java @@ -41,7 +41,7 @@ public class CoreConstants implements IsSerializable { - public static final String VERSION = "v2.6"; + public static final String VERSION = "v2.6.1-dev"; // Configuration Labels public static final String VO_NAME = "vo.name"; public static final String VO_ROOT = "vo.root"; From e58396b6fa4b0a3b3fa548deb62de5ea32b1745a Mon Sep 17 00:00:00 2001 From: axlbonnet Date: Tue, 12 Mar 2024 10:35:12 +0100 Subject: [PATCH 3/3] [no ci] prepare minor release (2.6.1) (#467) --- pom.xml | 2 +- .../fr/insalyon/creatis/vip/core/client/view/CoreConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 15609384a..b6fb6768b 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ knowledge of the CeCILL-B license and that you accept its terms. 2.6.1 - -SNAPSHOT + diff --git a/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java b/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java index 70057a328..3c212e261 100644 --- a/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java +++ b/vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java @@ -41,7 +41,7 @@ public class CoreConstants implements IsSerializable { - public static final String VERSION = "v2.6.1-dev"; + public static final String VERSION = "v2.6.1"; // Configuration Labels public static final String VO_NAME = "vo.name"; public static final String VO_ROOT = "vo.root";