sub getbranches renamed to GetBranches according to the coding guidelines

[koha_fer] / C4 / Breeding.pm

diff --git a/C4/Breeding.pm b/C4/Breeding.pm
index 9f633d3..030da53 100644 (file)
--- a/C4/Breeding.pm
+++ b/C4/Breeding.pm
@@ -52,7 +52,7 @@ This module doesn't do anything.
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(&ImportBreeding);
+@EXPORT = qw(&ImportBreeding &BreedingSearch);
 
 sub  ImportBreeding {
        my ($marcrecords,$overwrite_biblio,$filename,$encoding,$z3950random) = @_;
@@ -73,10 +73,10 @@ where isbn=? and title=?");
        for (my $i=0;$i<=$#marcarray;$i++) {
                my $marcrecord = MARC::File::USMARC::decode($marcarray[$i]."\x1D");
                my @warnings = $marcrecord->warnings();
-               if (ref($marcrecord) eq undef) {
+               if (scalar($marcrecord->fields()) == 0) {
                        $notmarcrecord++;
                } else {
-                       my $oldbiblio = MARCmarc2koha($dbh,$marcrecord);
+                       my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,'');
                        $oldbiblio->{title} = char_decode($oldbiblio->{title},$encoding);
                        $oldbiblio->{author} = char_decode($oldbiblio->{author},$encoding);
                        # if isbn found and biblio does not exist, add it. If isbn found and biblio exists, overwrite or ignore depending on user choice
@@ -91,8 +91,10 @@ where isbn=? and title=?");
                                $searchisbn->execute($oldbiblio->{isbn});
                                ($biblioitemnumber) = $searchisbn->fetchrow;
                        } else {
-                               $searchissn->execute($oldbiblio->{issn});
-                               ($biblioitemnumber) = $searchissn->fetchrow;
+                               if ($oldbiblio->{issn}) {
+                                $searchissn->execute($oldbiblio->{issn});
+                                ($biblioitemnumber) = $searchissn->fetchrow;
+                                }
                        }
                        if ($biblioitemnumber) {
                                $alreadyindb++;
@@ -124,4 +126,55 @@ where isbn=? and title=?");
        return ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported);
 }
 
+
+=item BreedingSearch
+
+  ($count, @results) = &BreedingSearch($title,$isbn,$random);
+C<$title> contains the title,
+C<$isbn> contains isbn or issn,
+C<$random> contains the random seed from a z3950 search.
+
+C<$count> is the number of items in C<@results>. C<@results> is an
+array of references-to-hash; the keys are the items from the C<marc_breeding> table of the Koha database.
+
+=cut
+
+sub BreedingSearch {
+       my ($title,$isbn,$z3950random) = @_;
+       my $dbh   = C4::Context->dbh;
+       my $count = 0;
+       my ($query,@bind);
+       my $sth;
+       my @results;
+
+       $query = "Select id,file,isbn,title,author from marc_breeding where ";
+       if ($z3950random) {
+               $query .= "z3950random = ?";
+               @bind=($z3950random);
+       } else {
+           @bind=();
+               if ($title) {
+                       $query .= "title like ?";
+                       push(@bind,"$title%");
+               }
+               if ($title && $isbn) {
+                       $query .= " and ";
+               }
+               if ($isbn) {
+                       $query .= "isbn like ?";
+                       push(@bind,"$isbn%");
+               }
+       }
+       $sth   = $dbh->prepare($query);
+       $sth->execute(@bind);
+       while (my $data = $sth->fetchrow_hashref) {
+                       $results[$count] = $data;
+                       $count++;
+       } # while
+
+       $sth->finish;
+       return($count, @results);
+} # sub breedingsearch
+
+
 END { }       # module clean-up code here (global destructor)