=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java 2013-10-23 22:02:51 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java 2013-10-30 11:24:24 +0000 @@ -171,7 +171,8 @@ @Override public Collection validate( Date startDate, Date endDate, Collection sources ) { - log.info( "Validate startDate=" + startDate + " endDate=" + endDate + " sources[" + sources.size() + "]" ); + log.info( "Validate start: " + startDate + " end: " + endDate + " sources: " + sources.size() ); + Collection periods = periodService.getPeriodsBetweenDates( startDate, endDate ); Collection rules = getAllValidationRules(); @@ -183,7 +184,8 @@ public Collection validate( Date startDate, Date endDate, Collection sources, ValidationRuleGroup group ) { - log.info( "Validate startDate=" + startDate + " endDate=" + endDate + " sources[" + sources.size() + "] group=" + group.getName() ); + log.info( "Validate start:" + startDate + " end: " + endDate + " sources: " + sources.size() + " group: " + group.getName() ); + Collection periods = periodService.getPeriodsBetweenDates( startDate, endDate ); Collection rules = group.getMembers(); @@ -194,7 +196,8 @@ @Override public Collection validate( Date startDate, Date endDate, OrganisationUnit source ) { - log.info( "Validate startDate=" + startDate + " endDate=" + endDate + " source=" + source.getName() ); + log.info( "Validate start: " + startDate + " end: " + endDate + " source: " + source.getName() ); + Collection periods = periodService.getPeriodsBetweenDates( startDate, endDate ); Collection rules = getAllValidationRules(); Collection sources = new HashSet(); @@ -207,8 +210,9 @@ @Override public Collection validate( DataSet dataSet, Period period, OrganisationUnit source ) { - log.info( "Validate dataSet=" + dataSet.getName() + " period=[" + period.getPeriodType().getName() + " " - + period.getStartDate() + " " + period.getEndDate() + "]" + " source=" + source.getName() ); + log.info( "Validate data set: " + dataSet.getName() + " period: " + period.getPeriodType().getName() + " " + + period.getStartDate() + " " + period.getEndDate() + " source: " + source.getName() ); + Collection periods = new ArrayList(); periods.add( period ); @@ -222,6 +226,8 @@ { rules = getValidationTypeRulesForDataElements( dataSet.getDataElements() ); } + + log.info( "Using validation rules: " + rules.size() ); Collection sources = new HashSet(); sources.add( source );