Author: bleny Date: 2011-06-09 10:20:19 +0000 (Thu, 09 Jun 2011) New Revision: 1329 Log: fix filter on contacts ordering Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.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-06-09 10:09:44 UTC (rev 1328) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-06-09 10:20:19 UTC (rev 1329) @@ -690,11 +690,11 @@ // PERIOD if (period != null) { - query.addBetween(contactProperty.topiaCreateDate(), period.getFromDate(), period.getThruDate()); + query.addBetween(contactProperty.creationDate(), period.getFromDate(), period.getThruDate()); } // FROM_DATE else if (fromDate != null) { - query.addWhere(contactProperty.topiaCreateDate(), TopiaQuery.Op.GE, fromDate); + query.addWhere(contactProperty.creationDate(), TopiaQuery.Op.GE, fromDate); } // Reinitialize fromDate of the filter (previously reset for samplingFilter) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-06-09 10:09:44 UTC (rev 1328) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-06-09 10:20:19 UTC (rev 1329) @@ -195,7 +195,7 @@ builder.initializeForContact(); // Default order - filter.setOrderBy(TopiaEntity.TOPIA_CREATE_DATE + " desc"); + filter.setOrderBy(Contact.PROPERTY_CREATION_DATE + " desc"); TopiaQuery query = builder.applyContactFilter(filter); @@ -869,7 +869,7 @@ * @throws NullSampleMonthException if sampleMonth not found to update tides * value * @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean) - * @deprecated use other implementation below + * @deprecated use other implementation below, this implementation left here because some tests still use it */ @Deprecated protected void createOrUpdateContact(TopiaContext transaction, @@ -1160,8 +1160,10 @@ * @throws TopiaException if an error occurs during ToPIA usage * @throws ImportRefusedException when data is not correct to load contact * @throws ParseException from ImportHelper + * @deprecated not used in code, only in tests that need an update * @see ImportHelper */ + @Deprecated protected void loadContactCsv(CsvReader reader, ContactInput contact, boolean updateValidation) throws IOException, TopiaException,