Fixed bad category list building.
This commit is contained in:
parent
c8b63869b2
commit
a6ddce2ee1
1 changed files with 4 additions and 11 deletions
|
@ -128,14 +128,7 @@ public class Category
|
||||||
{
|
{
|
||||||
boolean result;
|
boolean result;
|
||||||
|
|
||||||
if (this.softwares.containsIgnoreCase(service.getSoftwareName()))
|
result = matchesSoftware(service.getSoftwareName());
|
||||||
{
|
|
||||||
result = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
result = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
|
@ -161,10 +154,10 @@ public class Category
|
||||||
{
|
{
|
||||||
if (iterator.hasNext())
|
if (iterator.hasNext())
|
||||||
{
|
{
|
||||||
String source1 = iterator.next();
|
String source = iterator.next();
|
||||||
String source2 = StringUtils.stripAccents(source1).replaceAll("[\\W\\s]", "");
|
source = StringUtils.stripAccents(source).replaceAll("[\\W\\s]", "");
|
||||||
|
|
||||||
if (StringUtils.equalsIgnoreCase(target, source2))
|
if (StringUtils.equalsIgnoreCase(target, source))
|
||||||
{
|
{
|
||||||
ended = true;
|
ended = true;
|
||||||
result = true;
|
result = true;
|
||||||
|
|
Loading…
Reference in a new issue