November 2001 - Koha-devel - lists.koha-community.org

MARC enabled version
by Nicholas Stephen Rosasco 28 Nov '01

28 Nov '01

Semi-idle question -- how close are y'all to a fully MARC OK Koha version? On that note: http://www.oclc.org/home Has some interesting data, and may have a list of z39.50 servers, if you want to add more to the DB. We may also want to add the ability to give Koha a file of ISBNs or whatever to go get data in bulk, since if you're starting from no cataloging data, you have problems :) (Say, a file import button on the ISBN list?). Nick ...throwing ideas around today.

1 0

CVS: koha/C4 Search.pm,1.9,1.10
by Chris Cormack 26 Nov '01

26 Nov '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv10044/C4 Modified Files: Search.pm Log Message: Fixing error in keyword search (fixing my mistake from yesterday) Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Search.pm 2001/11/26 04:33:42 1.9 --- Search.pm 2001/11/27 02:01:39 1.10 *************** *** 302,306 **** } $query=$query."))"; ! if ($search->{'class'} ne ''){ my @temp=split(/\|/,$search->{'class'}); my $count=@temp; --- 302,306 ---- } $query=$query."))"; ! if ($search->{'class'} ne ''){ my @temp=split(/\|/,$search->{'class'}); my $count=@temp; *************** *** 308,313 **** for (my $i=1;$i<$count;$i++){ $query.=" or itemtype='$temp[$i]'"; ! } ! $query.=")"; } $query.="group by biblio.biblionumber order by author,title"; --- 308,313 ---- for (my $i=1;$i<$count;$i++){ $query.=" or itemtype='$temp[$i]'"; ! } ! $query.=")"; } $query.="group by biblio.biblionumber order by author,title"; *************** *** 335,340 **** while (my $data=$sth->fetchrow_hashref){ $query="Select * from biblio,biblioitems where ! biblio.biblionumber=$data->{'biblionumber'} and biblio.biblionumber=biblioitems.biblionumber ! group by biblio.biblionumber"; if ($search->{'class'} ne ''){ my @temp=split(/\|/,$search->{'class'}); --- 335,340 ---- while (my $data=$sth->fetchrow_hashref){ $query="Select * from biblio,biblioitems where ! biblio.biblionumber=$data->{'biblionumber'} and ! biblio.biblionumber=biblioitems.biblionumber "; if ($search->{'class'} ne ''){ my @temp=split(/\|/,$search->{'class'});

1 0

CVS: koha/C4 Search.pm,1.8,1.9
by Chris Cormack 25 Nov '01

25 Nov '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv28117 Modified Files: Search.pm Log Message: Fixing a bug in keyword search was duplicating results Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Search.pm 2001/11/26 00:41:34 1.8 --- Search.pm 2001/11/26 04:33:42 1.9 *************** *** 317,321 **** $i=0; while (my $data=$sth->fetchrow_hashref){ ! my $sti=$dbh->prepare("select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'}"); $sti->execute; my ($dewey, $subclass) = $sti->fetchrow; --- 317,322 ---- $i=0; while (my $data=$sth->fetchrow_hashref){ ! my $sti=$dbh->prepare("select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'} ! "); $sti->execute; my ($dewey, $subclass) = $sti->fetchrow; *************** *** 330,338 **** $sth->finish; $sth=$dbh->prepare("Select biblionumber from bibliosubject where subject ! like '%$search->{'keyword'}%'"); $sth->execute; while (my $data=$sth->fetchrow_hashref){ $query="Select * from biblio,biblioitems where ! biblio.biblionumber=$data->{'biblionumber'} and biblio.biblionumber=biblioitems.biblionumber"; if ($search->{'class'} ne ''){ my @temp=split(/\|/,$search->{'class'}); --- 331,340 ---- $sth->finish; $sth=$dbh->prepare("Select biblionumber from bibliosubject where subject ! like '%$search->{'keyword'}%' group by biblionumber"); $sth->execute; while (my $data=$sth->fetchrow_hashref){ $query="Select * from biblio,biblioitems where ! biblio.biblionumber=$data->{'biblionumber'} and biblio.biblionumber=biblioitems.biblionumber ! group by biblio.biblionumber"; if ($search->{'class'} ne ''){ my @temp=split(/\|/,$search->{'class'}); *************** *** 348,352 **** # print $query; while (my $data2=$sth2->fetchrow_hashref){ ! $results[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}"; # print $results[$i]; $i++; --- 350,360 ---- # print $query; while (my $data2=$sth2->fetchrow_hashref){ ! my $dewey= $data2->{'dewey'}; ! my $subclass=$data2->{'subclass'}; ! $dewey=~s/\.*0*$//; ! ($dewey == 0) && ($dewey=''); ! ($dewey) && ($dewey.=" $subclass") ; ! # $sti->finish; ! $results[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey"; # print $results[$i]; $i++;

