--- trunk/lib/WebPAC/Input.pm	2007/05/27 14:44:58	855
+++ trunk/lib/WebPAC/Input.pm	2007/10/30 01:51:20	910
@@ -64,6 +64,9 @@
 	encoding => 'ISO-8859-2',
 	recode => 'char pairs',
 	no_progress_bar => 1,
+	input_config => {
+		mapping => [ 'foo', 'bar', 'baz' ],
+	},
   );
 
 C<module> is low-level file format module. See L<WebPAC::Input::ISIS> and
@@ -233,6 +236,7 @@
 
 	my $ll_db = $class->new(
 		path => $arg->{path},
+		input_config => $arg->{input_config} || $self->{input_config},
 #		filter => sub {
 #			my ($l,$f_nr) = @_;
 #			return unless defined($l);
@@ -527,12 +531,18 @@
 			my $o = sprintf("%4s %d ~", $f, $v);
 
 			if (defined($s->{sf}->{$f})) {
+				my @subfields = keys %{ $s->{sf}->{$f} };
 				map {
 					$o .= sprintf(" %s:%d%s", $_, 
 						$s->{sf}->{$f}->{$_}->{count},
 						$s->{sf}->{$f}->{$_}->{repeatable} ? '*' : '',
 					);
-				} sort keys %{ $s->{sf}->{$f} };
+				} (
+					# first indicators and other special subfields
+					sort( grep { length($_)  > 1 } @subfields ),
+					# then subfileds (single char)
+					sort( grep { length($_) == 1 } @subfields ),
+				);
 			}
 
 			if (my $v_r = $s->{repeatable}->{$f}) {
@@ -559,7 +569,7 @@
 
 	return unless $self->{ll_db};
 
-	if ($self->{ll_db}->can('dump_rec')) {
+	if ($self->{ll_db}->can('dump_ascii')) {
 		return $self->{ll_db}->dump_ascii( $self->{pos} );
 	} else {
 		return dump( $self->{ll_db}->fetch_rec( $self->{pos} ) );