mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevented ISBN parsing from happening twice.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@610 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-10-09 18:46:21 +00:00
parent 83c01f0cee
commit 7fe2c1c60c
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/com/google/zxing/client/result/ResultParser.java
View file

@ -66,6 +66,7 @@ public abstract class ResultParser {
} else if ((result = URIResultParser.parse(theResult)) != null) { } else if ((result = URIResultParser.parse(theResult)) != null) {
return result; return result;
} else if ((result = ISBNResultParser.parse(theResult)) != null) { } else if ((result = ISBNResultParser.parse(theResult)) != null) {
// We depend on ISBN parsing coming before UPC, as it is a subset.
return result; return result;
} else if ((result = UPCResultParser.parse(theResult)) != null) { } else if ((result = UPCResultParser.parse(theResult)) != null) {
return result; return result;

3
core/src/com/google/zxing/client/result/UPCResultParser.java
View file

@ -36,9 +36,6 @@ final class UPCResultParser extends ResultParser {
!BarcodeFormat.EAN_8.equals(format) && !BarcodeFormat.EAN_13.equals(format)) { !BarcodeFormat.EAN_8.equals(format) && !BarcodeFormat.EAN_13.equals(format)) {
return null; return null;
} }
if (ISBNResultParser.parse(result) != null) {
return null;
}
String rawText = result.getText(); String rawText = result.getText();
if (rawText == null) { if (rawText == null) {
return null; return null;