1 0

CVS: koha insertdata.pl,1.3,1.4
by Chris Cormack 25 Nov '01

25 Nov '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv29415 Modified Files: insertdata.pl Log Message: Modify an adult with guarantees now modifies the guarantees also. IE change of address effects the guarantees record as well Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** insertdata.pl 2001/03/07 21:12:47 1.3 --- insertdata.pl 2001/11/26 02:03:23 1.4 *************** *** 8,11 **** --- 8,12 ---- use C4::Database; use C4::Input; + use C4::Search; use Date::Manip; use strict; *************** *** 61,64 **** --- 62,83 ---- '$data{'ethnicity'}','$data{'borrowernumber'}')"; } + # ok if its an adult (type) it may have borrowers that depend on it as a guarantor + # so when we update information for an adult we should check for guarantees and update the relevant part + # of their records, ie addresses and phone numbers + + if ($data{'categorycode'} eq 'A' || $data{'categorycode'} eq 'W'){ + # is adult check guarantees; + my ($count,$guarantees)=findguarantees($data{'borrowernumber'}); + for (my $i=0;$i<$count;$i++){ + my $guaquery="update borrowers set streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}', + streetcity='$data{'streetcity'}',phoneday='$data{'phoneday'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}' + ,streetaddress='$data{'address'}' + where borrowernumber='$guarantees->[$i]->{'borrowernumber'}'"; + my $sth3=$dbh->prepare($guaquery); + $sth3->execute; + $sth3->finish; + } + } + #print $query; my $sth2=$dbh->prepare($query);

1 0

CVS: koha/C4 Search.pm,1.7,1.8
by Chris Cormack 25 Nov '01

25 Nov '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv14012 Modified Files: Search.pm Log Message: Added a findguarantor routine to search for the guarantor of a given borrower. Probably it and findgurantees need to moved out to borrowers.pm Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Search.pm 2001/11/25 22:25:55 1.7 --- Search.pm 2001/11/26 00:41:34 1.8 *************** *** 20,24 **** &OpacSearch &borrdata2 &NewBorrowerNumber &bibitemdata &borrissues &getboracctrecord &ItemType &itemissues &FrontSearch &subject &subtitle ! &addauthor &bibitems &barcodes &findguarantees &allissues &systemprefs); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], --- 20,25 ---- &OpacSearch &borrdata2 &NewBorrowerNumber &bibitemdata &borrissues &getboracctrecord &ItemType &itemissues &FrontSearch &subject &subtitle ! &addauthor &bibitems &barcodes &findguarantees &allissues &systemprefs ! &findguarantor); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], *************** *** 72,76 **** return($i,\@dat); } ! sub systemprefs { --- 73,94 ---- return($i,\@dat); } ! sub findguarantor{ ! my ($bornum)=@_; ! my $dbh=C4Connect; ! my $query="select guarantor from borrowers where ! borrowernumber='$bornum'"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my $data=$sth->fetchrow_hashref; ! $sth->finish; ! $query="Select * from borrowers where ! borrowernumber='$data->{'guarantor'}'"; ! $sth=$dbh->prepare($query); ! $sth->execute; ! $data=$sth->fetchrow_hashref; ! $sth->finish; ! $dbh->disconnect; ! return($data); ! } sub systemprefs {

1 0

CVS: koha/C4 Search.pm,1.6,1.7
by Chris Cormack 25 Nov '01

25 Nov '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv19174/C4 Modified Files: Search.pm Log Message: Author combined with Title search was not searching the series title field Fixed now Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Search.pm 2001/11/23 02:12:48 1.6 --- Search.pm 2001/11/25 22:25:55 1.7 *************** *** 399,403 **** $query=$query.")"; if ($search->{'title'} ne ''){ ! $query=$query. " and title like '%$search->{'title'}%'"; } if ($search->{'class'} ne ''){ --- 399,404 ---- $query=$query.")"; if ($search->{'title'} ne ''){ ! $query=$query. " and (title like '%$search->{'title'}%' ! or seriestitle like '%$search->{'title'}%')"; } if ($search->{'class'} ne ''){

