-
Notifications
You must be signed in to change notification settings - Fork 798
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TIKA-4278 -- remove colon from default and allow users to customize d… (
#1976) * TIKA-4278 -- remove colon from default and allow users to customize delimiters
- Loading branch information
Showing
6 changed files
with
145 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...es/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * 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.csv; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class TextAndCSVConfig implements Serializable { | ||
|
|
||
| private static final Map<Character, String> DELIMITER_TO_NAME_MAP = new HashMap<>(); | ||
| private static final Map<String, Character> NAME_TO_DELIMITER_MAP = new HashMap<>(); | ||
|
|
||
| static { | ||
| DELIMITER_TO_NAME_MAP.put(',', "comma"); | ||
| DELIMITER_TO_NAME_MAP.put('\t', "tab"); | ||
| DELIMITER_TO_NAME_MAP.put('|', "pipe"); | ||
| DELIMITER_TO_NAME_MAP.put(';', "semicolon"); | ||
| } | ||
|
|
||
| static { | ||
| for (Map.Entry<Character, String> e : DELIMITER_TO_NAME_MAP.entrySet()) { | ||
| NAME_TO_DELIMITER_MAP.put(e.getValue(), e.getKey()); | ||
| } | ||
| } | ||
|
|
||
| private Map<String, Character> nameToDelimiterMap = NAME_TO_DELIMITER_MAP; | ||
| private Map<Character, String> delimiterToNameMap = DELIMITER_TO_NAME_MAP; | ||
|
|
||
| public Map<String, Character> getNameToDelimiterMap() { | ||
| return nameToDelimiterMap; | ||
| } | ||
|
|
||
| public Map<Character, String> getDelimiterToNameMap() { | ||
| return delimiterToNameMap; | ||
| } | ||
|
|
||
| public void setNameToDelimiterMap(Map<String, Character> nameToDelimiterMap) { | ||
| this.nameToDelimiterMap = new HashMap<>(nameToDelimiterMap); | ||
| this.delimiterToNameMap = new HashMap<>(); | ||
| nameToDelimiterMap.entrySet() | ||
| .forEach(e -> delimiterToNameMap.put(e.getValue(), e.getKey())); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...s/tika-parser-text-module/src/test/resources/test-configs/tika-config-colon-delimiter.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <properties> | ||
| <parsers> | ||
| <parser class="org.apache.tika.parser.DefaultParser"/> | ||
| <parser class="org.apache.tika.parser.csv.TextAndCSVParser"> | ||
| <params> | ||
| <param name="nameToDelimiterMap" type="map"> | ||
| <entry key="comma" value=","/> | ||
| <entry key="colon" value=":"/> | ||
| </param> | ||
| </params> | ||
| </parser> | ||
| </parsers> | ||
| </properties> |
13 changes: 13 additions & 0 deletions
13
...-modules/tika-parser-text-module/src/test/resources/test-documents/testColonDelimited.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| a:b:c:d | ||
| 1:2:3:4 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 | ||
| 5:6:7:8 |