X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FMatcher.pm;h=d61964ce2037b0348582e9a96f09ab34871ec64f;hb=HEAD;hp=645b2ad5ed09ee54f4f4c60d99c8d44647b11fcd;hpb=66c420c3d0eeb2fa0f70f8416113273c48d9887f;p=koha_gimpoz diff --git a/C4/Matcher.pm b/C4/Matcher.pm index 645b2ad5ed..d61964ce20 100644 --- a/C4/Matcher.pm +++ b/C4/Matcher.pm @@ -13,11 +13,13 @@ package C4::Matcher; # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +use warnings; + use C4::Context; use MARC::Record; use C4::Search; @@ -36,37 +38,33 @@ C4::Matcher - find MARC records matching another one =head1 SYNOPSIS -=over 4 - -my @matchers = C4::Matcher::GetMatcherList(); + my @matchers = C4::Matcher::GetMatcherList(); -my $matcher = C4::Matcher->new($record_type); -$matcher->threshold($threshold); -$matcher->code($code); -$matcher->description($description); + my $matcher = C4::Matcher->new($record_type); + $matcher->threshold($threshold); + $matcher->code($code); + $matcher->description($description); -$matcher->add_simple_matchpoint('isbn', 1000, '020', 'a', -1, 0, ''); -$matcher->add_simple_matchpoint('Date', 1000, '008', '', 7, 4, ''); -$matcher->add_matchpoint('isbn', 1000, [ { tag => '020', subfields => 'a', norms => [] } ]); + $matcher->add_simple_matchpoint('isbn', 1000, '020', 'a', -1, 0, ''); + $matcher->add_simple_matchpoint('Date', 1000, '008', '', 7, 4, ''); + $matcher->add_matchpoint('isbn', 1000, [ { tag => '020', subfields => 'a', norms => [] } ]); -$matcher->add_simple_required_check('245', 'a', -1, 0, '', '245', 'a', -1, 0, ''); -$matcher->add_required_check([ { tag => '245', subfields => 'a', norms => [] } ], - [ { tag => '245', subfields => 'a', norms => [] } ]); + $matcher->add_simple_required_check('245', 'a', -1, 0, '', '245', 'a', -1, 0, ''); + $matcher->add_required_check([ { tag => '245', subfields => 'a', norms => [] } ], + [ { tag => '245', subfields => 'a', norms => [] } ]); -my @matches = $matcher->get_matches($marc_record, $max_matches); + my @matches = $matcher->get_matches($marc_record, $max_matches); -foreach $match (@matches) { + foreach $match (@matches) { - # matches already sorted in order of - # decreasing score - print "record ID: $match->{'record_id'}; - print "score: $match->{'score'}; - -} + # matches already sorted in order of + # decreasing score + print "record ID: $match->{'record_id'}; + print "score: $match->{'score'}; -my $matcher_description = $matcher->dump(); + } -=back + my $matcher_description = $matcher->dump(); =head1 FUNCTIONS @@ -74,18 +72,14 @@ my $matcher_description = $matcher->dump(); =head2 GetMatcherList -=over 4 - -my @matchers = C4::Matcher::GetMatcherList(); - -=back + my @matchers = C4::Matcher::GetMatcherList(); Returns an array of hashrefs list all matchers present in the database. Each hashref includes: -matcher_id -code -description + * matcher_id + * code + * description =cut @@ -101,17 +95,27 @@ sub GetMatcherList { return @results; } -=head1 METHODS +=head2 GetMatcherId + + my $matcher_id = C4::Matcher::GetMatcherId($code); + +Returns the matcher_id of a code. =cut -=head2 new +sub GetMatcherId { + my ($code) = @_; + my $dbh = C4::Context->dbh; -=over 4 + my $matcher_id = $dbh->selectrow_array("SELECT matcher_id FROM marc_matchers WHERE code = ?", undef, $code); + return $matcher_id; +} -my $matcher = C4::Matcher->new($record_type, $threshold); +=head1 METHODS -=back +=head2 new + + my $matcher = C4::Matcher->new($record_type, $threshold); Creates a new Matcher. C<$record_type> indicates which search database to use, e.g., 'biblio' or 'authority' and defaults to @@ -150,11 +154,7 @@ sub new { =head2 fetch -=over 4 - -my $matcher = C4::Matcher->fetch($id); - -=back + my $matcher = C4::Matcher->fetch($id); Creates a matcher object from the version stored in the database. If a matcher with the given @@ -243,11 +243,7 @@ sub _fetch_matchpoint { =head2 store -=over 4 - -my $id = $matcher->store(); - -=back + my $id = $matcher->store(); Stores matcher in database. The return value is the ID of the marc_matchers row. If the matcher was @@ -372,11 +368,7 @@ sub _store_matchpoint { =head2 delete -=over 4 - -C4::Matcher->delete($id); - -=back + C4::Matcher->delete($id); Deletes the matcher of the specified ID from the database. @@ -394,12 +386,8 @@ sub delete { =head2 threshold -=over 4 - -$matcher->threshold(1000); -my $threshold = $matcher->threshold(); - -=back + $matcher->threshold(1000); + my $threshold = $matcher->threshold(); Accessor method. @@ -412,12 +400,8 @@ sub threshold { =head2 _id -=over 4 - -$matcher->_id(123); -my $id = $matcher->_id(); - -=back + $matcher->_id(123); + my $id = $matcher->_id(); Accessor method. Note that using this method to set the DB ID of the matcher should not be @@ -432,12 +416,8 @@ sub _id { =head2 code -=over 4 - -$matcher->code('ISBN'); -my $code = $matcher->code(); - -=back + $matcher->code('ISBN'); + my $code = $matcher->code(); Accessor method. @@ -450,12 +430,8 @@ sub code { =head2 description -=over 4 - -$matcher->description('match on ISBN'); -my $description = $matcher->description(); - -=back + $matcher->description('match on ISBN'); + my $description = $matcher->description(); Accessor method. @@ -468,11 +444,7 @@ sub description { =head2 add_matchpoint -=over 4 - -$matcher->add_matchpoint($index, $score, $matchcomponents); - -=back + $matcher->add_matchpoint($index, $score, $matchcomponents); Adds a matchpoint that may include multiple components. The $index parameter identifies the index that will be searched, while $score @@ -510,13 +482,10 @@ sub add_matchpoint { =head2 add_simple_matchpoint -=over 4 - -$matcher->add_simple_matchpoint($index, $score, $source_tag, $source_subfields, - $source_offset, $source_length, - $source_normalizer); + $matcher->add_simple_matchpoint($index, $score, $source_tag, + $source_subfields, $source_offset, + $source_length, $source_normalizer); -=back Adds a simple matchpoint rule -- after composing a key based on the source tag and subfields, normalized per the normalization fuction, search the index. All records retrieved @@ -538,11 +507,7 @@ sub add_simple_matchpoint { =head2 add_required_check -=over 4 - -$match->add_required_check($source_matchpoint, $target_matchpoint); - -=back + $match->add_required_check($source_matchpoint, $target_matchpoint); Adds a required check definition. A required check means that in order for a match to be considered valid, the key derived from the @@ -594,16 +559,14 @@ sub add_required_check { =head2 add_simple_required_check -$matcher->add_simple_required_check($source_tag, $source_subfields, $source_offset, $source_length, $source_normalizer, - $target_tag, $target_subfields, $target_offset, $target_length, $target_normalizer); - -=over 4 + $matcher->add_simple_required_check($source_tag, $source_subfields, + $source_offset, $source_length, $source_normalizer, + $target_tag, $target_subfields, $target_offset, + $target_length, $target_normalizer); Adds a required check, which requires that the normalized keys made from the source and targets must match for a match to be considered valid. -=back - =cut sub add_simple_required_check { @@ -621,17 +584,13 @@ sub add_simple_required_check { =head2 find_matches -=over 4 - -my @matches = $matcher->get_matches($marc_record, $max_matches); -foreach $match (@matches) { - # matches already sorted in order of - # decreasing score - print "record ID: $match->{'record_id'}; - print "score: $match->{'score'}; -} - -=back + my @matches = $matcher->get_matches($marc_record, $max_matches); + foreach $match (@matches) { + # matches already sorted in order of + # decreasing score + print "record ID: $match->{'record_id'}; + print "score: $match->{'score'}; + } Identifies all of the records matching the given MARC record. For a record already in the database to be considered a match, it must meet the following criteria: @@ -663,9 +622,12 @@ sub get_matches { # FIXME only searching biblio index at the moment my ($error, $searchresults, $total_hits) = SimpleSearch($query, 0, $max_matches); - warn "search failed ($query) $error" if $error; - foreach my $matched (@$searchresults) { - $matches{$matched} += $matchpoint->{'score'}; + if (defined $error ) { + warn "search failed ($query) $error"; + } else { + foreach my $matched (@{$searchresults}) { + $matches{$matched} += $matchpoint->{'score'}; + } } } @@ -695,11 +657,7 @@ sub get_matches { =head2 dump -=over 4 - -$description = $matcher->dump(); - -=back + $description = $matcher->dump(); Returns a reference to a structure containing all of the information in the matcher object. This is mainly a convenience method to @@ -772,21 +730,23 @@ sub _get_match_keys { last FIELD if $j > 0 and $check_only_first_repeat; last FIELD if $i > 0 and $j > $#keys; my $key = ""; + my $string; if ($field->is_control_field()) { - if ($component->{'length'}) { - $key = _normalize(substr($field->data(), $component->{'offset'}, $component->{'length'})) - # FIXME normalize, substr - } else { - $key = _normalize($field->data()); - } + $string=$field->data(); } else { foreach my $subfield ($field->subfields()) { if (exists $component->{'subfields'}->{$subfield->[0]}) { - $key .= " " . $subfield->[1]; + $string .= " " . $subfield->[1]; } } - $key = _normalize($key); + } + if ($component->{'length'}>0) { + $string= substr($string, $component->{'offset'}, $component->{'length'}); + # FIXME normalize, substr + } elsif ($component->{'offset'}) { + $string= substr($string, $component->{'offset'}); } + $key = _normalize($string); if ($i == 0) { push @keys, $key if $key; } else { @@ -795,7 +755,6 @@ sub _get_match_keys { } } return @keys; - } @@ -815,10 +774,12 @@ sub _parse_match_component { # FIXME - default normalizer sub _normalize { my $value = uc shift; + $value =~ s/[.;:,\]\[\)\(\/'"]//g; $value =~ s/^\s+//; - $value =~ s/^\s+$//; + #$value =~ s/^\s+$//; + $value =~ s/\s+$//; $value =~ s/\s+/ /g; - $value =~ s/[.;,\]\[\)\(\/"']//g; + #$value =~ s/[.;,\]\[\)\(\/"']//g; return $value; } @@ -827,7 +788,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton