Changeset 4111

Timestamp:

Jan 31, 2008, 8:37:04 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #910: Plug-ins ignore file set by the auto-detect file format function

Location:

trunk/www/common

Files:

• import/index.jsp (modified) (1 diff)
• plugin/configure.jsp (modified) (1 diff)

trunk/www/common/import/index.jsp

@@ -187 +187 @@
       AutoDetectFileFormat.findPlugins(dc, context, f, plugin);
 
-    sc.getCurrentContext(Item.FILE).setId(f.getId());
+    cc.setObject("auto-detected-file", f);
     int matches = plugins.size();
     if (matches == 0)

trunk/www/common/plugin/configure.jsp

@@ -137 +137 @@
             // ...or in the current values from the job / plugin configuration
             List values = requestValues != null ? Arrays.asList(requestValues) : pcRequest.getCurrentParameterValues(param.getName());
+            // File parameters should also check the auto-detected-file (if not enumeration)
+            if ((values == null || values.size() == 0) && !pType.isEnumeration() && 
+              pType instanceof FileParameterType)
+            {
+              if (currentContext != null && currentContext.getObject("auto-detected-file") != null)
+              {
+                values =  Collections.singletonList(currentContext.getObject("auto-detected-file"));
+                currentContext.setObject("auto-detected-file", null);
+              }
+            }
             // Then, we check the parameters default value
             if ((values == null || values.size() == 0) && param.getDefaultValue() != null)