Add new FileMap options to Metamorph schema. (#471)

Author: blackwinter

metamorph/src/main/resources/schemata/metamorph.xsd

@@ -629,6 +629,37 @@
                         The default separator is the tabulator. </documentation>
                 </annotation>
             </attribute>
+            <attribute name="keyColumn" use="optional" default="0">
+                <annotation>
+                    <documentation>Sets the key column (0-based).</documentation>
+                </annotation>
+                <simpleType>
+                    <restriction base="int">
+                        <minInclusive value="0" />
+                    </restriction>
+                </simpleType>
+            </attribute>
+            <attribute name="valueColumn" use="optional" default="1">
+                <annotation>
+                    <documentation>Sets the value column (0-based).</documentation>
+                </annotation>
+                <simpleType>
+                    <restriction base="int">
+                        <minInclusive value="0" />
+                    </restriction>
+                </simpleType>
+            </attribute>
+            <attribute name="expectedColumns" use="optional" default="0">
+                <annotation>
+                    <documentation>Sets number of expected columns; set to -1 to disable
+                        column check.</documentation>
+                </annotation>
+                <simpleType>
+                    <restriction base="int">
+                        <minInclusive value="-1" />
+                    </restriction>
+                </simpleType>
+            </attribute>
             <attribute ref="xml:base" />
         </complexType>
     </element>

metamorph/src/test/java/org/metafacture/metamorph/maps/FileMapTest.java

@@ -72,6 +72,24 @@ public void shouldLookupValuesInFileBasedMap() {
         );
     }
 
+    @Test
+    public void shouldLookupValuesInFileBasedMapWithColumnOptions() {
+        assertMorph(receiver, buildMorph("lookup in", "keyColumn=\"1\" valueColumn=\"0\" expectedColumns=\"2\""),
+                i -> {
+                    i.startRecord("1");
+                    i.literal("1", "Germany");
+                    i.literal("1", "Fiji");
+                    i.endRecord();
+                },
+                o -> {
+                    o.get().startRecord("1");
+                    o.get().literal("1", "gw");
+                    o.get().literal("1", "fj");
+                    o.get().endRecord();
+                }
+        );
+    }
+
     @Test
     public void shouldWhitelistValuesInFileBasedMap() {
         assertMorph(receiver, buildMorph("whitelist map", ""),