--- trunk/lib/WebPAC/Normalize.pm	2006/08/25 12:31:06	619
+++ trunk/lib/WebPAC/Normalize.pm	2006/09/08 17:47:58	661
@@ -4,6 +4,7 @@
 	_set_rec _set_lookup
 	_get_ds _clean_ds
 	_debug
+	_pack_subfields_hash
 
 	tag search display
 	marc marc_indicators marc_repeatable_subfield
@@ -23,7 +24,6 @@
 
 #use base qw/WebPAC::Common/;
 use Data::Dump qw/dump/;
-use Encode qw/from_to/;
 use Storable qw/dclone/;
 
 # debugging warn(s)
@@ -36,11 +36,11 @@
 
 =head1 VERSION
 
-Version 0.16
+Version 0.18
 
 =cut
 
-our $VERSION = '0.16';
+our $VERSION = '0.18';
 
 =head1 SYNOPSIS
 
@@ -469,7 +469,6 @@
 	foreach (@_) {
 		my $v = $_;		# make var read-write for Encode
 		next unless (defined($v) && $v !~ /^\s*$/);
-		from_to($v, 'iso-8859-2', $marc_encoding) if ($marc_encoding);
 		my ($i1,$i2) = defined($marc_indicators->{$f}) ? @{ $marc_indicators->{$f} } : (' ',' ');
 		if (defined $sf) {
 			push @{ $marc_record->[ $marc_record_offset ] }, [ $f, $i1, $i2, $sf => $v ];
@@ -549,7 +548,6 @@
 		my $v = shift;
 
 		next unless (defined($v) && $v !~ /^\s*$/);
-		from_to($v, 'iso-8859-2', $marc_encoding) if ($marc_encoding);
 		warn "## ++ marc_compose($f,$sf,$v) ", dump( $m ),$/ if ($debug > 1);
 		if ($sf ne '+') {
 			push @$m, ( $sf, $v );
@@ -722,6 +720,41 @@
 This function should be used inside functions to create C<data_structure> described
 above.
 
+=head2 _pack_subfields_hash
+
+ @values = _pack_subfields_hash( $h, $include_subfields )
+
+=cut
+
+sub _pack_subfields_hash {
+
+	warn "## _pack_subfields_hash( ",dump(@_), " )\n" if ($debug > 1);
+
+	my ($h,$include_subfields) = @_;
+
+
+	if ( defined($h->{subfields}) ) {
+		my $sfs = delete $h->{subfields} || die "no subfields?";
+		my @out;
+		while (@$sfs) {
+			my $sf = shift @$sfs;
+			push @out, '^' . $sf if ($include_subfields);
+			my $o = shift @$sfs;
+			if ($o == 0 && ref( $h->{$sf} ) ne 'ARRAY' ) {
+				# single element subfields are not arrays
+				push @out, $h->{$sf};
+			} else {
+#warn "====> $f $sf $o $#$sfs ", dump( $sfs ), "\n";
+				push @out, $h->{$sf}->[$o];
+			}
+		}
+		return @out;
+	} else {
+		# FIXME this should probably be in alphabetical order instead of hash order
+		values %{$h};
+	}
+}
+
 =head2 rec1
 
 Return all values in some field
@@ -738,13 +771,15 @@
 	return unless (defined($rec) && defined($rec->{$f}));
 	warn "rec1($f) = ", dump( $rec->{$f} ), $/ if ($debug > 1);
 	if (ref($rec->{$f}) eq 'ARRAY') {
-		return map { 
-			if (ref($_) eq 'HASH') {
-				values %{$_};
+		my @out;
+		foreach my $h ( @{ $rec->{$f} } ) {
+			if (ref($h) eq 'HASH') {
+				push @out, ( _pack_subfields_hash( $h ) );
 			} else {
-				$_;
+				push @out, $h;
 			}
-		} @{ $rec->{$f} };
+		}
+		return @out;
 	} elsif( defined($rec->{$f}) ) {
 		return $rec->{$f};
 	}