Author: bleny Date: 2011-02-18 10:28:16 +0000 (Fri, 18 Feb 2011) New Revision: 1030 Log: fix query when filtering on multiple line code Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-18 09:33:45 UTC (rev 1029) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-18 10:28:16 UTC (rev 1030) @@ -246,15 +246,12 @@ } } - query.addEquals(sampleRowProperty.$alias(), new Object[]{ - filter.getSampleRows().toArray( - new SampleRow[filter.getSampleRows().size()])}); - // another implementation for above line : (not tested) - // List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); - // for (SampleRow row : sampleRows) { - // sampleRowsCodes.add(row.getCode()); - // } - // query.addEquals(SampleRow.CODE, sampleRowsCodes.toArray(new String[sampleRowsCodes.size()])); + List<SampleRow> sampleRows = filter.getSampleRows(); + List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); + for (SampleRow row : sampleRows) { + sampleRowsCodes.add(row.getCode()); + } + query.addEquals(sampleRowProperty.code(), sampleRowsCodes.toArray(new String[sampleRowsCodes.size()])); if (logger.isDebugEnabled()) { logger.debug("query for filtering multiple rows is " + query);