svn commit: r814238 - in /lucene/tika/trunk/tika-app/src/main/java/org/apache/tika: cli/TikaCLI.java gui/TikaGUI.java

[ju...@apache.org]

Author: jukka
Date: Sat Sep 12 21:09:00 2009
New Revision: 814238

URL: http://svn.apache.org/viewvc?rev=814238&view=rev
Log:
TIKA-275: Parse context

Use the new parse() method signature in TikaCLI and Tika GUI.

Modified:
    lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
    lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java

Modified: lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java?rev=814238&r1=814237&r2=814238&view=diff
==============================================================================
--- lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java (original)
+++ lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java Sat Sep 12 21:09:00 2009
@@ -22,6 +22,8 @@
 import java.io.PrintStream;
 import java.net.URL;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerConfigurationException;
@@ -61,6 +63,8 @@
         }
     }
 
+    private Map<String, Object> context;
+
     private Parser parser;
 
     private Metadata metadata;
@@ -70,7 +74,9 @@
     private boolean pipeMode = true;
 
     public TikaCLI() throws TransformerConfigurationException {
+        context = new HashMap<String, Object>();
         parser = new AutoDetectParser();
+        context.put(Parser.class.getName(), parser);
         handler = getXmlContentHandler();
     }
 
@@ -95,7 +101,7 @@
             pipeMode = false;
             metadata = new Metadata();
             if (arg.equals("-")) {
-                parser.parse(System.in, handler, metadata);
+                parser.parse(System.in, handler, metadata, context);
             } else {
                 InputStream input;
                 File file = new File(arg);
@@ -113,7 +119,7 @@
                     input = url.openStream();
                 }
                 try {
-                    parser.parse(input, handler, metadata);
+                    parser.parse(input, handler, metadata, context);
                 } finally {
                     input.close();
                 }

Modified: lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java?rev=814238&r1=814237&r2=814238&view=diff
==============================================================================
--- lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java (original)
+++ lucene/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java Sat Sep 12 21:09:00 2009
@@ -17,14 +17,14 @@
 package org.apache.tika.gui;
 
 import java.awt.Dimension;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.JEditorPane;
 import javax.swing.JFrame;
@@ -75,6 +75,11 @@
     }
 
     /**
+     * Parsing context.
+     */
+    private final Map<String, Object> context;
+
+    /**
      * Configured parser instance.
      */
     private final Parser parser;
@@ -125,7 +130,9 @@
         setPreferredSize(new Dimension(500, 400));
         pack();
 
+        this.context = new HashMap<String, Object>();
         this.parser = parser;
+        this.context.put(Parser.class.getName(), parser);
     }
 
    public void importStream(InputStream input) throws IOException {
@@ -143,7 +150,7 @@
 
             input = new ProgressMonitorInputStream(
                     this, "Parsing stream", input);
-            parser.parse(input, handler, md);
+            parser.parse(input, handler, md, context);
 
             String[] names = md.names();
             Arrays.sort(names);