hack to improve "Output Module Inserter" (plugin names with ::)

cms-sw · Mar 11, 2024 · 7ec9e46 · 7ec9e46
1 parent fca2e86
commit 7ec9e46
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/confdb/gui/ConfigurationTreeActions.java b/src/confdb/gui/ConfigurationTreeActions.java
@@ -282,7 +282,7 @@ public static boolean insertESSource(JTree tree, String templateName) {
 		ConfigurationTreeModel model = (ConfigurationTreeModel) tree.getModel();
 		Configuration config = (Configuration) model.getRoot();
 
-		if (templateName.indexOf(':') >= 0) {
+		if (templateName.indexOf(":") >= 0) {
 			String[] s = templateName.split(":");
 			Template template = config.release().essourceTemplate(s[1]);
 			Instance original = null;
@@ -326,7 +326,7 @@ public static boolean insertESModule(JTree tree, String templateName) {
 		ConfigurationTreeModel model = (ConfigurationTreeModel) tree.getModel();
 		Configuration config = (Configuration) model.getRoot();
 
-		if (templateName.indexOf(':') > 0) {
+		if (templateName.indexOf(":") > 0) {
 			String[] s = templateName.split(":");
 			Template template = config.release().esmoduleTemplate(s[1]);
 			Instance original = null;
@@ -2011,8 +2011,7 @@ private static Configuration getConfigurationCopy(Configuration sourceConf) {
 		index = 0;
 		while (ESMit.hasNext()) {
 			ESModuleInstance esmodule = ESMit.next();
-			ESModuleInstance NewModule = configurationCopy.insertESModule(index, esmodule.template().name(),
-					esmodule.name());
+			ESModuleInstance NewModule = configurationCopy.insertESModule(index, esmodule.template().name(), esmodule.name());
 			index++;
 			Iterator<Parameter> itP = esmodule.parameterIterator();
 			while (itP.hasNext()) {
@@ -3068,7 +3067,19 @@ public static boolean insertReference(JTree tree, String type, String name) {
 				return false;
 			reference = config.insertOutputModuleReference(parent, index, referencedOutput);
 		} else if (type.equalsIgnoreCase("Module")) {
-			String[] s = name.split(":");
+			// The "unlikely string" hack.
+			//  Here, the variable "name" can presumably take values of the form
+			//  "pluginType", "pluginType:moduleLabel", or "copy:pluginType:moduleLabel".
+			//  Unfortunately, this convention does not take into account the fact that
+			//  pluginType itself can contain the substring "::" (e.g. plugin types with namespace specification,
+			//  like Alpaka plugins with explicit backend selection).
+			//  The hack below consists in replacing "::" in "name" with "##", before "name" is split by ":".
+			//  After that, the replacement of "::" with this unlikely string is undone in "templateName".
+			// NOTE.
+			//  This hack assumes that plugin types in CMSSW will never
+			//  have "##" in their name, since that would be invalid in C++.
+			String unlikelyStr = "##";
+			String[] s = name.replaceAll("::", unlikelyStr).split(":");
 			String templateName = "";
 			String instanceName = "";
 			boolean copy = false;
@@ -3083,7 +3094,9 @@ public static boolean insertReference(JTree tree, String type, String name) {
 				templateName = s[1];
 				instanceName = s[2];
 			}
-
+
+			templateName = templateName.replaceAll(unlikelyStr, "::");
+
 			ModuleTemplate template = config.release().moduleTemplate(templateName);
 
 			if (!copy) {