Skip to content

Commit

Permalink
fixed minor identification issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@OpenDDR
OpenDDR committed Dec 1, 2011
1 parent 7c9eed9 commit 1ae5687
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 23 deletions.
26 changes: 13 additions & 13 deletions src/org/openddr/simpleapi/oddr/builder/device/AndroidDeviceBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token

String looseToken = token.replaceAll("[ _/-]", ".?");

Pattern loosePattern = Pattern.compile(".*" + looseToken + ".*");
Pattern loosePattern = Pattern.compile("(?i).*" + looseToken + ".*");

if (!loosePattern.matcher(userAgent.getCompleteUserAgent()).matches()) {
if (!loosePattern.matcher(userAgent.getCompleteUserAgent().replaceAll("Android", "")).matches()) {
return null;
}

Expand All @@ -94,9 +94,9 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
currentToken = looseToken;
}

currentPattern = Pattern.compile(".*" + currentToken + ".?Build/.*");
currentPattern = Pattern.compile("(?i).*" + currentToken + ".?Build/.*");
if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {//&& userAgent.getPatternElementsInside().matches(".*" + currentToken + ".?Build/.*")) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -107,9 +107,9 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
}
}

currentPattern = Pattern.compile(".*" + currentToken);
currentPattern = Pattern.compile("(?i).*" + currentToken);
if (userAgent.getPatternElementsPre() != null && currentPattern.matcher(userAgent.getPatternElementsPre()).matches()) {//userAgent.getPatternElementsPre().matches(".*" + currentToken)) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -121,7 +121,7 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
}

if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {//userAgent.getPatternElementsInside().matches(".*" + currentToken)) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -132,9 +132,9 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
}
}

currentPattern = Pattern.compile(".*" + currentToken + ".?;.*");
currentPattern = Pattern.compile("(?i).*" + currentToken + ".?;.*");
if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {//userAgent.getPatternElementsInside().matches(".*" + currentToken + ".?;.*")) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -149,10 +149,10 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
currentPattern = loosePattern;

} else {
currentPattern = Pattern.compile(".*" + currentToken + ".*");
currentPattern = Pattern.compile("(?i).*" + currentToken + ".*");
}
if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {//userAgent.getPatternElementsInside().matches(".*" + currentToken + ".*")) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -163,7 +163,7 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
}
}
if (userAgent.getPatternElementsPre() != null && currentPattern.matcher(userAgent.getPatternElementsPre()).matches()) {//userAgent.getPatternElementsPre().matches(".*" + currentToken + ".*")) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -174,7 +174,7 @@ private Device elaborateAndroidDeviceWithToken(UserAgent userAgent, String token
}
}
if (userAgent.getPatternElementsPost() != null && currentPattern.matcher(userAgent.getPatternElementsPost()).matches()) {//userAgent.getPatternElementsPost().matches(".*" + currentToken + ".*")) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand Down
16 changes: 16 additions & 0 deletions src/org/openddr/simpleapi/oddr/builder/device/TwoStepDeviceBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,22 @@ private Device elaborateTwoStepDeviceWithToken(UserAgent userAgent, String step1
}
int betweenTokensLength = betweenTokens.length();

if (step2Token.length() > 3) {
if (betweenTokensLength > maxBigTokensDistance) {
confidence -= 10;
}

String deviceId = ((Map<String, String>) orderedRules.get(step1Token)).get(step2Token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
retDevice.setConfidence(confidence);
return retDevice;

} catch (NullPointerException x) {
}
}

if ((betweenTokensLength < maxLittleTokensDistance) || (betweenTokensLength < maxBigTokensDistance && (step2Token.length() < 6 || !step2Token.matches(".*[a-zA-Z].*")))) {
if (betweenTokensLength <= 1) {
if (!betweenTokens.matches(".*[ _/-].*")) {
Expand Down
20 changes: 10 additions & 10 deletions src/org/openddr/simpleapi/oddr/builder/device/WinPhoneDeviceBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke

String looseToken = token.replaceAll("[ _/-]", ".?");

Pattern loosePattern = Pattern.compile(".*" + looseToken + ".*");
Pattern loosePattern = Pattern.compile("(?i).*" + looseToken + ".*");

if (!loosePattern.matcher(userAgent.getCompleteUserAgent()).matches()) {
return null;
Expand All @@ -98,9 +98,9 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke
currentToken = looseToken;
}

currentPattern = Pattern.compile(".*" + currentToken);
currentPattern = Pattern.compile("(?i).*" + currentToken);
if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -111,7 +111,7 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke
}
}
if (userAgent.getPatternElementsPre() != null && currentPattern.matcher(userAgent.getPatternElementsPre()).matches()) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -122,9 +122,9 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke
}
}

currentPattern = Pattern.compile(".*" + currentToken + ".?;.*");
currentPattern = Pattern.compile("(?i).*" + currentToken + ".?;.*");
if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -139,11 +139,11 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke
currentPattern = loosePattern;

} else {
currentPattern = Pattern.compile(".*" + currentToken + ".*");
currentPattern = Pattern.compile("(?i).*" + currentToken + ".*");
}

if (userAgent.getPatternElementsInside() != null && currentPattern.matcher(userAgent.getPatternElementsInside()).matches()) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -154,7 +154,7 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke
}
}
if (userAgent.getPatternElementsPre() != null && currentPattern.matcher(userAgent.getPatternElementsPre()).matches()) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand All @@ -165,7 +165,7 @@ private Device elaborateWinPhoneDeviceWithToken(UserAgent userAgent, String toke
}
}
if (userAgent.getPatternElementsPost() != null && currentPattern.matcher(userAgent.getPatternElementsPost()).matches()) {
String deviceId = (String) orderedRules.get(currentToken);
String deviceId = (String) orderedRules.get(token);

try {
Device retDevice = (Device) devices.get(deviceId).clone();
Expand Down

0 comments on commit 1ae5687

Please sign in to comment.