Author: bleny Date: 2010-11-08 22:49:50 +0000 (Mon, 08 Nov 2010) New Revision: 751 Log: consider estimatedTides boolean in service (a field from filter that was ignored) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 21:42:32 UTC (rev 750) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 22:49:50 UTC (rev 751) @@ -280,9 +280,13 @@ ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + addEquals(contactProperty.validationCompany(), Boolean.TRUE); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } // Only for done contacts with no constraint // TopiaQuery query = @@ -395,9 +399,14 @@ WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); - TopiaQuery query = builder.applySamplingFilter(filter). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + TopiaQuery query = builder.applySamplingFilter(filter); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } + WaoQueryHelper.CompanyProperty companyProperty = contactProperty.observerProperty().companyProperty(); @@ -462,10 +471,15 @@ ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + addEquals(contactProperty.validationCompany(), Boolean.TRUE); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } + // Carefull with results, the company may not be present in the map : // only if there is no unfinished sampleRow or no contact done @@ -545,14 +559,18 @@ TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). addEquals(contactProperty.validationCompany(), Boolean.TRUE). - addEquals(contactProperty.validationProgram(), Boolean.TRUE). - // Set the results wanted : by company, by reliability, // get number of each realiability level setSelect(companyProperty.name(), contactProperty.dataReliabilityOrdinal(), "COUNT(*)"). addGroup(companyProperty.name(), contactProperty.dataReliabilityOrdinal()); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } + if (log.isDebugEnabled()) { log.debug("query for data reliability is " + query); }