--- trunk/lib/WebPAC/Validate.pm	2007/05/24 12:44:45	837
+++ trunk/lib/WebPAC/Validate.pm	2007/05/24 14:42:38	839
@@ -67,10 +67,10 @@
 	my $self = {@_};
 	bless($self, $class);
 
-warn dump( @_ );
-
 	my $log = $self->_get_logger();
 
+	$log->logdie("need path or delimiters_path") unless ( $self->{path} || $self->{delimiters_path} );
+
 	if ( $self->{path} ) {
 
 		my $v_file = read_file( $self->{path} ) ||
@@ -193,11 +193,11 @@
 					$self->{_delimiters_templates}->{$f}->{$template}++;
 
 					if ( my $v = $self->{_validate_delimiters_templates} ) {
-						if ( ! defined( $v->{$template} ) ) {
+						if ( ! defined( $v->{$f}->{$template} ) ) {
 							$errors->{$f}->{invalid_delimiters_combination} = $template;
 							$errors->{$f}->{dump} = $subfield_dump;
-						} else {
-							warn "## $f $template ok\n";
+						#} else {
+						#	warn "## $f $template ok\n";
 						}
 					}
 				}