--- trunk/lib/WebPAC/Normalize.pm	2006/09/29 18:55:41	725
+++ trunk/lib/WebPAC/Normalize.pm	2007/11/08 17:19:50	1015
@@ -1,24 +1,31 @@
 package WebPAC::Normalize;
 use Exporter 'import';
-@EXPORT = qw/
-	_set_rec _set_lookup
-	_set_load_ds
+our @EXPORT = qw/
+	_set_ds _set_lookup
+	_set_load_row
 	_get_ds _clean_ds
 	_debug
 	_pack_subfields_hash
 
-	tag search display
+	search_display search display sorted
+
 	marc marc_indicators marc_repeatable_subfield
-	marc_compose marc_leader
-	marc_duplicate marc_remove
+	marc_compose marc_leader marc_fixed
+	marc_duplicate marc_remove marc_count
 	marc_original_order
+	marc_template
 
 	rec1 rec2 rec
+	frec frec_eq frec_ne
 	regex prefix suffix surround
 	first lookup join_with
 	save_into_lookup
 
 	split_rec_on
+
+	get set
+	count
+
 /;
 
 use warnings;
@@ -32,18 +39,16 @@
 # debugging warn(s)
 my $debug = 0;
 
+use WebPAC::Normalize::ISBN;
+push @EXPORT, ( 'isbn_10', 'isbn_13' );
 
 =head1 NAME
 
 WebPAC::Normalize - describe normalisaton rules using sets
 
-=head1 VERSION
-
-Version 0.21
-
 =cut
 
-our $VERSION = '0.21';
+our $VERSION = '0.34';
 
 =head1 SYNOPSIS
 
@@ -56,7 +61,7 @@
 C<perl -c normalize.pl>.
 
 Normalisation can generate multiple output normalized data. For now, supported output
-types (on the left side of definition) are: C<tag>, C<display>, C<search> and
+types (on the left side of definition) are: C<search_display>, C<display>, C<search> and
 C<marc>.
 
 =head1 FUNCTIONS
@@ -74,16 +79,16 @@
 	rules => $normalize_pl_config,
 	marc_encoding => 'utf-8',
 	config => $config,
-	load_ds_coderef => sub {
-		my ($database,$input,$mfn) = shift;
-		$store->load_ds( database => $database, input => $input, id => $mfn );
+	load_row_coderef => sub {
+		my ($database,$input,$mfn) = @_;
+		$store->load_row( database => $database, input => $input, id => $mfn );
 	},
   );
 
 Options C<row>, C<rules> and C<log> are mandatory while all
 other are optional.
 
-C<load_ds_coderef> is closure only used when executing lookups, so they will
+C<load_row_coderef> is closure only used when executing lookups, so they will
 die if it's not defined.
 
 This function will B<die> if normalizastion can't be evaled.
@@ -93,7 +98,7 @@
 
 =cut
 
-my $load_ds_coderef;
+my $load_row_coderef;
 
 sub data_structure {
 	my $arg = {@_};
@@ -101,30 +106,31 @@
 	die "need row argument" unless ($arg->{row});
 	die "need normalisation argument" unless ($arg->{rules});
 
-	no strict 'subs';
-	_set_lookup( $arg->{lookup} );
-	_set_rec( $arg->{row} );
-	_set_config( $arg->{config} );
+	_set_lookup( $arg->{lookup} ) if defined($arg->{lookup});
+	_set_ds( $arg->{row} );
+	_set_config( $arg->{config} ) if defined($arg->{config});
 	_clean_ds( %{ $arg } );
-	$load_ds_coderef = $arg->{load_ds_coderef};
+	$load_row_coderef = $arg->{load_row_coderef};
 
-	eval "$arg->{rules}";
+	no strict 'subs';
+	no warnings 'redefine';
+	eval "$arg->{rules};";
 	die "error evaling $arg->{rules}: $@\n" if ($@);
 
 	return _get_ds();
 }
 
-=head2 _set_rec
+=head2 _set_ds
 
 Set current record hash
 
-  _set_rec( $rec );
+  _set_ds( $rec );
 
 =cut
 
 my $rec;
 
-sub _set_rec {
+sub _set_ds {
 	$rec = shift or die "no record hash";
 }
 
@@ -164,10 +170,11 @@
 
 =cut
 
-my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators);
+my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $marc_leader);
 my ($marc_record_offset, $marc_fetch_offset) = (0, 0);
 
 sub _get_ds {
+#warn "## out = ",dump($out);
 	return $out;
 }
 