1 0

CVS: koha/C4 Reserves2.pm,1.1.1.1,1.2
by Chris Cormack 25 Nov '01

25 Nov '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv23201/C4 Modified Files: Reserves2.pm Log Message: Fixing reserve handling. Mulitple copy reserves now handled correctly, and correct charges are being applied Index: Reserves2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Reserves2.pm 2000/12/19 23:45:55 1.1.1.1 --- Reserves2.pm 2001/11/25 20:17:53 1.2 *************** *** 55,59 **** my ($bib,$bor)=@_; my $dbh=C4Connect; ! my $query="Select *,reserves.branchcode from reserves,borrowers,biblio "; if ($bib ne ''){ --- 55,59 ---- my ($bib,$bor)=@_; my $dbh=C4Connect; ! my $query="Select *,reserves.branchcode,biblio.title as btitle from reserves,borrowers,biblio "; if ($bib ne ''){ *************** *** 176,181 **** $x++; } ! if ($const eq 'o') {if ($found == 1) {push @biblioitems,$data;} ! } else {if ($found == 0) {push @biblioitems,$data;} } } } --- 176,188 ---- $x++; } ! if ($const eq 'o') { ! if ( $found == 1) { ! push @biblioitems,$data1; ! } ! } else { ! if ($found == 0) { ! push @biblioitems,$data1; ! } ! } } } *************** *** 194,202 **** my $query3 = "select * from issues where itemnumber = '$itdata->{'itemnumber'}' and ! returndate is null"; my $sth3 = $dbh->prepare($query3); $sth3->execute(); ! if (my $isdata=$sth3->fetchrow_hashref) { } else ! {$allissued = 0; } } $x++; --- 201,212 ---- my $query3 = "select * from issues where itemnumber = '$itdata->{'itemnumber'}' and ! returndate is null"; ! my $sth3 = $dbh->prepare($query3); $sth3->execute(); ! if (my $isdata=$sth3->fetchrow_hashref) { ! } else { ! $allissued = 0; ! } } $x++; *************** *** 207,211 **** my $rsth = $dbh->prepare($rquery); $rsth->execute(); ! if (my $rdata = $rsth->fetchrow_hashref) { } else { $fee = 0; } --- 217,222 ---- my $rsth = $dbh->prepare($rquery); $rsth->execute(); ! if (my $rdata = $rsth->fetchrow_hashref) { ! } else { $fee = 0; }

1 0

CVS: koha/C4/Circulation Circ2.pm,1.19,1.20
by Chris Cormack 25 Nov '01

