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

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

CVS: koha/updater updatedatabase,1.2,1.3
by Steve Tonnesen 19 Nov '01

19 Nov '01

Update of /cvsroot/koha/koha/updater In directory usw-pr-cvs1:/tmp/cvs-serv30056 Modified Files: updatedatabase Log Message: Added code to determine mysqld version for possibility of converting databases to MyISAM format Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** updatedatabase 2001/11/19 20:29:46 1.2 --- updatedatabase 2001/11/19 23:28:59 1.3 *************** *** 15,18 **** --- 15,26 ---- my %types; + + my $mysqlversion=`mysqld --version`; + $mysqlversion=~/Ver (\S*) /; + $mysqlversion=$1; + if ($mysqlversion ge '3.23') { + print "Could convert to MyISAM database tables...\n"; + } + my $sth=$dbh->prepare("show tables"); $sth->execute;

1 0

CVS: koha/updater updatedatabase,1.1,1.2
by Steve Tonnesen 19 Nov '01

19 Nov '01

Update of /cvsroot/koha/koha/updater In directory usw-pr-cvs1:/tmp/cvs-serv6853 Modified Files: updatedatabase Log Message: Added some more tables to the database updater. Modified barcode to be 20 characters long instead of 9. Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** updatedatabase 2001/11/19 18:26:50 1.1 --- updatedatabase 2001/11/19 20:29:46 1.2 *************** *** 19,30 **** while (my ($table) = $sth->fetchrow) { $tables{$table}=1; - print "Table: $table\n"; } # Add tables required by Z-3950 scripts ! unless ($tables{'z3950queue') { my $sti=$dbh->prepare("create table z3950queue (id int auto_increment primary key, term text, type char(10), startdate int, enddate int, done smallint, results longblob, numercords int, servers text, identifier char(30))"); $sti->execute; --- 19,42 ---- while (my ($table) = $sth->fetchrow) { $tables{$table}=1; } + # Add tables for virtual bookshelf management + unless ($tables{'shelfcontents'}) { + print "Adding shelfcontents table...\n"; + my $sti=$dbh->prepare("create table shelfcontents (shelfnumber int not null, itemnumber int not null, flags int)"); + $sti->execute; + } + unless ($tables{'bookshelf'}) { + print "Adding bookshelf table...\n"; + my $sti=$dbh->prepare("create table bookshelf (shelfnumber int auto_increment primary key, shelfname char(255))"); + $sti->execute; + } + # Add tables required by Z-3950 scripts ! unless ($tables{'z3950queue'}) { ! print "Adding z3950queue table...\n"; my $sti=$dbh->prepare("create table z3950queue (id int auto_increment primary key, term text, type char(10), startdate int, enddate int, done smallint, results longblob, numercords int, servers text, identifier char(30))"); $sti->execute; *************** *** 32,39 **** --- 44,53 ---- unless ($tables{'z3950results'}) { + print "Adding z3950results table...\n"; my $sti=$dbh->prepare("create table z3950results (id int auto_increment primary key, queryid int, server char(255), startdate int, enddate int, results longblob, numrecords int, numdownloaded int, highestseen int, active smallint)"); $sti->execute; } unless ($tables{'z3950servers'}) { + print "Adding z3950servers table...\n"; my $sti=$dbh->prepare("create table z3950servers (host char(255), port int, db char(255), userid char(255), password char(255), name text, id int, checked smallint, rank int)"); $sti->execute; *************** *** 53,56 **** --- 67,71 ---- unless ($types{'lccn'}) { # Add LCCN field to biblioitems db + print "Adding lccn field to biblioitems table...\n"; my $sti=$dbh->prepare("alter table biblioitems add column lccn char(25)"); $sti->execute; *************** *** 58,63 **** --- 73,98 ---- unless ($types{'marc'}) { # Add MARC field to biblioitems db (not used anymore) + print "Adding marc field to biblioitems table...\n"; my $sti=$dbh->prepare("alter table biblioitems add column marc text"); $sti->execute; + } + + # Get list of columns from biblioitems table + my %itemtypes; + + my $sth=$dbh->prepare("show columns from items"); + $sth->execute; + while (my ($column, $type, $null, $key, $default, $extra) = $sth->fetchrow) { + $itemtypes{$column}=$type; + } + + unless ($itemtypes{'barcode'} eq 'varchar(20)') { + $itemtypes{'barcode'}=~/varchar$(\d+)$/; + my $oldlength=$1; + if ($oldlength<20) { + print "Setting maximum barcode length to 20 (was $oldlength).\n"; + my $sti=$dbh->prepare("alter table items change barcode barcode varchar(20) not null"); + $sti->execute; + } }

