Merge pull request #135 from dr0i/simple-character-class

Simple character class

Author: Markus M. Geipel

src/main/java/org/culturegraph/mf/morph/WildcardDataRegistry.java

@@ -17,6 +17,7 @@
 
 import java.util.List;
 
+import org.culturegraph.mf.util.tries.SimpleRegexTrie;
 import org.culturegraph.mf.util.tries.WildcardTrie;
 
 
@@ -28,7 +29,7 @@
  */
 final class WildcardRegistry<T> implements Registry<T> {
 
-	private final WildcardTrie<T> trie = new WildcardTrie<T>();
+	private final SimpleRegexTrie<T> trie = new SimpleRegexTrie<T>();
 
 	@Override
 	public void register(final String path, final T value) {

src/main/java/org/culturegraph/mf/util/tries/SimpleRegexTrie.java

@@ -0,0 +1,63 @@
+/*
+ *  Copyright 2013 Pascal Christoph, hbz
+ *
+ *  Licensed 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.culturegraph.mf.util.tries;
+
+import java.util.List;
+
+/**
+ * A wrapper for the {@link WildcardTrie} enabling the use of simple character
+ * classes .
+ * 
+ * @author Pascal Christoph
+ * 
+ * @param <P>
+ *            type of value stored
+ */
+public class SimpleRegexTrie<P> {
+
+	private final WildcardTrie<P> trie;
+	public static final String SIMPLE_CHARACTER_CLASS = "\\[.*\\]";
+
+	public SimpleRegexTrie() {
+		trie = new WildcardTrie<P>();
+	}
+
+	/**
+	 * Enables the use of simple character classes like 'a[agt][ac]'. Calls the
+	 * method of {@link WildcardTrie} for further treatment.
+	 * 
+	 * @param keys
+	 * @param value
+	 */
+	public void put(final String keys, final P value) {
+		if (keys.matches(".*" + SIMPLE_CHARACTER_CLASS + ".*")) {
+			int charClassStart = keys.indexOf('[', 0);
+			final int charClassEnd = keys.indexOf(']', 1);
+			String begin = keys.substring(0, charClassStart);
+			for (; charClassStart < charClassEnd - 1; charClassStart++) {
+				char middle = keys.charAt(charClassStart + 1);
+				String end = keys.substring(charClassEnd + 1, keys.length());
+				put(begin + middle + end, value);
+			}
+		} else
+			trie.put(keys, value);
+	}
+
+	public List<P> get(final String key) {
+		return trie.get(key);
+	}
+
+}

src/test/java/org/culturegraph/mf/morph/MetamorphTest.xml

@@ -133,7 +133,7 @@
 				</mm:rules>
 			</mm:metamorph>
 		</transformation>
-
+		
 		<result type="text/x-cg+xml" strict-key-order="false">
 			<cgxml:cgxml version="1.0">
 				<cgxml:records>
@@ -146,6 +146,52 @@
 			</cgxml:cgxml>
 		</result>
 	</test-case>
+		
+	<test-case name="[abc] simple character class match">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:entity name="ABA">
+							<cgxml:literal name="d" value="Aloha1" />
+						</cgxml:entity>
+						<cgxml:entity name="ABA">
+							<cgxml:literal name="e" value="Aloha2" />
+						</cgxml:entity>
+						<cgxml:entity name="ABC">
+							<cgxml:literal name="d" value="Aloha3" />
+						</cgxml:entity>
+						<cgxml:entity name="ABC">
+							<cgxml:literal name="e" value="Aloha4" />
+						</cgxml:entity>
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<mm:metamorph version="1">
+				<mm:rules>
+					<mm:data source="AB[AC].[de]" name="Hawaii" />
+					<mm:data source="ABC.d" name="Oahu" />
+				</mm:rules>
+			</mm:metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml" strict-key-order="false">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="Oahu" value="Aloha3" />
+						<cgxml:literal name="Hawaii" value="Aloha1" />
+						<cgxml:literal name="Hawaii" value="Aloha2" />
+						<cgxml:literal name="Hawaii" value="Aloha3" />
+						<cgxml:literal name="Hawaii" value="Aloha4" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
 
 	<test-case name="xinclude">
 		<input type="text/x-cg+xml">