xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASM #14638 trigger compare fixed." into asm_14.4.1

Browse source 
Former-commit-id: 9b4ae6de7e [formerly aaf04680c4 [formerly 61e8a1bf2cd87ac9ee16cb8969ba3d74ba4dd514]]
Former-commit-id: aaf04680c4
Former-commit-id: e9d9b1c7bd
This commit is contained in:
Juliya Dynina 2014-12-17 10:05:42 -05:00 • committed by Gerrit Code Review
commit 6ae82c524f
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
View file

@ -35,6 +35,7 @@ import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 22, 2014 2536 bclement Initial creation
* 12.13.14 DR 14638 dhuffman Cut whitespace.
*
* </pre>
*
@ -81,16 +82,20 @@ public class TriggerMatcher {
// 3)+"NNNXXX" +
// " -- trigger.substring(0, 3)+\"NNN\"+trigger.substring(6)="+trigger.substring(0,
// 3)+"NNN"+trigger.substring(6));
retVal = (trigger.equalsIgnoreCase(recordTrigger))
|| ((trigger.substring(0, 6) + "XXX")
.equalsIgnoreCase(recordTrigger))
|| (("CCC" + trigger.substring(3, 6) + "XXX")
.equalsIgnoreCase(recordTrigger))
|| ((trigger.substring(0, 3) + "NNNXXX")
.equalsIgnoreCase(recordTrigger))
|| ((trigger.substring(0, 3) + "NNN" + trigger.substring(6))
.equalsIgnoreCase(recordTrigger) || (recordTrigger
.startsWith(trigger)));
// Below, "subscriptionTrigger" is data from the subscription database table.
String subscriptionTrigger = recordTrigger.replaceAll("\\s+$", "");
String requestTrigger = trigger.replaceAll("\\s+$", "");
retVal = (requestTrigger.equalsIgnoreCase(subscriptionTrigger))
|| ((requestTrigger.substring(0, 6) + "XXX")
.equalsIgnoreCase(subscriptionTrigger))
|| (("CCC" + requestTrigger.substring(3, 6) + "XXX")
.equalsIgnoreCase(subscriptionTrigger))
|| ((requestTrigger.substring(0, 3) + "NNNXXX")
.equalsIgnoreCase(subscriptionTrigger))
|| ((requestTrigger.substring(0, 3) + "NNN" + requestTrigger.substring(6))
.equalsIgnoreCase(subscriptionTrigger) || (subscriptionTrigger
.startsWith(requestTrigger)));
} else {
String pattern = recordTrigger.replaceAll("\\*", ".+");
retVal = trigger.matches(pattern);