--- trunk/lib/WebPAC/Normalize.pm	2005/12/23 21:37:05	317
+++ trunk/lib/WebPAC/Normalize.pm	2006/01/07 02:05:55	344
@@ -317,7 +317,7 @@
 
 	my @out;
 
-	$log->debug("format: $format");
+	$log->debug("format: $format [$i]");
 
 	my $eval_code;
 	# remove eval{...} from beginning
@@ -328,7 +328,7 @@
 	$filter_name = $1 if ($format =~ s/^filter{([^}]+)}//s);
 
 	# did we found any (att all) field from format in row?
-	my $found_any = 0;
+	my $found_any;
 	# prefix before first field which we preserve it $found_any
 	my $prefix;
 
@@ -339,24 +339,33 @@
 		my $del = $1 || '';
 		$prefix = $del if ($f_step == 1);
 
+		my $fld_type = lc($2);
+
 		# repeatable index
 		my $r = $i;
-		$r = 0 if (lc("$2") eq 's');
+		if ($fld_type eq 's') {
+			if ($found_any->{'v'}) {
+				$r = 0;
+			} else {
+				return;
+			}
+		}
 
 		my $found = 0;
 		my $tmp = $self->get_data(\$rec,$3,$4,$r,\$found);
 
 		if ($found) {
-			$found_any += $found;
+			$found_any->{$fld_type} += $found;
 
 			# we will skip delimiter before first occurence of field!
-			push @out, $del unless($found_any == 1);
+			push @out, $del unless($found_any->{$fld_type} == 1);
 			push @out, $tmp;
 		}
 		$f_step++;
 	}
 
-	return if (! $found_any);
+	# test if any fields found?
+	return if (! $found_any->{'v'} && ! $found_any->{'s'});
 
 	my $out = join('',@out);
 
@@ -470,6 +479,7 @@
 	}
 
 	my $found = 0;
+	my $just_single = 1;
 
 	my $eval_code;
 	# remove eval{...} from beginning
@@ -481,9 +491,14 @@
 
 	# do actual replacement of placeholders
 	# repeatable fields
-	$format =~ s/v(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,$i,\$found)/ges;
+	if ($format =~ s/v(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,$i,\$found)/ges) {
+		$just_single = 0;
+	}
+	
 	# non-repeatable fields
-	$format =~ s/s(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,0,\$found)/ges;
+	if ($format =~ s/s(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,0,\$found)/ges) {
+		return if ($i > 0 && $just_single);
+	}
 
 	if ($found) {
 		$log->debug("format: $format");