Author: jukka
Date: Wed Apr 14 10:57:43 2010
New Revision: 933909
URL: http://svn.apache.org/viewvc?rev=933909&view=rev
Log:
TIKA-379: Html elements and attributes not available in XHTML representation
Add an IdentityHtmlMapper class for use cases where the full input HTML is
needed
Added:
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
(with props)
Modified:
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
Modified:
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java?rev=933909&r1=933908&r2=933909&view=diff
==============================================================================
---
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
(original)
+++
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
Wed Apr 14 10:57:43 2010
@@ -23,6 +23,11 @@ package org.apache.tika.parser.html;
*/
public class DefaultHtmlMapper implements HtmlMapper {
+ /**
+ * @since Apache Tika 0.8
+ */
+ public static final HtmlMapper INSTANCE = new DefaultHtmlMapper();
+
public String mapSafeElement(String name) {
// Based on http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
Modified:
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java?rev=933909&r1=933908&r2=933909&view=diff
==============================================================================
---
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
(original)
+++
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
Wed Apr 14 10:57:43 2010
@@ -54,11 +54,6 @@ public class HtmlParser implements Parse
MediaType.application("vnd.wap.xhtml+xml"),
MediaType.application("x-asp"))));
- /**
- * The default HTML mapping.
- */
- private static final HtmlMapper mapper = new DefaultHtmlMapper();
-
// Use the widest, most common charset as our default.
private static final String DEFAULT_CHARSET = "windows-1252";
// TIKA-357 - use bigger buffer for meta tag sniffing (was 4K)
@@ -219,7 +214,7 @@ public class HtmlParser implements Parse
* <code>null</code> if the element is unsafe
*/
protected String mapSafeElement(String name) {
- return mapper.mapSafeElement(name);
+ return DefaultHtmlMapper.INSTANCE.mapSafeElement(name);
}
/**
@@ -235,7 +230,7 @@ public class HtmlParser implements Parse
* should be ignored, <code>false</code> otherwise
*/
protected boolean isDiscardElement(String name) {
- return "STYLE".equals(name) || "SCRIPT".equals(name);
+ return DefaultHtmlMapper.INSTANCE.isDiscardElement(name);
}
/**
Added:
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java?rev=933909&view=auto
==============================================================================
---
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
(added)
+++
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
Wed Apr 14 10:57:43 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.parser.html;
+
+/**
+ * Alternative HTML mapping rules that pass the input HTML
+ * as-is without any modifications.
+ *
+ * @since Apache Tika 0.8
+ */
+public class IdentityHtmlMapper implements HtmlMapper {
+
+ public static final HtmlMapper INSTANCE = new IdentityHtmlMapper();
+
+ public boolean isDiscardElement(String name) {
+ return false;
+ }
+
+ public String mapSafeElement(String name) {
+ return name;
+ }
+
+}
Propchange:
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
