--- trunk2/lib/WebPAC.pm 2004/06/20 17:52:41 375
+++ trunk2/lib/WebPAC.pm 2004/09/05 22:22:37 411
@@ -198,9 +198,12 @@
my $rec = $self->{'data'}->{$mfn};
$self->create_lookup($rec, @{$arg->{'lookup'}});
+ $self->progress_bar($mfn,$maxmfn);
+
}
$self->{'current_mfn'} = 1;
+ $self->{'last_pcnt'} = 0;
# store max mfn and return it.
return $self->{'max_mfn'} = $maxmfn;
@@ -228,9 +231,45 @@
return;
}
+ $self->progress_bar($mfn,$self->{'max_mfn'});
+
return $self->{'data'}->{$mfn};
}
+=head2 progress_bar
+
+Draw progress bar on STDERR.
+
+ $webpac->progress_bar($current, $max);
+
+=cut
+
+sub progress_bar {
+ my $self = shift;
+
+ my ($curr,$max) = @_;
+
+ my $log = $self->_get_logger();
+
+ $log->logconfess("no current value!") if (! $curr);
+ $log->logconfess("no maximum value!") if (! $max);
+
+ if ($curr > $max) {
+ $max = $curr;
+ $log->debug("overflow to $curr");
+ }
+
+ $self->{'last_pcnt'} ||= 1;
+
+ $self->{'last_pcnt'} = $curr if ($curr < $self->{'last_pcnt'});
+
+ my $p = int($curr * 100 / $max);
+ if ($p != $self->{'last_pcnt'}) {
+ printf STDERR ("%5d / %5d [%-51s] %-2d %% \r",$curr,$max,"=" x ($p/2).">", $p );
+ $self->{'last_pcnt'} = $p;
+ }
+}
+
=head2 open_import_xml
Read file from C directory and parse it.
@@ -335,6 +374,7 @@
if ($$rec->{$f}) {
return '' if (! $$rec->{$f}->[$i]);
+ no strict 'refs';
if ($sf && $$rec->{$f}->[$i]->{$sf}) {
$$found++ if (defined($$found));
return $$rec->{$f}->[$i]->{$sf};
@@ -375,6 +415,9 @@
This function B perform parsing of format to inteligenty skip
delimiters before fields which aren't used.
+This method will automatically decode UTF-8 string to local code page
+if needed.
+
=cut
sub fill_in {
@@ -390,6 +433,10 @@
# FIXME remove for speedup?
$log->logconfess("need HASH as first argument!") if ($rec !~ /HASH/o);
+ if (utf8::is_utf8($format)) {
+ $format = $self->_x($format);
+ }
+
my $found = 0;
my $eval_code;
@@ -609,7 +656,8 @@
my @ds = $webpac->data_structure($rec);
This method will also set C<$webpac->{'currnet_filename'}> if there is
- tag in C.
+ tag in C and C<$webpac->{'headline'}> if there is
+ tag.
=cut
@@ -622,6 +670,7 @@
$log->logconfess("need HASH as first argument!") if ($rec !~ /HASH/o);
undef $self->{'currnet_filename'};
+ undef $self->{'headline'};
my @sorted_tags;
if ($self->{tags_by_order}) {
@@ -659,6 +708,15 @@
@v = map { $self->apply_format($tag->{'format_name'},$tag->{'format_delimiter'},$_) } @v;
}
+ if ($field eq 'filename') {
+ $self->{'current_filename'} = join('',@v);
+ $log->debug("filename: ",$self->{'current_filename'});
+ } elsif ($field eq 'headline') {
+ $self->{'headline'} .= join('',@v);
+ $log->debug("headline: ",$self->{'headline'});
+ next; # don't return headline in data_structure!
+ }
+
# does tag have type?
if ($tag->{'type'}) {
push @{$row->{$tag->{'type'}}}, @v;
@@ -667,10 +725,6 @@
push @{$row->{'swish'}}, @v;
}
- if ($field eq 'filename') {
- $self->{'current_filename'} = join('',@v);
- $log->debug("filename: ",$self->{'current_filename'});
- }
}
@@ -721,6 +775,38 @@
return $out;
}
+=head2 output_file
+
+Create output from in-memory data structure using Template Toolkit template
+to a file.
+
+ $webpac->output_file(
+ file => 'out.txt',
+ template => 'text.tt',
+ data => @ds
+ );
+
+=cut
+
+sub output_file {
+ my $self = shift;
+
+ my $args = {@_};
+
+ my $log = $self->_get_logger();
+
+ $log->logconfess("need file name") if (! $args->{'file'});
+
+ $log->debug("creating file ",$args->{'file'});
+
+ open(my $fh, ">", $args->{'file'}) || $log->logdie("can't open output file '$self->{'file'}': $!");
+ print $fh $self->output(
+ template => $args->{'template'},
+ data => $args->{'data'},
+ ) || $log->logdie("print: $!");
+ close($fh) || $log->logdie("close: $!");
+}
+
=head2 apply_format
Apply format specified in tag with C and