Prevented ISBN parsing from happening twice.

git-svn-id: http://zxing.googlecode.com/svn/trunk@610 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/src/com/google/zxing/client/result/ResultParser.java b/core/src/com/google/zxing/client/result/ResultParser.java
index 4aa5431..d74dfc4 100644 (file)
--- a/core/src/com/google/zxing/client/result/ResultParser.java
+++ b/core/src/com/google/zxing/client/result/ResultParser.java
@@ -66,6 +66,7 @@ public abstract class ResultParser {
     } else if ((result = URIResultParser.parse(theResult)) != null) {
       return result;
     } else if ((result = ISBNResultParser.parse(theResult)) != null) {
+      // We depend on ISBN parsing coming before UPC, as it is a subset.
       return result;
     } else if ((result = UPCResultParser.parse(theResult)) != null) {
       return result;

diff --git a/core/src/com/google/zxing/client/result/UPCResultParser.java b/core/src/com/google/zxing/client/result/UPCResultParser.java
index b2ab387..331d57b 100644 (file)
--- a/core/src/com/google/zxing/client/result/UPCResultParser.java
+++ b/core/src/com/google/zxing/client/result/UPCResultParser.java
@@ -36,9 +36,6 @@ final class UPCResultParser extends ResultParser {
         !BarcodeFormat.EAN_8.equals(format) && !BarcodeFormat.EAN_13.equals(format)) {
       return null;
     }
-    if (ISBNResultParser.parse(result) != null) {
-      return null;
-    }
     String rawText = result.getText();
     if (rawText == null) {
       return null;