You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2014/06/06 14:04:42 UTC
svn commit: r1600860 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
test/java/org/apache/tika/parser/font/AdobeFontMetricParserTest.java
test/java/org/apache/tika/parser/font/FontParsersTest.java
Author: nick
Date: Fri Jun 6 12:04:42 2014
New Revision: 1600860
URL: http://svn.apache.org/r1600860
Log:
TIKA-1325 Temp fix - pull out some of the font metadata keys to string constants, and rename the test
Added:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
- copied, changed from r1600844, tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/AdobeFontMetricParserTest.java
Removed:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/AdobeFontMetricParserTest.java
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java?rev=1600860&r1=1600859&r2=1600860&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java Fri Jun 6 12:04:42 2014
@@ -46,7 +46,18 @@ public class AdobeFontMetricParser exten
MediaType.application( "x-font-adobe-metric" );
private static final Set<MediaType> SUPPORTED_TYPES = Collections.singleton(AFM_TYPE);
-
+
+ // TIKA-1325 Replace these with properties, from a well known standard
+ static final String MET_AVG_CHAR_WIDTH = "AvgCharacterWidth";
+ static final String MET_DOC_VERSION = "DocVersion";
+ static final String MET_FONT_NAME = "FontName";
+ static final String MET_FONT_FULL_NAME = "FontFullName";
+ static final String MET_FONT_FAMILY_NAME = "FontFamilyName";
+ static final String MET_FONT_VERSION = "FontVersion";
+ static final String MET_FONT_WEIGHT = "FontWeight";
+ static final String MET_FONT_NOTICE = "FontNotice";
+ static final String MET_FONT_UNDERLINE_THICKNESS = "FontUnderlineThickness";
+
public Set<MediaType> getSupportedTypes( ParseContext context ) {
return SUPPORTED_TYPES;
}
@@ -71,15 +82,15 @@ public class AdobeFontMetricParser exten
metadata.set( TikaCoreProperties.TITLE, fontMetrics.getFullName() );
// Add metadata associated with the font type
- addMetadataByString( metadata, "AvgCharacterWidth", Float.toString( fontMetrics.getAverageCharacterWidth() ) );
- addMetadataByString( metadata, "DocVersion", Float.toString( fontMetrics.getAFMVersion() ) );
- addMetadataByString( metadata, "FontName", fontMetrics.getFontName() );
- addMetadataByString( metadata, "FontFullName", fontMetrics.getFullName() );
- addMetadataByString( metadata, "FontFamilyName", fontMetrics.getFamilyName() );
- addMetadataByString( metadata, "FontVersion", fontMetrics.getFontVersion() );
- addMetadataByString( metadata, "FontWeight", fontMetrics.getWeight() );
- addMetadataByString( metadata, "FontNotice", fontMetrics.getNotice() );
- addMetadataByString( metadata, "FontUnderlineThickness", Float.toString( fontMetrics.getUnderlineThickness() ) );
+ addMetadataByString( metadata, MET_AVG_CHAR_WIDTH, Float.toString( fontMetrics.getAverageCharacterWidth() ) );
+ addMetadataByString( metadata, MET_DOC_VERSION, Float.toString( fontMetrics.getAFMVersion() ) );
+ addMetadataByString( metadata, MET_FONT_NAME, fontMetrics.getFontName() );
+ addMetadataByString( metadata, MET_FONT_FULL_NAME, fontMetrics.getFullName() );
+ addMetadataByString( metadata, MET_FONT_FAMILY_NAME, fontMetrics.getFamilyName() );
+ addMetadataByString( metadata, MET_FONT_VERSION, fontMetrics.getFontVersion() );
+ addMetadataByString( metadata, MET_FONT_WEIGHT, fontMetrics.getWeight() );
+ addMetadataByString( metadata, MET_FONT_NOTICE, fontMetrics.getNotice() );
+ addMetadataByString( metadata, MET_FONT_UNDERLINE_THICKNESS, Float.toString( fontMetrics.getUnderlineThickness() ) );
// Output the remaining comments as text
XHTMLContentHandler xhtml = new XHTMLContentHandler( handler, metadata );
Copied: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java (from r1600844, tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/AdobeFontMetricParserTest.java)
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java?p2=tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java&p1=tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/AdobeFontMetricParserTest.java&r1=1600844&r2=1600860&rev=1600860&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/AdobeFontMetricParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java Fri Jun 6 12:04:42 2014
@@ -29,11 +29,12 @@ import org.xml.sax.ContentHandler;
import org.apache.tika.io.TikaInputStream;
import org.junit.Test;
+import static org.apache.tika.parser.font.AdobeFontMetricParser.*;
+
/**
- * Test case for parsing afm files.
+ * Test case for parsing various different font files.
*/
-public class AdobeFontMetricParserTest {
-
+public class FontParsersTest {
@Test
public void testAdobeFontMetricParsing() throws Exception {
Parser parser = new AutoDetectParser(); // Should auto-detect!
@@ -41,7 +42,7 @@ public class AdobeFontMetricParserTest {
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
TikaInputStream stream = TikaInputStream.get(
- AdobeFontMetricParserTest.class.getResource(
+ FontParsersTest.class.getResource(
"/test-documents/testAFM.afm"));
try {
@@ -54,12 +55,12 @@ public class AdobeFontMetricParserTest {
assertEquals("TestFullName", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Fri Jul 15 17:50:51 2011", metadata.get(Metadata.CREATION_DATE));
- assertEquals("TestFontName", metadata.get("FontName"));
- assertEquals("TestFullName", metadata.get("FontFullName"));
- assertEquals("TestSymbol", metadata.get("FontFamilyName"));
+ assertEquals("TestFontName", metadata.get(MET_FONT_NAME));
+ assertEquals("TestFullName", metadata.get(MET_FONT_FULL_NAME));
+ assertEquals("TestSymbol", metadata.get(MET_FONT_FAMILY_NAME));
- assertEquals("Medium", metadata.get("FontWeight"));
- assertEquals("001.008", metadata.get("FontVersion"));
+ assertEquals("Medium", metadata.get(MET_FONT_WEIGHT));
+ assertEquals("001.008", metadata.get(MET_FONT_VERSION));
String content = handler.toString();