Line 1... |
Line 1... |
1 |
/*
|
1 |
/*
|
2 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
|
2 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
|
3 |
*
|
3 |
*
|
4 |
* Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
|
4 |
* Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
|
5 |
*
|
5 |
*
|
6 |
* The contents of this file are subject to the terms of the GNU General Public License Version 3
|
6 |
* The contents of this file are subject to the terms of the GNU General Public License Version 3
|
7 |
* only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
|
7 |
* only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
|
8 |
* copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
|
8 |
* copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
|
9 |
* language governing permissions and limitations under the License.
|
9 |
* language governing permissions and limitations under the License.
|
Line 77... |
Line 77... |
77 |
final int length = parts.length;
|
77 |
final int length = parts.length;
|
78 |
final List<Article> articles = new ArrayList<Article>();
|
78 |
final List<Article> articles = new ArrayList<Article>();
|
79 |
int size = allArticles.size();
|
79 |
int size = allArticles.size();
|
80 |
for (int i = 0; i < size; i++) {
|
80 |
for (int i = 0; i < size; i++) {
|
81 |
Article a = allArticles.get(i);
|
81 |
Article a = allArticles.get(i);
|
82 |
final String name = a.getName().toLowerCase() + a.getCode().toLowerCase() + a.getBarCode().toLowerCase();
|
82 |
final String name = (a.getName() + a.getCode() + a.getBarCode() + a.getDeclinaison()).toLowerCase();
|
83 |
for (int j = 0; j < length; j++) {
|
83 |
for (int j = 0; j < length; j++) {
|
84 |
|
84 |
|
85 |
if (name.contains(parts[j])) {
|
85 |
if (name.contains(parts[j])) {
|
86 |
if (j == length - 1) {
|
86 |
if (j == length - 1) {
|
87 |
articles.add(a);
|
87 |
articles.add(a);
|