svn commit: r1657933 - in /tika/trunk: CHANGES.txt tika-parsers/src/main/java/org/apache/tika/parser/pkg/RarParser.java

[mattmann]

Author: mattmann
Date: Fri Feb  6 19:42:48 2015
New Revision: 1657933

URL: http://svn.apache.org/r1657933
Log:
Patch for TIKA-936 Fix for RarParser for handling Chinese characters 
contributed by kongxianghe1234 <kong1011437...@gmail.com>. This closes #27.

Modified:
    tika/trunk/CHANGES.txt
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/RarParser.java

Modified: tika/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1657933&r1=1657932&r2=1657933&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Fri Feb  6 19:42:48 2015
@@ -1,5 +1,9 @@
 Release 1.8 - Current Development
 
+  * The RAR parser was updated to handle Chinese characters 
+    using the functionality provided by allowing encoding to
+    be used within ZipArchiveInputStream. (TIKA-936)
+
   * Fix out of memory error in surefire plugin. (TIKA-1537)
 
   * Build a parser to extract data from GRIB formats (TIKA-1423).

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/RarParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/RarParser.java?rev=1657933&r1=1657932&r2=1657933&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/RarParser.java 
(original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/RarParser.java 
Fri Feb  6 19:42:48 2015
@@ -86,7 +86,7 @@ public class RarParser extends AbstractP
                         subFile = rar.getInputStream(header);
 
                         Metadata entrydata = PackageParser.handleEntryMetadata(
-                                header.getFileNameString(),
+                                
"".equals(header.getFileNameW())?header.getFileNameString():header.getFileNameW(),
                                 header.getCTime(), header.getMTime(),
                                 header.getFullUnpackSize(),
                                 xhtml
@@ -114,4 +114,4 @@ public class RarParser extends AbstractP
 
         xhtml.endDocument();
     }
-}
\ No newline at end of file
+}