25 Nov '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv23201/C4/Circulation Modified Files: Circ2.pm Log Message: Fixing reserve handling. Mulitple copy reserves now handled correctly, and correct charges are being applied Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** Circ2.pm 2001/10/10 19:28:05 1.19 --- Circ2.pm 2001/11/25 20:17:53 1.20 *************** *** 24,28 **** @ISA = qw(Exporter); ! @EXPORT = qw(&getbranches &getprinters &getpatroninformation &currentissues &getiteminformation &findborrower &issuebook &returnbook); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], --- 24,29 ---- @ISA = qw(Exporter); ! @EXPORT = qw(&getbranches &getprinters &getpatroninformation &currentissues &getiteminformation &findborrower &issuebook &returnbook ! &find_reserves); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], *************** *** 477,481 **** $usth->execute; $usth->finish; ! $uquery="update items set itemnotes='' where itemnumber=$iteminformation->{'itemnumber'}"; $usth = $dbh->prepare($uquery); $usth->execute; --- 478,482 ---- $usth->execute; $usth->finish; ! $uquery="update items set paidfor='' where itemnumber=$iteminformation->{'itemnumber'}"; $usth = $dbh->prepare($uquery); $usth->execute; *************** *** 888,891 **** --- 889,893 ---- my $resrec; my $lastrec; + # print $query; while (($resrec=$sth->fetchrow_hashref) && ($resfound eq "n")) { $lastrec=$resrec; *************** *** 893,915 **** if ($resrec->{'itemnumber'} eq $itemno) { $resfound = "y"; ! } ! } ! if ($resrec->{'constrainttype'} eq "a") { ! $resfound = "y"; } else { ! my $conquery = "select * from reserveconstraints where borrowernumber ! = $resrec->{'borrowernumber'} and reservedate = '$resrec->{'reservedate'}' and biblionumber = $resrec->{'biblionumber'} and biblioitemnumber = $itemdata->{'biblioitemnumber'}"; ! my $consth = $dbh->prepare($conquery); ! $consth->execute; ! if (my $conrec=$consth->fetchrow_hashref) { ! if ($resrec->{'constrainttype'} eq "o") { ! $resfound = "y"; ! } } else { ! if ($resrec->{'constrainttype'} eq "e") { ! $resfound = "y"; ! } } - $consth->finish; } if ($resfound eq "y") { --- 895,918 ---- if ($resrec->{'itemnumber'} eq $itemno) { $resfound = "y"; ! } } else { ! if ($resrec->{'constrainttype'} eq "a") { ! $resfound = "y"; } else { ! my $conquery = "select * from reserveconstraints where borrowernumber ! = $resrec->{'borrowernumber'} and reservedate = '$resrec->{'reservedate'}' and biblionumber = $resrec->{'biblionumber'} and biblioitemnumber = $itemdata->{'biblioitemnumber'}"; ! my $consth = $dbh->prepare($conquery); ! $consth->execute; ! if (my $conrec=$consth->fetchrow_hashref) { ! if ($resrec->{'constrainttype'} eq "o") { ! $resfound = "y"; ! } ! } else { ! if ($resrec->{'constrainttype'} eq "e") { ! $resfound = "y"; ! } ! } ! $consth->finish; } } if ($resfound eq "y") {

1 0

CVS: koha/C4 Search.pm,1.5,1.6
by Chris Cormack 22 Nov '01

22 Nov '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv22601/C4 Modified Files: Search.pm Log Message: Adding the facility to search on just dewey and class Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Search.pm 2001/10/05 20:13:20 1.5 --- Search.pm 2001/11/23 02:12:48 1.6 *************** *** 486,489 **** --- 486,492 ---- $query.=" and illus like '%".$search->{'illustrator'}."%' "; } + if ($search->{'dewey'} ne ''){ + $query.=" and biblioitems.dewey like '$search->{'dewey'}%'"; + } } elsif ($search->{'dewey'} ne ''){ $query="select * from biblioitems,biblio

1 0

CVS: koha-html/opac-html/cat index.html,1.2,1.3
by Chris Cormack 20 Nov '01

20 Nov '01

Update of /cvsroot/koha/koha-html/opac-html/cat In directory usw-pr-cvs1:/tmp/cvs-serv6557 Modified Files: index.html Log Message: Adding facility to do an exact title search (like on the librarians interface) Index: index.html =================================================================== RCS file: /cvsroot/koha/koha-html/opac-html/cat/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** index.html 2001/10/05 20:14:06 1.2 --- index.html 2001/11/21 04:34:45 1.3 *************** *** 5,12 **** <input type=hidden name=type value=opac> <TABLE > <TR VALIGN=TOP> <TD>Keywords</TD> <TD><INPUT TYPE="text" SIZE="25" NAME="keyword"></TD> ! <TD rowspan=4 ><INPUT TYPE="image" src="../images/search-button.gif" alt="OK Start Search" width=164 height=44 border=0 > ! <p> --- 5,15 ---- <input type=hidden name=type value=opac> <TABLE > + + <tr valign=top> + <TD></td><td></td><td><INPUT TYPE="image" src="../images/search-button.gif" alt="OK Start Search" width=164 height=44 border=0 > + </td></tr> <TR VALIGN=TOP> <TD>Keywords</TD> <TD><INPUT TYPE="text" SIZE="25" NAME="keyword"></TD> ! *************** *** 15,18 **** --- 18,23 ---- <TR VALIGN=TOP> <TD>Title</TD> <TD><INPUT TYPE="text" SIZE="25" NAME="title"></TD> + <td><input type=radio name=ttype value=normal checked>Normal<input + type=radio name=ttype value=exact>Exact</td> </TR> <TR VALIGN=TOP>

1 0