You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by rg...@apache.org on 2012/12/14 21:24:37 UTC
svn commit: r1422067 - in /tika/trunk:
tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
Author: rgauss
Date: Fri Dec 14 20:24:35 2012
New Revision: 1422067
URL: http://svn.apache.org/viewvc?rev=1422067&view=rev
Log:
TIKA-775: Embed Capabilities
- Removed logging in ExternalEmbedderTest
- Minor formatting changes in ExternalEmbedder for better readability
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java?rev=1422067&r1=1422066&r2=1422067&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java Fri Dec 14 20:24:35 2012
@@ -240,17 +240,14 @@ public class ExternalEmbedder implements
if (metadataCommandArguments != null) {
for (String metadataCommandArgument : metadataCommandArguments) {
if (metadata.isMultiValued(metadataName)) {
- for (String metadataValue : metadata
- .getValues(metadataName)) {
+ for (String metadataValue : metadata.getValues(metadataName)) {
String assignmentValue = metadataValue;
if (quoteAssignmentValues) {
- assignmentValue = "'" + assignmentValue
- + "'";
+ assignmentValue = "'" + assignmentValue + "'";
}
- commandMetadataSegments
- .add(metadataCommandArgument
- + commandAppendOperator
- + assignmentValue);
+ commandMetadataSegments.add(metadataCommandArgument
+ + commandAppendOperator
+ + assignmentValue);
}
} else {
String assignmentValue = metadata.get(metadataName);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java?rev=1422067&r1=1422066&r2=1422067&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java Fri Dec 14 20:24:35 2012
@@ -16,9 +16,6 @@
*/
package org.apache.tika.embedder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -55,9 +52,6 @@ import junit.framework.TestSuite;
*/
public class ExternalEmbedderTest extends TestCase {
- private static final Log logger = LogFactory
- .getLog(ExternalEmbedderTest.class);
-
protected static final DateFormat EXPECTED_METADATA_DATE_FORMATTER =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
protected static final String DEFAULT_CHARSET = "UTF-8";
@@ -191,7 +185,6 @@ public class ExternalEmbedderTest extend
String outputString = null;
if (isResultExpectedInOutput) {
outputString = result.toString(DEFAULT_CHARSET);
- logger.trace("outputString=" + outputString);
} else {
assertTrue("no metadata found", embeddedMetadata.size() > 0);
}
@@ -200,9 +193,6 @@ public class ExternalEmbedderTest extend
for (String metadataName : metadataToEmbed.names()) {
if (metadataToEmbed.get(metadataName) != null) {
String expectedValue = metadataToEmbed.get(metadataName);
- logger.trace("expecting value of '"
- + metadataName + "' = '"
- + expectedValue + "'");
boolean foundExpectedValue = false;
if (isResultExpectedInOutput) {
// just check that the entire output contains the expected string
@@ -210,9 +200,6 @@ public class ExternalEmbedderTest extend
} else {
if (embeddedMetadata.isMultiValued(metadataName)) {
for (String embeddedValue : embeddedMetadata.getValues(metadataName)) {
- logger.debug("embedded values of '"
- + metadataName + "' contains '"
- + embeddedValue + "'");
if (embeddedValue != null) {
if (embeddedValue.contains(expectedValue)) {
foundExpectedValue = true;
@@ -222,9 +209,6 @@ public class ExternalEmbedderTest extend
}
} else {
String embeddedValue = embeddedMetadata.get(metadataName);
- logger.debug("embedded value of '"
- + metadataName + "' = '"
- + embeddedValue + "'");
assertNotNull("expected metadata for "
+ metadataName + " not found",
embeddedValue);
@@ -239,13 +223,10 @@ public class ExternalEmbedderTest extend
}
}
} catch (IOException e) {
- logger.error(e.getMessage(), e);
fail(e.getMessage());
} catch (TikaException e) {
- logger.error(e.getMessage(), e);
fail(e.getMessage());
} catch (SAXException e) {
- logger.error(e.getMessage(), e);
fail(e.getMessage());
}
}