=head1 VERSION
-Version 0.01
+Version 0.02
=cut
-our $VERSION = '0.01';
+our $VERSION = '0.02';
=head1 SYNOPSIS
This structures are used to produce output.
- my @ds = $webpac->data_structure($rec);
-
-B<Note: historical oddity follows>
-
-This method will also set C<< $webpac->{'currnet_filename'} >> if there is
-C<< <filename> >> tag and C<< $webpac->{'headline'} >> if there is
-C<< <headline> >> tag.
+ my $ds = $webpac->data_structure($rec);
=cut
my $rec = shift;
$log->logconfess("need HASH as first argument!") if ($rec !~ /HASH/o);
+ $log->debug("data_structure rec = ", sub { Dumper($rec) });
+
+ $log->logdie("need unique ID (mfn) in field 000 of record ", sub { Dumper($rec) } ) unless (defined($rec->{'000'}));
+
+ my $mfn = $rec->{'000'}->[0] || $log->logdie("field 000 isn't array!");
+
my $cache_file;
if ($self->{'db'}) {
- my @ds = $self->{'db'}->load_ds($rec);
- $log->debug("load_ds( rec = ", sub { Dumper($rec) }, ") = ", sub { Dumper(@ds) });
- return @ds if ($#ds > 0);
+ my $ds = $self->{'db'}->load_ds( $mfn );
+ $log->debug("load_ds( rec = ", sub { Dumper($rec) }, ") = ", sub { Dumper($ds) });
+ return $ds if ($ds);
$log->debug("cache miss, creating");
}
$self->{tags_by_order} = \@sorted_tags;
}
- my @ds;
+ my $ds;
$log->debug("tags: ",sub { join(", ",@sorted_tags) });
@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!
- }
-
# delimiter will join repeatable fields
if ($tag->{'delimiter'}) {
@v = ( join($tag->{'delimiter'}, @v) );
}
# default types
- my @types = qw(display swish);
+ my @types = qw(display search);
# override by type attribute
@types = ( $tag->{'type'} ) if ($tag->{'type'});
# TODO: name_sigular, name_plural
my $name = $self->{'import_xml'}->{'indexer'}->{$field}->{'name'};
- $row->{'name'} = $name ? $self->_x($name) : $field;
+ my $row_name = $name ? $self->_x($name) : $field;
# post-sort all values in field
if ($self->{'import_xml'}->{'indexer'}->{$field}->{'sort'}) {
$log->warn("sort at field tag not implemented");
}
- push @ds, $row;
+ $ds->{$row_name} = $row;
$log->debug("row $field: ",sub { Dumper($row) });
}
}
$self->{'db'}->save_ds(
- ds => \@ds,
- current_filename => $self->{'current_filename'},
- headline => $self->{'headline'},
+ id => $mfn,
+ ds => $ds,
) if ($self->{'db'});
- $log->debug("ds: ", sub { Dumper(@ds) });
+ $log->debug("ds: ", sub { Dumper($ds) });
- return @ds;
+ $log->logconfess("data structure returned is not array any more!") if wantarray;
+
+ return $ds;
}
if ($sf && $$rec->{$f}->[$i]->{$sf}) {
$$found++ if (defined($$found));
return $$rec->{$f}->[$i]->{$sf};
- } elsif ($$rec->{$f}->[$i]) {
+ } elsif (! $sf && $$rec->{$f}->[$i]) {
$$found++ if (defined($$found));
# it still might have subfield, just
# not specified, so we'll dump all
} else {
return $$rec->{$f}->[$i];
}
+ } else {
+ return '';
}
} else {
return '';