--- trunk2/lib/WebPAC.pm	2004/06/20 16:57:52	374
+++ trunk2/lib/WebPAC.pm	2004/06/20 17:52:41	375
@@ -254,17 +254,21 @@
 
 	$self->{'tag'} = $type2tag{$type_base};
 
-	$log->debug("using type '",$self->{'type'},"' tag <",$self->{'tag'},">") if ($self->{'debug'});
+	$log->info("using type '",$self->{'type'},"' tag <",$self->{'tag'},">");
 
 	my $f = "./import_xml/".$self->{'type'}.".xml";
 	$log->logconfess("import_xml file '$f' doesn't exist!") if (! -e "$f");
 
-	$log->debug("reading '$f'") if ($self->{'debug'});
+	$log->info("reading '$f'");
+
+	$self->{'import_xml_file'} = $f;
 
 	$self->{'import_xml'} = XMLin($f,
 		ForceArray => [ $self->{'tag'}, 'config', 'format' ],
 	);
 
+	$log->debug("import xml is ",sub { Dumper($self->{'import_xml'}) });
+
 }
 
 =head2 create_lookup
@@ -483,7 +487,7 @@
 
 	$i = 0 if (! $i);
 
-	my $format = $self->{'utf2cp'}->convert($format_utf8) || $log->logconfess("can't convert '$format_utf8' from UTF-8 to ",$self->{'code_page'});
+	my $format = $self->_x($format_utf8) || $log->logconfess("can't convert '$format_utf8' from UTF-8 to ",$self->{'code_page'});
 
 	my @out;
 
@@ -650,6 +654,11 @@
 			}
 			next if (! @v);
 
+			# use format?
+			if ($tag->{'format_name'}) {
+				@v = map { $self->apply_format($tag->{'format_name'},$tag->{'format_delimiter'},$_) } @v;
+			}
+
 			# does tag have type?
 			if ($tag->{'type'}) {
 				push @{$row->{$tag->{'type'}}}, @v;
@@ -667,6 +676,11 @@
 
 		if ($row) {
 			$row->{'tag'} = $field;
+
+			# TODO: name_sigular, name_plural
+			my $name = $self->{'import_xml'}->{'indexer'}->{$field}->{'name'};
+			$row->{'name'} = $name ? $self->_x($name) : $field;
+
 			push @ds, $row;
 
 			$log->debug("row $field: ",sub { Dumper($row) });
@@ -707,6 +721,47 @@
 	return $out;
 }
 
+=head2 apply_format
+
+Apply format specified in tag with C<format_name="name"> and
+C<format_delimiter=";;">.
+
+ my $text = $webpac->apply_format($format_name,$format_delimiter,$data);
+
+Formats can contain C<lookup{...}> if you need them.
+
+=cut
+
+sub apply_format {
+	my $self = shift;
+
+	my ($name,$delimiter,$data) = @_;
+
+	my $log = $self->_get_logger();
+
+	if (! $self->{'import_xml'}->{'format'}->{$name}) {
+		$log->warn("<format name=\"$name\"> is not defined in ",$self->{'import_xml_file'});
+		return $data;
+	}
+
+	$log->warn("no delimiter for format $name") if (! $delimiter);
+
+	my $format = $self->_x($self->{'import_xml'}->{'format'}->{$name}->{'content'}) || $log->logdie("can't find format '$name'");
+
+	my @data = split(/\Q$delimiter\E/, $data);
+
+	my $out = sprintf($format, @data);
+	$log->debug("using format $name [$format] on $data to produce: $out");
+
+	if ($out =~ m/$LOOKUP_REGEX/o) {
+		return $self->lookup($out);
+	} else {
+		return $out;
+	}
+
+}
+
+
 #
 #
 #
@@ -759,6 +814,15 @@
 	return $va <=> $vb;
 }
 
+=head2 _get_logger
+
+Get C<Log::Log4perl> object with a twist: domains are defined for each
+method
+
+ my $log = $webpac->_get_logger();
+
+=cut
+
 sub _get_logger {
 	my $self = shift;
 
@@ -766,6 +830,22 @@
 	return get_logger($name);
 }
 
+=head2 _x
+
+Convert string from UTF-8 to code page defined in C<import_xml>.
+
+ my $text = $webpac->_x('utf8 text');
+
+=cut
+
+sub _x {
+	my $self = shift;
+	my $utf8 = shift || return;
+
+	return $self->{'utf2cp'}->convert($utf8) ||
+		$self->_get_logger()->logwarn("can't convert '$utf8'");
+}
+
 #
 #
 #