aptivate · sudharsh · Jul 14, 2012 · Jul 14, 2012 · Jul 14, 2012 · Jul 14, 2012
diff --git a/tika-app-1.0.jar → 1.1/tika-app-1.1.jar b/tika-app-1.0.jar → 1.1/tika-app-1.1.jar
diff --git a/tika-core-1.0.jar → 1.1/tika-core-1.1.jar b/tika-core-1.0.jar → 1.1/tika-core-1.1.jar
diff --git a/tika-parsers-1.0.jar → 1.1/tika-parsers-1.1.jar b/tika-parsers-1.0.jar → 1.1/tika-parsers-1.1.jar
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,2 @@
+Chris Wilson (http://github.com/qris)
+Sudharshan S (http://github.com/sudharsh)
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1,11 @@
+2012-07-14  Sudharshan S  <sudharsh@gmail.com>
+
+	* v1.1: Bump up tika version to 1.1
+	Reorganize directories.
+	* setup.py: StringBufferInputStream with ByteArrayInputStream.
+	StringBufferInputStream is deprecated and didn't work with raw binary strings.
+	* parser: Add a parser module with from_file and from_buffer functions
+
+
+
+
diff --git a/README.md b/README.md
@@ -0,0 +1,38 @@
+# python-tika - Python bindings for Apache Tika
+
+## Requirements
+
+* Java >= 1.5
+* [JCC](http://lucene.apache.org/pylucene/jcc/index.html)
+
+## Installation
+	$ python setup.py build
+	$ python setup.py install
+
+## Usage
+
+To use the `AutoDetectParser`,
+
+	import tika
+	tika.initVM()
+
+	from tika import parser
+
+	print parser.from_buffer("<html><body>Hello World</body></html>")
+	# Or directly from a file, 
+	# print parser.from_file("/tmp/foo.doc")
+
+returns a `dict`,
+
+	{'content': u'Hello Cruel World',
+	 'metadata': {u'Content-Encoding': u'ISO-8859-1',
+					  u'Content-Type': u'text/html',
+					  u'title': u'Hello world'}
+	}
+
+
+
+
+
+
+
diff --git a/log4j.properties → lib/log4j.properties b/log4j.properties → lib/log4j.properties
diff --git a/log4j.properties.jar → lib/log4j.properties.jar b/log4j.properties.jar → lib/log4j.properties.jar
diff --git a/org.eclipse.osgi.jar → lib/org.eclipse.osgi.jar b/org.eclipse.osgi.jar → lib/org.eclipse.osgi.jar
diff --git a/parser/__init__.py b/parser/__init__.py
@@ -0,0 +1,30 @@
+import tika
+
+def from_file(filename):
+    """Parse filename using tika's AutoDetectParser."""
+    stream = tika.FileInputStream(tika.File(filename))
+    return __parse(stream)
+
+def from_buffer(string):
+    """Parse raw binary string using tika's AutoDetectParser."""
+    stream = tika.ByteArrayInputStream(tika.JArray_byte(string))
+    return __parse(stream)
+
+def __parse(stream):
+    parsed = {}
+    parser = tika.AutoDetectParser()
+    content = tika.BodyContentHandler()
+    metadata = tika.Metadata()
+    context = tika.ParseContext()
+    parser.parse(stream, content, metadata, context)
+    parsed["content"] = content.toString()
+    parsed["metadata"] = {}
+    for n in metadata.names():
+        parsed["metadata"][n] = metadata.get(n)
+    return parsed
+
+
+
+
+
+
diff --git a/setup.py b/setup.py
@@ -3,15 +3,15 @@
 from jcc import cpp
 
 options = {
-    'include': ('org.eclipse.osgi.jar', 'tika-app-1.0.jar',
-        'log4j.properties.jar'),
-    'jar': ('tika-parsers-1.0.jar', 'tika-core-1.0.jar',),
+    'include': ('lib/org.eclipse.osgi.jar', '1.1/tika-app-1.1.jar',
+        'lib/log4j.properties.jar'),
+    'jar': ('1.1/tika-parsers-1.1.jar', '1.1/tika-core-1.1.jar',),
     'package': ('org.xml.sax',),
     'python': 'tika',
-    'version': '1.0',
+    'version': '1.1',
+    'module': 'parser',
     'reserved': ('asm',),
-    'classes': ('java.io.File', 'java.io.FileInputStream',
-        'java.io.StringBufferInputStream'),
+    'classes': ('java.io.File', 'java.io.FileInputStream', 'java.io.ByteArrayInputStream'),
 }
 
 import sys

diff --git a/tika-icon-large.xcf b/tika-icon-large.xcf
diff --git a/tika-icons.ico b/tika-icons.ico
diff --git a/tika-icons.xcf b/tika-icons.xcf
diff --git a/tika-logo.png b/tika-logo.png
diff --git a/tika-server-1.1-SNAPSHOT.jar b/tika-server-1.1-SNAPSHOT.jar
diff --git a/Tika-WinRun4J.exe → win/Tika-WinRun4J.exe b/Tika-WinRun4J.exe → win/Tika-WinRun4J.exe
diff --git a/Tika-WinRun4J.ini → win/Tika-WinRun4J.ini b/Tika-WinRun4J.ini → win/Tika-WinRun4J.ini
diff --git a/Tika-WinRun4J.jar → win/Tika-WinRun4J.jar b/Tika-WinRun4J.jar → win/Tika-WinRun4J.jar
diff --git a/TikaServiceWinRun4J.jar → win/TikaServiceWinRun4J.jar b/TikaServiceWinRun4J.jar → win/TikaServiceWinRun4J.jar
diff --git a/TikaServiceWinRun4J.java → win/TikaServiceWinRun4J.java b/TikaServiceWinRun4J.java → win/TikaServiceWinRun4J.java
diff --git a/WinRun4J.jar → win/WinRun4J.jar b/WinRun4J.jar → win/WinRun4J.jar
diff --git a/winrun4J-0.4.4.zip → win/winrun4J-0.4.4.zip b/winrun4J-0.4.4.zip → win/winrun4J-0.4.4.zip
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Chris Wilson (http://github.com/qris)
		Sudharshan S (http://github.com/sudharsh)