You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by se...@apache.org on 2011/08/17 13:06:43 UTC
svn commit: r1158626 -
/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
Author: sergey
Date: Wed Aug 17 11:06:42 2011
New Revision: 1158626
URL: http://svn.apache.org/viewvc?rev=1158626&view=rev
Log:
do not throw exception if ExtractorFactory is available in classpath, but xbean.jar not
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java?rev=1158626&r1=1158625&r2=1158626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java Wed Aug 17 11:06:42 2011
@@ -48,12 +48,16 @@ import org.apache.poi.hwpf.usermodel.Tab
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.util.Beta;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@Beta
public class WordToTextConverter extends AbstractWordConverter
{
+ private static final POILogger logger = POILogFactory
+ .getLogger( WordToTextConverter.class );
public static String getText( DirectoryNode root ) throws Exception
{
@@ -325,7 +329,10 @@ public class WordToTextConverter extends
return false;
DirectoryNode directoryNode = (DirectoryNode) entry;
- // even if no ExtractorFactory in classpath
+ /*
+ * even if there is no ExtractorFactory in classpath, still support
+ * included Word's objects
+ */
if ( directoryNode.hasEntry( "WordDocument" ) )
{
String text = WordToTextConverter.getText( (DirectoryNode) entry );
@@ -335,14 +342,27 @@ public class WordToTextConverter extends
return true;
}
+ Object extractor;
try
{
Class<?> cls = Class
.forName( "org.apache.poi.extractor.ExtractorFactory" );
Method createExtractor = cls.getMethod( "createExtractor",
DirectoryNode.class );
- Object extractor = createExtractor.invoke( null, directoryNode );
+ extractor = createExtractor.invoke( null, directoryNode );
+ }
+ catch ( Error exc )
+ {
+ // no extractor in classpath
+ logger.log( POILogger.WARN, "There is an OLE object entry '",
+ entry.getName(),
+ "', but there is no text extractor for this object type ",
+ "or text extractor factory is not available: ", "" + exc );
+ return false;
+ }
+ try
+ {
Method getText = extractor.getClass().getMethod( "getText" );
String text = (String) getText.invoke( extractor );
@@ -351,12 +371,13 @@ public class WordToTextConverter extends
+ UNICODECHAR_ZERO_WIDTH_SPACE ) );
return true;
}
- catch ( ClassNotFoundException exc )
+ catch ( Exception exc )
{
- // no extractor in classpath
+ logger.log( POILogger.ERROR,
+ "Unable to extract text from OLE entry '", entry.getName(),
+ "': ", exc, exc );
+ return false;
}
-
- return false;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org