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

Added another phone type field to BIZCARD implementation

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@499 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-07-03 20:36:06 +00:00
parent 0ddf4bcf96
commit 2a9feb1f49
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/src/com/google/zxing/client/result/BizcardResultParser.java
View file

@ -18,6 +18,8 @@ package com.google.zxing.client.result;
import com.google.zxing.Result; import com.google.zxing.Result;
import java.util.Vector;
/** /**
* Implements the "BIZCARD" address book entry format, though this has been * Implements the "BIZCARD" address book entry format, though this has been
* largely reverse-engineered from examples observed in the wild -- still * largely reverse-engineered from examples observed in the wild -- still
@ -43,11 +45,12 @@ public final class BizcardResultParser extends AbstractDoCoMoResultParser {
String org = matchSinglePrefixedField("C:", rawText); String org = matchSinglePrefixedField("C:", rawText);
String address = matchSinglePrefixedField("A:", rawText); String address = matchSinglePrefixedField("A:", rawText);
String phoneNumber1 = matchSinglePrefixedField("B:", rawText); String phoneNumber1 = matchSinglePrefixedField("B:", rawText);
String phoneNumber2 = matchSinglePrefixedField("F:", rawText); String phoneNumber2 = matchSinglePrefixedField("M:", rawText);
String phoneNumber3 = matchSinglePrefixedField("F:", rawText);
String email = matchSinglePrefixedField("E:", rawText); String email = matchSinglePrefixedField("E:", rawText);
return new AddressBookParsedResult(maybeWrap(fullName), return new AddressBookParsedResult(maybeWrap(fullName),
buildPhoneNumbers(phoneNumber1, phoneNumber2), buildPhoneNumbers(phoneNumber1, phoneNumber2, phoneNumber3),
maybeWrap(email), maybeWrap(email),
null, null,
address, address,
@ -56,12 +59,26 @@ public final class BizcardResultParser extends AbstractDoCoMoResultParser {
title); title);
} }
private static String[] buildPhoneNumbers(String number1, String number2) { private static String[] buildPhoneNumbers(String number1, String number2, String number3) {
if (number1 == null) { Vector numbers = new Vector(3);
return maybeWrap(number2); if (number1 != null) {
} else { numbers.addElement(number1);
return number2 == null ? new String[] { number1 } : new String[] { number1, number2 };
} }
if (number2 != null) {
numbers.addElement(number2);
}
if (number3 != null) {
numbers.addElement(number3);
}
int size = numbers.size();
if (size == 0) {
return null;
}
String[] result = new String[size];
for (int i = 0; i < size; i++) {
result[i] = (String) numbers.elementAt(i);
}
return result;
} }
private static String buildName(String firstName, String lastName) { private static String buildName(String firstName, String lastName) {