Changeset 4105

Timestamp:

Jan 28, 2008, 1:52:31 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #907: "Test with file" function should be able to wrap input stream

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/PluginRequest.java (modified) (1 diff)
• src/core/net/sf/basedb/util/parser/WrappedConfigureByExample.java (added)
• www/common/plugin/parse_file.jsp (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/Install.java

@@ -588 +588 @@
         "wants to use an uploaded file to generate the regular expressions for parsing it.", 
         "net.sf.basedb.util.parser.ConfigureByExample", null);
+      createPluginType("Configure by example (wrapped)", "This is an extension to the 'Configure by example' interface " +
+          "that allows plug-ins to wrap the file with a special input stream when reading from it. " +
+          "It makes it possible, for example, to parse compressed files on the fly.", 
+          "net.sf.basedb.util.parser.WrappedConfigureByExample", null);
       createPluginType("File unpacker", "This interface should be implemented by all plugins that can unpack compressed files. " +
         "The file upload feature uses these plugins for automatic unpacking of compressed files.",

trunk/src/core/net/sf/basedb/core/PluginRequest.java

@@ -271 +271 @@
   /**
     Get the plugin object.
-  */
-  P getPlugin()
+    @since 2.6 (was not public before)
+  */
+  public P getPlugin()
   {
     return plugin;

trunk/www/common/plugin/parse_file.jsp

@@ -35 +35 @@
   import="net.sf.basedb.core.Path"
   import="net.sf.basedb.core.Location"
+  import="net.sf.basedb.core.PluginConfigurationRequest"
+  import="net.sf.basedb.core.plugin.Plugin"
   import="net.sf.basedb.util.parser.FlatFileParser"
+  import="net.sf.basedb.util.parser.WrappedConfigureByExample"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.util.Values"
@@ -60 +63 @@
   String path = request.getParameter("path");
   String charsetName = Values.getString(request.getParameter("charset"), Config.getCharset());
+  PluginConfigurationRequest pcRequest = (PluginConfigurationRequest)sc.getSessionSetting("plugin.configure.request");
+  Plugin plugin = pcRequest.getPlugin();
+  
   File file = null;
   FlatFileParser parser = null;
@@ -147 +153 @@
     
     fileInputStream = file.getDownloadStream(0);
+    if (plugin instanceof WrappedConfigureByExample)
+    {
+      WrappedConfigureByExample wex = (WrappedConfigureByExample)plugin;
+      fileInputStream = wex.wrapInputStream(fileInputStream);
+    }
     parser.setInputStream(fileInputStream, charsetName);
     lastLine = parser.parseHeaders();