@@ -181,7 +188,7 @@
 
 sub _clean_ds {
 	my $a = {@_};
-	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators) = ();
+	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $marc_leader) = ();
 	($marc_record_offset, $marc_fetch_offset) = (0,0);
 	$marc_encoding = $a->{marc_encoding};
 }
@@ -212,23 +219,23 @@
 	return $lookup;
 }
 
-=head2 _set_load_ds
+=head2 _set_load_row
 
 Setup code reference which will return L<data_structure> from
 L<WebPAC::Store>
 
-  _set_load_ds(sub {
+  _set_load_row(sub {
 		my ($database,$input,$mfn) = @_;
-		$store->load_ds( database => $database, input => $input, id => $mfn );
+		$store->load_row( database => $database, input => $input, id => $mfn );
   });
 
 =cut
 
-sub _set_load_ds {
+sub _set_load_row {
 	my $coderef = shift;
 	confess "argument isn't CODE" unless ref($coderef) eq 'CODE';
 
-	$load_ds_coderef = $coderef;
+	$load_row_coderef = $coderef;
 }
 
 =head2 _get_marc_fields
@@ -286,13 +293,15 @@
 
 =cut
 
+my $fetch_pos;
+
 sub _get_marc_fields {
 
 	my $arg = {@_};
 	warn "### _get_marc_fields arg: ", dump($arg), $/ if ($debug > 2);
-	my $offset = $marc_fetch_offset;
+	$fetch_pos = $marc_fetch_offset;
 	if ($arg->{offset}) {
-		$offset = $arg->{offset};
+		$fetch_pos = $arg->{offset};
 	} elsif($arg->{fetch_next}) {
 		$marc_fetch_offset++;
 	}
@@ -301,9 +310,9 @@
 
 	warn "### full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 2);
 
-	my $marc_rec = $marc_record->[ $offset ];
+	my $marc_rec = $marc_record->[ $fetch_pos ];
 
-	warn "## _get_marc_fields (at offset: $offset) -- marc_record = ", dump( @$marc_rec ), $/ if ($debug > 1);
+	warn "## _get_marc_fields (at offset: $fetch_pos) -- marc_record = ", dump( @$marc_rec ), $/ if ($debug > 1);
 
 	return if (! $marc_rec || ref($marc_rec) ne 'ARRAY' || $#{ $marc_rec } < 0);
 
@@ -324,7 +333,7 @@
 
 	if ($debug) {
 		warn "## marc_repeatable_subfield = ", dump( $marc_repeatable_subfield ), $/ if ( $marc_repeatable_subfield );
-		warn "## marc_record[$offset] = ", dump( $marc_rec ), $/;
+		warn "## marc_record[$fetch_pos] = ", dump( $marc_rec ), $/;
 		warn "## sorted_marc_record = ", dump( \@sorted_marc_record ), $/;
 		warn "## subfield count = ", dump( $u ), $/;
 	}
@@ -405,6 +414,19 @@
 	return \@m;
 }
 
+=head2 _get_marc_leader
+
+Return leader from currently fetched record by L</_get_marc_fields>
+
+  print WebPAC::Normalize::_get_marc_leader();
+
+=cut
+
+sub _get_marc_leader {
+	die "no fetch_pos, did you called _get_marc_fields first?" unless ( defined( $fetch_pos ) );
+	return $marc_leader->[ $fetch_pos ];
+}
+
 =head2 _debug
 
 Change level of debug warnings
@@ -424,40 +446,51 @@
 
 Those functions generally have to first in your normalization file.
 
-=head2 tag
+=head2 search_display
 
-Define new tag for I<search> and I<display>.
+Define output for L<search> and L<display> at the same time
 
-  tag('Title', rec('200','a') );
+  search_display('Title', rec('200','a') );
 
 
 =cut
 
-sub tag {
-	my $name = shift or die "tag needs name as first argument";
+sub search_display {
+	my $name = shift or die "search_display needs name as first argument";
 	my @o = grep { defined($_) && $_ ne '' } @_;
 	return unless (@o);
-	$out->{$name}->{tag} = $name;
 	$out->{$name}->{search} = \@o;
 	$out->{$name}->{display} = \@o;
 }
 
+=head2 tag
+
+Old name for L<search_display>, but supported
+
+=cut
+
+sub tag {
+	search_display( @_ );
+}
+
 =head2 display
 
-Define tag just for I<display>
+Define output just for I<display>
 
   @v = display('Title', rec('200','a') );
 
 =cut
 
-sub display {
-	my $name = shift or die "display needs name as first argument";
+sub _field {
+	my $type = shift or confess "need type -- BUG?";
+	my $name = shift or confess "needs name as first argument";
 	my @o = grep { defined($_) && $_ ne '' } @_;
 	return unless (@o);
-	$out->{$name}->{tag} = $name;
-	$out->{$name}->{display} = \@o;
+	$out->{$name}->{$type} = \@o;
 }
 
+sub display { _field( 'display', @_ ) }
+
 =head2 search
 
 Prepare values just for I<search>
@@ -466,13 +499,18 @@
 
 =cut
 
-sub search {
-	my $name = shift or die "search needs name as first argument";
-	my @o = grep { defined($_) && $_ ne '' } @_;
-	return unless (@o);
-	$out->{$name}->{tag} = $name;
-	$out->{$name}->{search} = \@o;
-}
+sub search { _field( 'search', @_ ) }
+
+=head2 sorted
+
+Insert into lists which will be automatically sorted
+
+ sorted('Title', rec('200','a') );
+
+=cut
+
+sub sorted { _field( 'sorted', @_ ) }
+
 
 =head2 marc_leader
 
@@ -487,9 +525,58 @@
 	my ($offset,$value) = @_;
 
 	if ($offset) {
-		$out->{' leader'}->{ $offset } = $value;
+		$marc_leader->[ $marc_record_offset ]->{ $offset } = $value;
 	} else {
-		return $out->{' leader'};
+		
+		if (defined($marc_leader)) {
+			die "marc_leader not array = ", dump( $marc_leader ) unless (ref($marc_leader) eq 'ARRAY');
+			return $marc_leader->[ $marc_record_offset ];
+		} else {
+			return;
+		}
+	}
+}
+
+=head2 marc_fixed
+
+Create control/indentifier fields with values in fixed positions
+
+  marc_fixed('008', 00, '070402');
+  marc_fixed('008', 39, '|');
+
+Positions not specified will be filled with spaces (C<0x20>).
+
+There will be no effort to extend last specified value to full length of
+field in standard.
+
+=cut
+
+sub marc_fixed {
+	my ($f, $pos, $val) = @_;
+	die "need marc(field, position, value)" unless defined($f) && defined($pos);
+
+	confess "need val" unless defined $val;
+
+	my $update = 0;
+
+	map {
+		if ($_->[0] eq $f) {
+			my $old = $_->[1];
+			if (length($old) <= $pos) {
+				$_->[1] .= ' ' x ( $pos - length($old) ) . $val;
+				warn "## marc_fixed($f,$pos,'$val') append '$old' -> '$_->[1]'\n" if ($debug > 1);
+			} else {
+				$_->[1] = substr($old, 0, $pos) . $val . substr($old, $pos + length($val));
+				warn "## marc_fixed($f,$pos,'$val') update '$old' -> '$_->[1]'\n" if ($debug > 1);
+			}
+			$update++;
+		}
+	} @{ $marc_record->[ $marc_record_offset ] };
+
+	if (! $update) {
+		my $v = ' ' x $pos . $val;
+		push @{ $marc_record->[ $marc_record_offset ] }, [ $f, $v ];
+		warn "## marc_fixed($f,$pos,'val') created '$v'\n" if ($debug > 1);
 	}
 }
 
@@ -621,9 +708,11 @@
 	 my $m = $marc_record->[ -1 ];
 	 die "can't duplicate record which isn't defined" unless ($m);
 	 push @{ $marc_record }, dclone( $m );
-	 warn "## marc_duplicate = ", dump(@$marc_record), $/ if ($debug > 1);
+	 push @{ $marc_leader }, dclone( marc_leader() );
+	 warn "## marc_duplicate = ", dump(@$marc_leader, @$marc_record), $/ if ($debug > 1);
 	 $marc_record_offset = $#{ $marc_record };
 	 warn "## marc_record_offset = $marc_record_offset", $/ if ($debug > 1);
+
 }
 
 =head2 marc_remove
@@ -635,6 +724,10 @@
 
 This will erase field C<200> or C<200^a> from current MARC record.
 
+  marc_remove('*');
+
+Will remove all fields in current MARC record.
+
 This is useful after calling C<marc_duplicate> or on it's own (but, you
 should probably just remove that subfield definition if you are not
 using C<marc_duplicate>).
@@ -652,39 +745,47 @@
 
 	warn "### marc_remove before = ", dump( $marc ), $/ if ($debug > 2);
 
-	my $i = 0;
-	foreach ( 0 .. $#{ $marc } ) {
-		last unless (defined $marc->[$i]);
-		warn "#### working on ",dump( @{ $marc->[$i] }), $/ if ($debug > 3);
-		if ($marc->[$i]->[0] eq $f) {
-			if (! defined $sf) {
-				# remove whole field
-				splice @$marc, $i, 1;
-				warn "#### slice \@\$marc, $i, 1 = ",dump( @{ $marc }), $/ if ($debug > 3);
-				$i--;
-			} else {
-				foreach my $j ( 0 .. (( $#{ $marc->[$i] } - 3 ) / 2) ) {
-					my $o = ($j * 2) + 3;
-					if ($marc->[$i]->[$o] eq $sf) {
-						# remove subfield
-						splice @{$marc->[$i]}, $o, 2;
-						warn "#### slice \@{\$marc->[$i]}, $o, 2 = ", dump( @{ $marc }), $/ if ($debug > 3);
-						# is record now empty?
-						if ($#{ $marc->[$i] } == 2) {
-							splice @$marc, $i, 1;
-							warn "#### slice \@\$marc, $i, 1 = ", dump( @{ $marc }), $/ if ($debug > 3);
-							$i--;
-						};
+	if ($f eq '*') {
+
+		delete( $marc_record->[ $marc_record_offset ] );
+		warn "## full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 1);
+
+	} else {
+
+		my $i = 0;
+		foreach ( 0 .. $#{ $marc } ) {
+			last unless (defined $marc->[$i]);
+			warn "#### working on ",dump( @{ $marc->[$i] }), $/ if ($debug > 3);
+			if ($marc->[$i]->[0] eq $f) {
+				if (! defined $sf) {
+					# remove whole field
+					splice @$marc, $i, 1;
+					warn "#### slice \@\$marc, $i, 1 = ",dump( @{ $marc }), $/ if ($debug > 3);
+					$i--;
+				} else {
+					foreach my $j ( 0 .. (( $#{ $marc->[$i] } - 3 ) / 2) ) {
+						my $o = ($j * 2) + 3;
+						if ($marc->[$i]->[$o] eq $sf) {
+							# remove subfield
+							splice @{$marc->[$i]}, $o, 2;
+							warn "#### slice \@{\$marc->[$i]}, $o, 2 = ", dump( @{ $marc }), $/ if ($debug > 3);
+							# is record now empty?
+							if ($#{ $marc->[$i] } == 2) {
+								splice @$marc, $i, 1;
+								warn "#### slice \@\$marc, $i, 1 = ", dump( @{ $marc }), $/ if ($debug > 3);
+								$i--;
+							};
+						}
 					}
 				}
 			}
+			$i++;
 		}
-		$i++;
-	}
 
-	warn "### marc_remove($f", $sf ? ",$sf" : "", ") after = ", dump( $marc ), $/ if ($debug > 2);
+		warn "### marc_remove($f", $sf ? ",$sf" : "", ") after = ", dump( $marc ), $/ if ($debug > 2);
 
-	$marc_record->[ $marc_record_offset ] = $marc;
+		$marc_record->[ $marc_record_offset ] = $marc;
+	}
 
 	warn "## full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 1);
 }
@@ -759,6 +860,154 @@
 	warn "## marc_record = ", dump( $marc_record ),$/ if ($debug > 1);
 }
 
+=head2 marc_template
+
+=cut
+
+sub marc_template {
+	my $args = {@_};
+	warn "## marc_template(",dump($args),")";
+
+	foreach ( qw/subfields_rename marc_template/ ) {
+#		warn "ref($_) = ",ref($args->{$_});
+		die "$_ not ARRAY" if ref($args->{$_}) ne 'ARRAY';
+	}
+
+	my $r = $rec->{ $args->{from} }; # || return;
+	die "record field ", $args->{from}, " isn't array\n" unless (ref($r) eq 'ARRAY');
+
+	my @subfields_rename = @{ $args->{subfields_rename} };
+#	warn "### subfields_rename [$#subfields_rename] = ",dump( @subfields_rename );
+
+	confess "need mapping in pairs for subfields_rename"
+		if $#subfields_rename % 2 != 1;
+	
+	my ( $subfields_rename, $from_subfields, $to_subfields );
+	while ( my ( $from, $to ) = splice(@subfields_rename, 0, 2) ) {
+		my ( $f, $t ) = (
+			$from_subfields->{ $from }++,
+			$to_subfields->{ $to }++
+		);
+		$subfields_rename->{ $from }->[ $f ] = [ $to => $t ];
+	}
+	warn "### subfields_rename = ",dump( $subfields_rename ),$/;
+	warn "### from_subfields = ", dump( $from_subfields ),$/;
+	warn "### to_subfields = ", dump( $to_subfields ),$/;
+
+	my $fields_re = join('|', keys %$to_subfields );
+
+	my $pos_templates;
+	my $count;
+	my @marc_order;
+	my $marc_template_order;
+	my $fill_in;
+	my @marc_out;
+
+	foreach my $template ( @{ $args->{marc_template} } ) {
+		$count = {};
+		@marc_order = ();
+		sub my_count {
+			my $sf = shift;
+			my $nr = $count->{$sf}++;
+			push @marc_order, [ $sf, $nr ];
+			return $sf . $nr;
+		}
+		my $pos_template = $template;
+		$pos_template =~ s/($fields_re)/my_count($1)/ge;
+		my $count_key = dump( $count );
+		warn "### template: |$template| -> |$pos_template| count = $count_key marc_order = ",dump( @marc_order ),$/;
+		$pos_templates->{ $count_key } = $pos_template;
+		$marc_template_order->{ $pos_template } = [ @marc_order ];
+	}
+	warn "### from ",dump( $args->{marc_template} ), " created ", dump( $pos_templates ), " and ", dump( $marc_template_order );
+
+	my $m;
+
+	foreach my $r ( @{ $rec->{ $args->{from} } } ) {
+
+		my $i1 = $r->{i1} || ' ';
+		my $i2 = $r->{i2} || ' ';
+		$m = [ $args->{to}, $i1, $i2 ];
+
+		warn "### r = ",dump( $r );
+
+		my ( $new_r, $from_count, $to_count );
+		foreach my $sf ( keys %{$r} ) {
+			my $nr = $from_count->{$sf}++;
+			my $rename_to = $subfields_rename->{ $sf };	# ||
+#				die "can't find subfield rename for $sf/$nr in ", dump( $subfields_rename );
+			warn "### rename $sf/$nr to ", dump( $rename_to->[$nr] ), $/;
+			my ( $to_sf, $to_nr ) = @{ $rename_to->[$nr] };
+			$new_r->{ $to_sf }->[ $to_nr ] = [ $sf => $nr ];
+
+			$to_count->{ $to_sf }++;
+		}
+
+		warn "### new_r = ",dump( $new_r );
+
+		my $from_count_key = dump( $to_count );
+
+		warn "### from_count = ",dump( $from_count ), $/;
+		warn "### to_count   = ",dump( $to_count ), $/;
+
+		my $template = $pos_templates->{ $from_count_key } ||
+			die "I don't have template for:\n$from_count_key\n## available templates\n", dump( $pos_templates );
+
+		warn "### selected template: |$template|\n";
+
+		$fill_in = {};
+
+		foreach my $sf ( split(/\|/, $template ) ) {
+			sub fill_in {
+				my ( $r, $sf, $nr ) = @_;
+				my ( $from_sf, $from_nr ) = @{ $new_r->{ $sf }->[ $nr ] };
+				my $v = $r->{ $from_sf }; # || die "no $from_sf/$from_nr";
+				warn "#### fill_in( $sf, $nr ) = $from_sf/$from_nr >>>> ",dump( $v ), $/;
+				if ( ref( $v ) eq 'ARRAY' ) {
+					$fill_in->{$sf}->[$nr] = $v->[$from_nr];
+					return $v->[$from_nr];
+				} elsif ( $from_nr == 0 ) {
+					$fill_in->{$sf}->[$nr] = $v;
+					return $v;
+				} else {
+					die "requested subfield $from_sf/$from_nr but it's ",dump( $v );
+				}
+			}
+			warn "#### $sf <<<< $fields_re\n";
+			$sf =~ s/($fields_re)(\d+)/fill_in($r,$1,$2)/ge;
+			warn "#### >>>> $sf with fill_in = ",dump( $fill_in ),$/;
+		}
+
+		warn "## template: |$template|\n## marc_template_order = ",dump( $marc_template_order );
+
+		foreach my $sf ( @{ $marc_template_order->{$template} } ) {
+			my ( $sf, $nr ) = @$sf;
+			my $v = $fill_in->{$sf}->[$nr] || die "can't find fill_in $sf/$nr";
+			warn "++ $sf/$nr |$v|\n";
+			push @$m, [ $sf, $v ];
+		}
+
+		warn "#### >>>> created marc: ", dump( $m );
+
+		push @marc_out, $m;
+	}
+
+	warn "### marc_template produced: ",dump( @marc_out );
+	return @marc_out;
+}
+
+=head2 marc_count
+
+Return number of MARC records created using L</marc_duplicate>.
+
+  print "created ", marc_count(), " records";
+
+=cut
+
+sub marc_count {
+	return $#{ $marc_record };
+}
+
 
 =head1 Functions to extract data from input
 
@@ -781,6 +1030,9 @@
 
 	my ($h,$include_subfields) = @_;
 
+	# sanity and ease of use
+	return $h if (ref($h) ne 'HASH');
+
 	if ( defined($h->{subfields}) ) {
 		my $sfs = delete $h->{subfields} || die "no subfields?";
 		my @out;
@@ -880,6 +1132,9 @@
   @v = rec('200')
   @v = rec('200','a')
 
+If rec() returns just single value, it will
+return scalar, not array.
+
 =cut
 
 sub rec {
@@ -889,13 +1144,63 @@
 	} elsif ($#_ == 1) {
 		@out = rec2(@_);
 	}
-	if (@out) {
+	if ($#out == 0 && ! wantarray) {
+		return $out[0];
+	} elsif (@out) {
 		return @out;
 	} else {
 		return '';
 	}
 }
 
+=head2 frec
+
+Returns first value from field
+
+  $v = frec('200');
+  $v = frec('200','a');
+
+=cut
+
+sub frec {
+	my @out = rec(@_);
+	warn "rec(",dump(@_),") has more than one return value, ignoring\n" if $#out > 0;
+	return shift @out;
+}
+
+=head2 frec_eq
+
+=head2 frec_ne
+
+Check if first values from two fields are same or different
+
+  if ( frec_eq( 900 => 'a', 910 => 'c' ) ) {
+  	# values are same
+  } else {
+    # values are different
+  }
+
+Strictly speaking C<frec_eq> and C<frec_ne> wouldn't be needed if you
+could write something like:
+
+  if ( frec( '900','a' ) eq frec( '910','c' ) ) {
+  	# yada tada
+  }
+
+but you can't since our parser L<WebPAC::Parser> will remove all whitespaces
+in order to parse text and create invalid function C<eqfrec>.
+
+=cut
+
+sub frec_eq {
+	my ( $f1,$sf1, $f2, $sf2 ) = @_;
+	return (rec( $f1, $sf1 ))[0] eq (rec( $f2, $sf2 ))[0];
+}
+
+sub frec_ne {
+	return ! frec_eq( @_ );
+}
+
 =head2 regex
 
 Apply regex to some or all values
@@ -925,7 +1230,8 @@
 =cut
 
 sub prefix {
-	my $p = shift or return;
+	my $p = shift;
+	return @_ unless defined( $p );
 	return map { $p . $_ } grep { defined($_) } @_;
 }
 
@@ -938,7 +1244,8 @@
 =cut
 
 sub suffix {
-	my $s = shift or die "suffix needs string as first argument";
+	my $s = shift;
+	return @_ unless defined( $s );
 	return map { $_ . $s } grep { defined($_) } @_;
 }
 
@@ -951,8 +1258,10 @@
 =cut
 
 sub surround {
-	my $p = shift or die "surround need prefix as first argument";
-	my $s = shift or die "surround needs suffix as second argument";
+	my $p = shift;
+	my $s = shift;
+	$p = '' unless defined( $p );
+	$s = '' unless defined( $s );
 	return map { $p . $_ . $s } grep { defined($_) } @_;
 }
 
@@ -1017,21 +1326,21 @@
 sub lookup {
 	my ($what, $database, $input, $key, $having) = @_;
 
-	confess "lookup needs 5 arguments: what, database, input, key, having" unless ($#_ == 4);
+	confess "lookup needs 5 arguments: what, database, input, key, having\n" unless ($#_ == 4);
 
-	warn "# lookup ($database, $input, $key)\n";
+	warn "## lookup ($database, $input, $key)", $/ if ($debug > 1);
 	return unless (defined($lookup->{$database}->{$input}->{$key}));
 
-	confess "lookup really need load_ds_coderef added to data_structure\n" unless ($load_ds_coderef);
+	confess "lookup really need load_row_coderef added to data_structure\n" unless ($load_row_coderef);
 
 	my $mfns;
 	my @having = $having->();
 
-	warn "## having = ", dump( @having );
+	warn "## having = ", dump( @having ) if ($debug > 2);
 
 	foreach my $h ( @having ) {
 		if (defined($lookup->{$database}->{$input}->{$key}->{$h})) {
-			warn "lookup for $database/$input/$key/$h return ",dump($lookup->{$database}->{$input}->{$key}->{$h}),"\n";
+			warn "lookup for $database/$input/$key/$h return ",dump($lookup->{$database}->{$input}->{$key}->{$h}),"\n" if ($debug);
 			$mfns->{$_}++ foreach keys %{ $lookup->{$database}->{$input}->{$key}->{$h} };
 		}
 	}
@@ -1040,21 +1349,21 @@
 
 	my @mfns = sort keys %$mfns;
 
-	warn "# lookup loading $database/$input/$key mfn ", join(",",@mfns)," having ",dump(@having),"\n";
+	warn "# lookup loading $database/$input/$key mfn ", join(",",@mfns)," having ",dump(@having),"\n" if ($debug);
 
 	my $old_rec = $rec;
 	my @out;
 
 	foreach my $mfn (@mfns) {
-		$rec = $load_ds_coderef->( $database, $input, $mfn );
+		$rec = $load_row_coderef->( $database, $input, $mfn );
 
-		warn "got $database/$input/$mfn = ", dump($rec), $/;
+		warn "got $database/$input/$mfn = ", dump($rec), $/ if ($debug);
 
 		my @vals = $what->();
 
 		push @out, ( @vals );
 
-		warn "lookup for mfn $mfn returned ", dump(@vals), $/;
+		warn "lookup for mfn $mfn returned ", dump(@vals), $/ if ($debug);
 	}
 
 #	if (ref($lookup->{$k}) eq 'ARRAY') {
@@ -1065,9 +1374,13 @@
 
 	$rec = $old_rec;
 
-	warn "## lookup returns = ", dump(@out), $/;
+	warn "## lookup returns = ", dump(@out), $/ if ($debug);
 
-	return @out;
+	if ($#out == 0) {
+		return $out[0];
+	} else {
+		return @out;
+	}
 }
 
 =head2 save_into_lookup
@@ -1097,7 +1410,7 @@
 	die "save_into_lookup needs key" unless defined($key);
 	die "save_into_lookup needs CODE" unless ( defined($coderef) && ref($coderef) eq 'CODE' );
 
-warn "## save_into_lookup rec = ", dump($rec), " config = ", dump($config),"\n";
+	warn "## save_into_lookup rec = ", dump($rec), " config = ", dump($config), $/ if ($debug > 2);
 
 	my $mfn = 
 		defined($rec->{'000'}->[0])	?	$rec->{'000'}->[0]	:
@@ -1123,7 +1436,6 @@
   $database_code = config();	# use _ from hash
   $database_name = config('name');
   $database_input_name = config('input name');
-  $tag = config('input normalize tag');
 
 Up to three levels are supported.
 
@@ -1239,5 +1551,45 @@
 	}
 }
 
+my $hash;
+
+=head2 set
+
+  set( key => 'value' );
+
+=cut
+
+sub set {
+	my ($k,$v) = @_;
+	warn "## set ( $k => ", dump($v), " )", $/ if ( $debug );
+	$hash->{$k} = $v;
+};
+
+=head2 get
+
+  get( 'key' );
+
+=cut
+
+sub get {
+	my $k = shift || return;
+	my $v = $hash->{$k};
+	warn "## get $k = ", dump( $v ), $/ if ( $debug );
+	return $v;
+}
+
+=head2 count
+
+  if ( count( @result ) == 1 ) {
+  	# do something if only 1 result is there
+  }
+
+=cut
+
+sub count {
+	warn "## count ",dump(@_),$/ if ( $debug );
+	return @_ . '';
+}
+
 # END
 1;