Changeset 7482

Timestamp:

May 14, 2018, 8:13:12 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2116: The "Character set" of a file seems to be reverted to the default "ISO-8859-1" in some cases

The problem was that the last used file is auto-selected by the plug-in configuration but it didn't handle the case when the files character set is different than the default character set. This has been fixed by storing the character set in the current context under the key last-file-charset.

The same problem was also present when the auto-detect file format function was used.

Location:

branches/3.12-stable/www/common

Files:

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

branches/3.12-stable/www/common/import/index.jsp

@@ -189 +189 @@
 
     cc.setObject("auto-detected-file", f);
+    cc.setObject("last-file-charset", charset);
     int matches = plugins.size();
     if (matches == 0)

branches/3.12-stable/www/common/plugin/configure.jsp

@@ -99 +99 @@
     }
   }
+  
+  // Special handling for "charset" parameter to make it match the auto-selected file
+  if (currentContext != null && Parameters.CHARSET_PARAMETER.equals(pp.getName()))
+  {
+    Object charset = currentContext.getObject("last-file-charset");
+    if (charset != null) values = Collections.singletonList(charset);
+  }
+  
   // Then, we check the parameters default value
   if ((values == null || values.size() == 0) && pp.getDefaultValue() != null)
@@ -123 +131 @@
         try
         {
-          values.add(File.getById(dc, cc.getId()).getPath().toString());
+          File file = File.getById(dc, cc.getId());
+          values.add(file.getPath().toString());
+          if (currentContext != null && file.getCharacterSet() != null)
+          {
+            currentContext.setObject("last-file-charset", file.getCharacterSet());
+          }
         }
         catch (Throwable t)