Skip to content

Support for new data formats and improve date formatting #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Asutosh11 wants to merge 1 commit into
base: master
Choose a base branch
from
+63 −9
Open

Support for new data formats and improve date formatting #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 33 additions & 9 deletions app/src/main/java/org/commcarehq/aadharuid/ScanResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,21 @@ public class ScanResult {
public final String house;
public final String street;
public final String lm; // address
public final String loc; // neighborhood
public String loc; // neighborhood
public final String vtc; // village
public final String po; // city
public final String dist; // district
public String dist; // district
public final String subdist; // region
public final String state;
public final String pc; // postal code
public final String dob; // date of birth
public String pc; // postal code
public String dob; // date of birth
public final String dobGuess; // date of birth or June 1 of year of birth
public final String statusText; // either `"✓"` (success) or `"✗"` (any failure)
public final String type; // either `"✓"` (success) or `"✗"` (any failure)

// all 4 date formats are possible and exist in reality
private final String[] possibleDateFormats = new String[] {"dd/MM/yyyy", "yyyy-MM-dd", "dd-MM-yyyy", "yyyy/MM/dd"};

private String getAttributeOrEmptyString(NamedNodeMap attributes, String attributeName) {
Node node = attributes.getNamedItem(attributeName);
if (node != null) {
Expand All @@ -72,7 +75,6 @@ private String getAttributeOrEmptyString(NamedNodeMap attributes, String attribu

public ScanResult(String input) {
rawString = input;

// copied from http://www.java-samples.com/showtutorial.php?tutorialid=152
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
Document dom;
Expand Down Expand Up @@ -113,14 +115,31 @@ public ScanResult(String input) {
street = getAttributeOrEmptyString(attributes, "street");
lm = getAttributeOrEmptyString(attributes, "lm");
loc = getAttributeOrEmptyString(attributes, "loc");
// some non secure AADHAAR cards have loc and some have locality property
if (loc == null || loc.equals("")) {
loc = getAttributeOrEmptyString(attributes, "locality");
}
vtc = getAttributeOrEmptyString(attributes, "vtc");
po = getAttributeOrEmptyString(attributes, "po");
dist = getAttributeOrEmptyString(attributes, "dist");
// some non secure AADHAAR cards have dist and some have districtName property
if (dist == null || dist.equals("")) {
dist = getAttributeOrEmptyString(attributes, "districtName");
}
subdist = getAttributeOrEmptyString(attributes, "subdist");
state = getAttributeOrEmptyString(attributes, "state");
pc = getAttributeOrEmptyString(attributes, "pc");
dob= formatDate(getAttributeOrEmptyString(attributes, "dob"),
new String[] {"dd/MM/yyyy", "yyyy-MM-dd"});
// some non secure AADHAAR cards have pc and some have pincode property
if (pc == null || pc.equals("")) {
pc = getAttributeOrEmptyString(attributes, "pincode");
}
dob = formatDate(getAttributeOrEmptyString(attributes, "dob"),
possibleDateFormats);
// some non secure AADHAAR cards have dob and some have dateOfBirth property
if (dob == null || dob.equals("")) {
dob = formatDate(getAttributeOrEmptyString(attributes, "dateOfBirth"),
possibleDateFormats);
}

} else if (rawString.matches("\\d{12}")) {
type = QR_CODE_TYPE_UID_NUMBER;
Expand Down Expand Up @@ -155,7 +174,7 @@ public ScanResult(String input) {
uid = referenceId.substring(0, 4);
name = getValueInRange(msgInBytes, delimiters[1] + 1, delimiters[2]);
dob = formatDate(getValueInRange(msgInBytes, delimiters[2] + 1, delimiters[3]),
new String[] {"dd-MM-yyyy", "dd/MM/yyyy"});
possibleDateFormats);
yob = dob.substring(0, 4);
gender = getValueInRange(msgInBytes, delimiters[3] + 1, delimiters[4]);
co = getValueInRange(msgInBytes, delimiters[4] + 1, delimiters[5]);
Expand Down Expand Up @@ -267,6 +286,11 @@ private String formatDate(String rawDateString, String[] possibleFormats) {
for (String fromFormatPattern : possibleFormats) {
try {
SimpleDateFormat fromFormat = new SimpleDateFormat(fromFormatPattern);
/**
* to make sure that issue like this - https://stackoverflow.com/questions/30252716/simpledateformat-parse-generates-wrong-date-for-different-date-formats
* doesn't happen
*/
fromFormat.setLenient(false);
date = fromFormat.parse(rawDateString);
break;
} catch (ParseException e) {
Expand Down Expand Up @@ -322,4 +346,4 @@ private String getDobGuess(String dob, String yob) {
return dob;
}
}
}
}
30 changes: 30 additions & 0 deletions app/src/test/java/org/commcarehq/aadharuid/ScanResultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,36 @@ public void testSheelXML() {
assertEquals(scanResult.dobGuess, "1989-06-07");
}

public void testSheelAlternateXML() {
String rawString = "</?xml version=\"1.0\" encoding=\"UTF-8\"?> " +
"<PrintLetterBarcodeData uid=\"987098654123\" name=\"Mockit\" " +
"gender=\"MALE\" yob=\"1989\" co=\"S/O Jhailendno Kaear Kuioy\" " +
"lm=\"null\" locality=\"Vaishali Fiuhy\" vtc=\"Jaipur\" po=\"Vaishali Hugar\" " +
"districtName=\"Jaipur\" state=\"Rajasthan\" pincode=\"345234\" dateOfBirth=\"07-06-1989\"/>";
ScanResult scanResult = new ScanResult(rawString);
assertEquals(scanResult.type, ScanResult.QR_CODE_TYPE_XML);
assertEquals(scanResult.statusCode, 0);
assertEquals(scanResult.statusText, "✓");
assertEquals(scanResult.rawString, rawString);
assertEquals(scanResult.uid, "987098654123");
assertEquals(scanResult.name, "Mockit");
assertEquals(scanResult.gender, "M");
assertEquals(scanResult.yob, "1989");
assertEquals(scanResult.co, "S/O Jhailendno Kaear Kuioy");
assertEquals(scanResult.house, "");
assertEquals(scanResult.street, "");
assertEquals(scanResult.lm, "null");
assertEquals(scanResult.loc, "Vaishali Fiuhy");
assertEquals(scanResult.vtc, "Jaipur");
assertEquals(scanResult.po, "Vaishali Hugar");
assertEquals(scanResult.dist, "Jaipur");
assertEquals(scanResult.subdist, "");
assertEquals(scanResult.state, "Rajasthan");
assertEquals(scanResult.pc, "345234");
assertEquals(scanResult.dob, "1989-06-07");
assertEquals(scanResult.dobGuess, "1989-06-07");
}

public void testJustUID() {
ScanResult scanResult = new ScanResult("123456789012");
assertEquals(scanResult.type, ScanResult.QR_CODE_TYPE_UID_NUMBER);
Expand Down