2 1

CVS: koha/updater updatedatabase,NONE,1.1
by Steve Tonnesen 19 Nov '01

19 Nov '01

Update of /cvsroot/koha/koha/updater In directory usw-pr-cvs1:/tmp/cvs-serv4842 Added Files: updatedatabase Log Message: Script that will update existing databases, creating any new tables, adding, modifying or removing any fields from existing tables. This is in very early stages. Need to go through and ascertain which tables and fields need to be added/modified. Also need to add a "backup" before any modifications are made. Thoughts on this are welcome. --- NEW FILE --- #!/usr/bin/perl # This script will check for required updates to the database. Would also be a # good idea to offer to do a backup at this time... use C4::Database; use C4::Catalogue; use DBI; use C4::Acquisitions; use C4::Output; my $dbh=C4Connect; my %tables; my %types; my $sth=$dbh->prepare("show tables"); $sth->execute; while (my ($table) = $sth->fetchrow) { $tables{$table}=1; print "Table: $table\n"; } # Add tables required by Z-3950 scripts unless ($tables{'z3950queue') { my $sti=$dbh->prepare("create table z3950queue (id int auto_increment primary key, term text, type char(10), startdate int, enddate int, done smallint, results longblob, numercords int, servers text, identifier char(30))"); $sti->execute; } unless ($tables{'z3950results'}) { my $sti=$dbh->prepare("create table z3950results (id int auto_increment primary key, queryid int, server char(255), startdate int, enddate int, results longblob, numrecords int, numdownloaded int, highestseen int, active smallint)"); $sti->execute; } unless ($tables{'z3950servers'}) { my $sti=$dbh->prepare("create table z3950servers (host char(255), port int, db char(255), userid char(255), password char(255), name text, id int, checked smallint, rank int)"); $sti->execute; $sti=$dbh->prepare("insert into z3950servers values ('z3950.loc.gov', 7090, 'voyager', '', '', 'Library of Congress', 1, 1, 1)"); $sti->execute; } # Get list of columns from biblioitems table my $sth=$dbh->prepare("show columns from biblioitems"); $sth->execute; while (my ($column, $type, $null, $key, $default, $extra) = $sth->fetchrow) { $types{$column}=$type; } unless ($types{'lccn'}) { # Add LCCN field to biblioitems db my $sti=$dbh->prepare("alter table biblioitems add column lccn char(25)"); $sti->execute; } unless ($types{'marc'}) { # Add MARC field to biblioitems db (not used anymore) my $sti=$dbh->prepare("alter table biblioitems add column marc text"); $sti->execute; } $sth->finish; $dbh->disconnect;

1 0

CVS: koha/updater - New directory
by Steve Tonnesen 19 Nov '01

19 Nov '01

Update of /cvsroot/koha/koha/updater In directory usw-pr-cvs1:/tmp/cvs-serv31629/updater Log Message: Directory /cvsroot/koha/koha/updater added to the repository

1 0

1st Crack at FAQ
by Nicholas Stephen Rosasco 08 Nov '01

08 Nov '01

Hey Koha-coder types! I've got a draft FAQ file (incomplete, but ready for some comment, I think) up at http://www.people.virginia.edu/~nsr4n/Koha/faq.html Style/etc isn't settled, but just general opinion/suggestion is welcome. At some point I'm going to need to pick (for consistency's sake, if nothing else) US vs UK/Commonwealth spelling -- as most of you are Kiwi or Canadian :) and I am not, I am open to suggestions as to which I should favor -- at the moment, both are included. Nick ...apparently the FAQ maintainer.

4 5