Implement #13

src/main/java/com/solab/iso8583/parse/FieldParseInfo.java

@@ -34,6 +34,7 @@ public abstract class FieldParseInfo {
 	protected IsoType type;
 	protected int length;
 	private String encoding = System.getProperty("file.encoding");
+    protected boolean forceStringDecoding;
 
 	/** Creates a new instance that parses a value of the specified type, with the specified length.
 	 * The length is only useful for ALPHA and NUMERIC types.
@@ -47,6 +48,13 @@ public abstract class FieldParseInfo {
 		length = len;
 	}
 
+    /** Specified whether length headers for variable-length fields in text mode should
+     * be decoded using proper string conversion with the character encoding. Default is false,
+     * which means use the old behavior of decoding as ASCII. */
+    public void setForceStringDecoding(boolean flag) {
+        forceStringDecoding = flag;
+    }
+
 	public void setCharacterEncoding(String value) {
 		encoding = value;
 	}
@@ -119,4 +127,14 @@ public abstract class FieldParseInfo {
 		return fpi;
 	}
 
+    protected int decodeLength(byte[] buf, int pos, int digits) throws UnsupportedEncodingException {
+        if (forceStringDecoding) {
+            return Integer.parseInt(new String(buf, pos, digits, encoding));
+        } else if (digits == 3) {
+            return ((buf[pos] - 48) * 100) + ((buf[pos + 1] - 48) * 10) + (buf[pos + 2] - 48);
+        } else {
+            return ((buf[pos] - 48) * 10) + (buf[pos + 1] - 48);
+        }
+    }
+
 }

src/main/java/com/solab/iso8583/parse/LlbinParseInfo.java

@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 package com.solab.iso8583.parse;
 
+import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
 
 import com.solab.iso8583.CustomBinaryField;
@@ -40,7 +41,7 @@ public class LlbinParseInfo extends FieldParseInfo {
 	@Override
 	public <T> IsoValue<?> parse(final int field, final byte[] buf,
                              final int pos, final CustomField<T> custom)
-            throws ParseException {
+            throws ParseException, UnsupportedEncodingException {
 		if (pos < 0) {
 			throw new ParseException(String.format("Invalid LLBIN field %d position %d",
                     field, pos), pos);
@@ -48,7 +49,7 @@ public class LlbinParseInfo extends FieldParseInfo {
 			throw new ParseException(String.format("Insufficient LLBIN header field %d",
                     field), pos);
 		}
-		length = ((buf[pos] - 48) * 10) + (buf[pos + 1] - 48);
+		length = decodeLength(buf, pos, 2);
 		if (length < 0) {
 			throw new ParseException(String.format("Invalid LLBIN field %d length %d pos %d",
                     field, length, pos), pos);

src/main/java/com/solab/iso8583/parse/LllbinParseInfo.java

@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 package com.solab.iso8583.parse;
 
+import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
 
 import com.solab.iso8583.CustomBinaryField;
@@ -40,7 +41,7 @@ public class LllbinParseInfo extends FieldParseInfo {
 	@Override
 	public <T> IsoValue<?> parse(final int field, final byte[] buf,
                              final int pos, final CustomField<T> custom)
-            throws ParseException {
+            throws ParseException, UnsupportedEncodingException {
 		if (pos < 0) {
 			throw new ParseException(String.format("Invalid LLLBIN field %d pos %d",
                     field, pos), pos);
@@ -48,11 +49,7 @@ public class LllbinParseInfo extends FieldParseInfo {
 			throw new ParseException(String.format("Insufficient LLLBIN header field %d",
                     field), pos);
 		}
-		if (!(Character.isDigit(buf[pos]) && Character.isDigit(buf[pos+1]) && Character.isDigit(buf[pos+2]))) {
-			throw new ParseException(String.format("Invalid LLLBIN length '%s' field %d pos %d",
-                    new String(buf, pos, 3), field, pos), pos);
-		}
-		final int l = ((buf[pos] - 48) * 100) + ((buf[pos + 1] - 48) * 10) + (buf[pos + 2] - 48);
+		final int l = decodeLength(buf, pos, 3);
 		if (l < 0) {
 			throw new ParseException(String.format("Invalid LLLBIN length %d field %d pos %d",
                     l, field, pos), pos);

src/main/java/com/solab/iso8583/parse/LllvarParseInfo.java

@@ -46,11 +46,7 @@ public class LllvarParseInfo extends FieldParseInfo {
 			throw new ParseException(String.format(
                     "Insufficient data for LLLVAR header field %d pos %d", field, pos), pos);
 		}
-		if (!(Character.isDigit(buf[pos]) && Character.isDigit(buf[pos+1]) && Character.isDigit(buf[pos+2]))) {
-			throw new ParseException(String.format("Invalid LLLVAR length '%s' field %d pos %d",
-				new String(buf, pos, 3), field, pos), pos);
-		}
-		length = ((buf[pos] - 48) * 100) + ((buf[pos + 1] - 48) * 10) + (buf[pos + 2] - 48);
+        length = decodeLength(buf, pos, 3);
 		if (length < 0) {
 			throw new ParseException(String.format("Invalid LLLVAR length %d field %d pos %d",
                     length, field, pos), pos);

src/main/java/com/solab/iso8583/parse/LlvarParseInfo.java

@@ -44,7 +44,7 @@ public class LlvarParseInfo extends FieldParseInfo {
 		} else if (pos+2 > buf.length) {
 			throw new ParseException(String.format("Insufficient data for LLVAR header, pos %d", pos), pos);
 		}
-		length = ((buf[pos] - 48) * 10) + (buf[pos + 1] - 48);
+		length = decodeLength(buf, pos, 2);
 		if (length < 0) {
 			throw new ParseException(String.format(
                     "Invalid LLVAR length %d, field %d pos %d", length, field, pos), pos);