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

CVS: koha/C4 Search.pm,1.19,1.20
by Chris Cormack 06 May '02

06 May '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv2274/C4 Modified Files: Search.pm Log Message: Removing keywordsearch2 (no longer used) Fixing glitches in counting lost items. In items itemlost=1 item marked lost by a librarian itemlost=2 item marked lost by kohas automatic this item is over 4 weeks overdue routine. To the borrowers (ie in the opac) they should just show as lost Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** Search.pm 2 May 2002 00:08:53 -0000 1.19 --- Search.pm 6 May 2002 23:12:25 -0000 1.20 *************** *** 297,450 **** } - sub KeywordSearch2 { - my ($env,$type,$search,$num,$offset)=@_; - my $dbh = &C4Connect; - $search->{'keyword'}=~ s/ +$//; - $search->{'keyword'}=~ s/'/\\'/; - my @key=split(' ',$search->{'keyword'}); - my $count=@key; - my $i=1; - my @results; - my $query ="Select * from biblio,bibliosubtitle,biblioitems where - biblio.biblionumber=biblioitems.biblionumber and - biblio.biblionumber=bibliosubtitle.biblionumber and - (((title like '$key[0]%' or title like '% $key[0]%')"; - while ($i < $count){ - $query=$query." and (title like '$key[$i]%' or title like '% $key[$i]%')"; - $i++; - } - $query.= ") or ((subtitle like '$key[0]%' or subtitle like '% $key[0]%')"; - for ($i=1;$i<$count;$i++){ - $query.= " and (subtitle like '$key[$i]%' or subtitle like '% $key[$i]%')"; - } - $query.= ") or ((seriestitle like '$key[0]%' or seriestitle like '% $key[0]%')"; - for ($i=1;$i<$count;$i++){ - $query.=" and (seriestitle like '$key[$i]%' or seriestitle like '% $key[$i]%')"; - } - $query.= ") or ((biblio.notes like '$key[0]%' or biblio.notes like '% $key[0]%')"; - for ($i=1;$i<$count;$i++){ - $query.=" and (biblio.notes like '$key[$i]%' or biblio.notes like '% $key[$i]%')"; - } - $query.= ") or ((biblioitems.notes like '$key[0]%' or biblioitems.notes like '% $key[0]%')"; - for ($i=1;$i<$count;$i++){ - $query.=" and (biblioitems.notes like '$key[$i]%' or biblioitems.notes like '% $key[$i]%')"; - } - if ($search->{'keyword'} =~ /new zealand/i){ - $query.= "or (title like 'nz%' or title like '% nz %' or title like '% nz' or subtitle like 'nz%' - or subtitle like '% nz %' or subtitle like '% nz' or author like 'nz %' - or author like '% nz %' or author like '% nz')" - } - if ($search->{'keyword'} eq 'nz' || $search->{'keyword'} eq 'NZ' || - $search->{'keyword'} =~ /nz /i || $search->{'keyword'} =~ / nz /i || - $search->{'keyword'} =~ / nz/i){ - $query.= "or (title like 'new zealand%' or title like '% new zealand %' - or title like '% new zealand' or subtitle like 'new zealand%' or - subtitle like '% new zealand %' - or subtitle like '% new zealand' or author like 'new zealand%' - or author like '% new zealand %' or author like '% new zealand' or - seriestitle like 'new zealand%' or seriestitle like '% new zealand %' - or seriestitle like '% new zealand')" - } - $query=$query."))"; - if ($search->{'class'} ne ''){ - my @temp=split(/\|/,$search->{'class'}); - my $count=@temp; - $query.= "and ( itemtype='$temp[0]'"; - for (my $i=1;$i<$count;$i++){ - $query.=" or itemtype='$temp[$i]'"; - } - $query.=")"; - } - if ($search->{'dewey'} ne ''){ - $query.= "and (dewey like '$search->{'dewey'}%') "; - } - $query.="group by biblio.biblionumber"; - #$query.=" order by author,title"; - # print $query; - my $sth=$dbh->prepare($query); - $sth->execute; - $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; - my $dewey=$data->{'dewey'}; - my $subclass=$data->{'subclass'}; - $dewey=~s/\.*0*$//; - ($dewey == 0) && ($dewey=''); - ($dewey) && ($dewey.=" $subclass"); - # $sti->finish; - $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey"; - # print $results[$i]; - $i++; - } - $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 "; - if ($search->{'class'} ne ''){ - my @temp=split(/\|/,$search->{'class'}); - my $count=@temp; - $query.= " and ( itemtype='$temp[0]'"; - for (my $i=1;$i<$count;$i++){ - $query.=" or itemtype='$temp[$i]'"; - } - $query.=")"; - - } - if ($search->{'dewey'} ne ''){ - $query.= "and (dewey like '$search->{'dewey'}%') "; - } - my $sth2=$dbh->prepare($query); - $sth2->execute; - # 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++; - } - $sth2->finish; - } - my $i2=1; - @results=sort @results; - my @res; - my $count=@results; - $i=1; - if ($count > 0){ - $res[0]=$results[0]; - } - while ($i2 < $count){ - if ($results[$i2] ne $res[$i-1]){ - $res[$i]=$results[$i2]; - $i++; - } - $i2++; - } - $i2=0; - my @res2; - $count=@res; - while ($i2 < $num && $i2 < $count){ - $res2[$i2]=$res[$i2+$offset]; - # print $res2[$i2]; - $i2++; - } - $sth->finish; - $dbh->disconnect; - # $i--; - # $i++; - return($i,@res2); - } - sub CatSearch { my ($env,$type,$search,$num,$offset)=@_; --- 297,300 ---- *************** *** 738,742 **** # print $type; if ($type ne 'intra'){ ! $query.=" and (items.itemlost<>1 or items.itemlost is NULL) and (wthdrawn <> 1 or wthdrawn is NULL)"; } --- 588,593 ---- # print $type; if ($type ne 'intra'){ ! $query.=" and ((items.itemlost<>1 and items.itemlost <> 2) ! or items.itemlost is NULL) and (wthdrawn <> 1 or wthdrawn is NULL)"; } *************** *** 758,762 **** $datedue = "$temp[2]/$temp[1]/$temp[0]"; } ! if ($data->{'itemlost'} eq '1'){ $datedue='Itemlost'; } --- 609,613 ---- $datedue = "$temp[2]/$temp[1]/$temp[0]"; } ! if ($data->{'itemlost'} eq '1' || $data->{'itemlost'} eq '2'){ $datedue='Itemlost'; } *************** *** 1188,1192 **** biblionumber=$bibnum "; if ($type ne 'intra'){ ! $query.=" and (itemlost <>1 or itemlost is NULL) and (wthdrawn <> 1 or wthdrawn is NULL)"; } --- 1039,1043 ---- biblionumber=$bibnum "; if ($type ne 'intra'){ ! $query.=" and ((itemlost <>1 and itemlost <> 2) or itemlost is NULL) and (wthdrawn <> 1 or wthdrawn is NULL)"; } *************** *** 1207,1212 **** my $query2="select * from issues,items where issues.itemnumber= '$data->{'itemnumber'}' and returndate is NULL ! and items.itemnumber=issues.itemnumber and (items.itemlost <>1 or ! items.itemlost is NULL)"; my $sth2=$dbh->prepare($query2); $sth2->execute; --- 1058,1065 ---- my $query2="select * from issues,items where issues.itemnumber= '$data->{'itemnumber'}' and returndate is NULL ! and items.itemnumber=issues.itemnumber and ((items.itemlost <>1 and ! items.itemlost <> 2) or items.itemlost is NULL) ! and (wthdrawn <> 1 or wthdrawn is NULL)"; ! my $sth2=$dbh->prepare($query2); $sth2->execute; *************** *** 1226,1229 **** --- 1079,1085 ---- $lostcount++; } + if ($data->{'itemlost'} eq '2'){ + $lostcount++; + } if ($data->{'holdingbranch'} eq 'FM'){ $mending++; *************** *** 1282,1289 **** sub barcodes{ my ($biblioitemnumber)=@_; my $dbh=C4Connect; my $query="Select barcode from items where ! biblioitemnumber='$biblioitemnumber'"; my $sth=$dbh->prepare($query); $sth->execute; --- 1138,1149 ---- sub barcodes{ + #called from request.pl my ($biblioitemnumber)=@_; my $dbh=C4Connect; my $query="Select barcode from items where ! biblioitemnumber='$biblioitemnumber' ! and ((itemlost <> 1 and itemlost <> 2) or itemlost is NULL) and ! (wthdrawn <> 1 or wthdrawn is NULL)"; ! # print $query; my $sth=$dbh->prepare($query); $sth->execute;

1 0

CVS: koha/updater updatedatabase,1.5,1.6
by Chris Cormack 06 May '02

06 May '02

Update of /cvsroot/koha/koha/updater In directory usw-pr-cvs1:/tmp/cvs-serv15559/updater Modified Files: updatedatabase Log Message: Fixing a typo Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** updatedatabase 2 May 2002 00:08:53 -0000 1.5 --- updatedatabase 6 May 2002 21:59:40 -0000 1.6 *************** *** 47,51 **** 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; } --- 47,51 ---- 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, numrecords int, servers text, identifier char(30))"); $sti->execute; }

1 0

CVS: koha/C4/Circulation Circ2.pm,1.23,1.24
by Finlay Thompson 05 May '02

05 May '02

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv26528/C4/Circulation Modified Files: Circ2.pm Log Message: Removed the "Item has been transfered" message from the returnbook2 subroutine. Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** Circ2.pm 6 May 2002 04:30:37 -0000 1.23 --- Circ2.pm 6 May 2002 04:36:42 -0000 1.24 *************** *** 586,590 **** my ($iteminformation) = getiteminformation($env, 0, $barcode); if (not $iteminformation) { ! push(@messages, "<font color='red' size='+2'> There is no book with barcode: $barcode </font>"); return (0, \@messages, 0 ,0); } --- 586,590 ---- my ($iteminformation) = getiteminformation($env, 0, $barcode); if (not $iteminformation) { ! push(@messages, "<font color='red' size='+2'> No item with barcode: $barcode </font>"); return (0, \@messages, 0 ,0); } *************** *** 610,616 **** my $tbr = $env->{'branchcode'}; my ($transfered, $message, $item) = transferbook($tbr, $barcode); - if ($transfered) { - push(@messages, "Book: as been transfered."); - } if ($iteminformation->{'itemlost'}) { --- 610,613 ----

1 0

CVS: koha/C4/Circulation Circ2.pm,1.22,1.23
by Finlay Thompson 05 May '02

05 May '02

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv25518/C4/Circulation Modified Files: Circ2.pm Log Message: Changed the error message from: There is no book with barcode: XXXXXX to: No item with barcode: XXXXXXX Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** Circ2.pm 2 May 2002 00:08:53 -0000 1.22 --- Circ2.pm 6 May 2002 04:30:37 -0000 1.23 *************** *** 230,234 **** my $iteminformation = getiteminformation(\%env,0, $barcode); if (not $iteminformation) { ! $message = "<font color='red' size='+2'>There is no book with barcode: $barcode </font>"; return (0, $message, 0); } --- 230,234 ---- my $iteminformation = getiteminformation(\%env,0, $barcode); if (not $iteminformation) { ! $message = "<font color='red' size='+2'>No item with barcode: $barcode </font>"; return (0, $message, 0); }

1 0

CVS: koha member.pl,1.1.1.1,1.2
by Finlay Thompson 05 May '02

05 May '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv22769 Modified Files: member.pl Log Message: Changed the word: Fines to: Charges Index: member.pl =================================================================== RCS file: /cvsroot/koha/koha/member.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** member.pl 19 Dec 2000 23:45:51 -0000 1.1.1.1 --- member.pl 6 May 2002 04:12:48 -0000 1.2 *************** *** 28,32 **** print mktablehdr; print mktablerow(8,'#99cc33',bold('Card'),bold('Surname'),bold('Firstname'),bold('Category') ! ,bold('Address'),bold('OD/Issues'),bold('Fines'),bold('Notes'),'/images/background-mem.gif'); my $env; my ($count,$results)=BornameSearch($env,$member,'web'); --- 28,32 ---- print mktablehdr; print mktablerow(8,'#99cc33',bold('Card'),bold('Surname'),bold('Firstname'),bold('Category') ! ,bold('Address'),bold('OD/Issues'),bold('Charges'),bold('Notes'),'/images/background-mem.gif'); my $env; my ($count,$results)=BornameSearch($env,$member,'web');

1 0

CVS: koha/acqui.simple addbiblioitem.pl,1.2,1.3 additem.pl,1.2,1.3 savebiblio.pl,1.2,1.3 savebiblioitem.pl,1.2,1.3 saveitem.pl,1.2,1.3
by Gynn Lomax 05 May '02

05 May '02

Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv7908 Modified Files: addbiblioitem.pl additem.pl savebiblio.pl savebiblioitem.pl saveitem.pl Log Message: Fixed bug due to way hashes take values. Was stopping items being saved to database. Added code to pick up branch list from database. Index: addbiblioitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblioitem.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** addbiblioitem.pl 3 May 2002 02:47:33 -0000 1.2 --- addbiblioitem.pl 6 May 2002 02:47:49 -0000 1.3 *************** *** 115,119 **** </tr> <tr valign="top"> ! <td colspan="4" align="center"><input type="submit" value="Add New Item"></td> </tr> --- 115,119 ---- </tr> <tr valign="top"> ! <td colspan="4" align="center"><input type="submit" value="Add New Group"></td> </tr> Index: additem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** additem.pl 3 May 2002 02:47:33 -0000 1.2 --- additem.pl 6 May 2002 02:47:49 -0000 1.3 *************** *** 12,15 **** --- 12,17 ---- my $count; my @results; + my $branchcount; + my @branches; if (! $biblioitemnum) { *************** *** 30,33 **** --- 32,36 ---- ($count, @results) = &getitemsbybiblioitem($biblioitemnum); + ($branchcount, @branches) = &branches; if ($count) { *************** *** 70,74 **** <td><input name="barcode" size="10" value="$maxbarcode" /></td> <td align="right">Home Branch:</td> ! <td><select name="homebranch"><option value="STWE">Stewart Elementary<option value="MEZ">Meziadin Elementary</select></td> </tr> <tr> --- 73,87 ---- <td><input name="barcode" size="10" value="$maxbarcode" /></td> <td align="right">Home Branch:</td> ! <td><select name="homebranch"> ! EOF ! ! for (my $i = 0; $i < $branchcount; $i ++) { ! print << "EOF"; ! <option value="$branches[$i]->{'branchcode'}">$branches[$i]->{'branchname'} ! EOF ! } # for ! ! print << "EOF"; ! </select></td> </tr> <tr> Index: savebiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** savebiblio.pl 3 May 2002 02:47:33 -0000 1.2 --- savebiblio.pl 6 May 2002 02:47:49 -0000 1.3 *************** *** 6,17 **** my $input = new CGI; ! my $biblio = { title => $input->param('title'), ! subtitle => $input->param('subtitle'), ! author => $input->param('author'), ! seriestitle => $input->param('seriestitle'), ! copyright => $input->param('copyrightdate'), ! abstract => $input->param('abstract'), ! notes => $input->param('notes') ! }; # my $biblio my $biblionumber; --- 6,18 ---- my $input = new CGI; ! my $biblio = { ! title => $input->param('title'), ! subtitle => $input->param('subtitle')?$input->param('subtitle'):"", ! author => $input->param('author')?$input->param('author'):"", ! seriestitle => $input->param('seriestitle')?$input->param('seriestitle'):"", ! copyright => $input->param('copyrightdate')?$input->param('copyrightdate'):"", ! abstract => $input->param('abstract')?$input->param('abstract'):"", ! notes => $input->param('notes')?$input->param('notes'):"" ! }; # my $biblio my $biblionumber; Index: savebiblioitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/savebiblioitem.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** savebiblioitem.pl 3 May 2002 02:47:33 -0000 1.2 --- savebiblioitem.pl 6 May 2002 02:47:49 -0000 1.3 *************** *** 9,31 **** my $biblioitem = { biblionumber => $biblionumber, ! publishercode => $input->param('publishercode'), ! publicationyear => $input->param('publicationyear'), ! place => $input->param('year'), ! illus => $input->param('illus'), ! isbn => $input->param('isbn'), ! additionalauthors => $input->param('additionalauthors'), ! subjectheadings => $input->param('subjectheadings'), ! itemtype => $input->param('itemtype'), ! url => $input->param('url'), ! dewey => $input->param('dewey'), ! subclass => $input->param('subclass'), ! issn => $input->param('issn'), ! lccn => $input->param('lccn'), ! volume => $input->param('volume'), ! number => $input->param('number'), ! volumeddesc => $input->param('volumeddesc'), ! pages => $input->param('pages'), ! size => $input->param('size'), ! notes => $input->param('notes') }; my $biblioitemnum; --- 9,31 ---- my $biblioitem = { biblionumber => $biblionumber, ! publishercode => $input->param('publishercode')?$input->param('publishercode'):"", ! publicationyear => $input->param('publicationyear')?$input->param('publicationyear'):"", ! place => $input->param('year')?$input->param('year'):"", ! illus => $input->param('illus')?$input->param('illus'):"", ! isbn => $input->param('isbn')?$input->param('isbn'):"", ! additionalauthors => $input->param('additionalauthors')?$input->param('additionalauthors'):"", ! subjectheadings => $input->param('subjectheadings')?$input->param('subjectheadings'):"", ! itemtype => $input->param('itemtype')?$input->param('itemtype'):"", ! url => $input->param('url')?$input->param('url'):"", ! dewey => $input->param('dewey')?$input->param('dewey'):"", ! subclass => $input->param('subclass')?$input->param('subclass'):"", ! issn => $input->param('issn')?$input->param('issn'):"", ! lccn => $input->param('lccn')?$input->param('lccn'):"", ! volume => $input->param('volume')?$input->param('volume'):"", ! number => $input->param('number')?$input->param('number'):"", ! volumeddesc => $input->param('volumeddesc')?$input->param('volumeddesc'):"", ! pages => $input->param('pages')?$input->param('pages'):"", ! size => $input->param('size')?$input->param('size'):"", ! notes => $input->param('notes')?$input->param('notes'):"" }; my $biblioitemnum; Index: saveitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** saveitem.pl 3 May 2002 02:47:33 -0000 1.2 --- saveitem.pl 6 May 2002 02:47:49 -0000 1.3 *************** *** 11,17 **** biblioitemnumber => $biblioitemnum, homebranch => $input->param('homebranch'), ! replacementprice => $input->param('replacementprice'), ! itemnotes => $input->param('notes') ! }; my $count; my @results; --- 11,17 ---- biblioitemnumber => $biblioitemnum, homebranch => $input->param('homebranch'), ! replacementprice => $input->param('replacementprice')?$input->param('replacementprice'):"", ! itemnotes => $input->param('notes')?$input->param('notes'):"" ! }; # my $item my $count; my @results;

1 0

CVS: koha INSTALL,NONE,1.1.2.1 Hints,NONE,1.1.2.1
by Chris Cormack 03 May '02

03 May '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv19047 Added Files: Tag: rel-1-2 INSTALL Hints Log Message: Installation documents --- NEW FILE --- Koha - Requirements and quick-start installation guide INSTALL document included with [Koha] For information on how to install Koha without requiring multiple virtual servers - See KohaAllInOne. For additional information on how your Configuration files should look see the Hints file. Important.... To successfully use Koha you need some additional software: A webserver (It was built to work with Apache, but there is no reason it shouldnt work with any other webserver). Mysql (You could intead use postgres, or another sql based database) Perl (mod_perl isnt needed, tho koha should work with mod_perl but this hasnt been tested yet). Perl Modules: Date::Manip DBI Set::Scalar DBD::mysql (or whatever database system you use) AuthenDBI (if you want to use Database based authentication) CDK (for the telnet interface not nessecary if you plan to use the web based circulation module) also requires installation of the C CDK libraries http://www.vexus.ca/CDK.html ( CDKModuleHasProblems ) -------------------------------------------------------------------------------- Quick-start Installation Guide (Assumes the Use of MySQL and Apache) 1. Create a new mysql database called for example Koha

1 0

CVS: koha INSTALL,1.1,1.2 Hints,1.1,1.2
by Chris Cormack 03 May '02

03 May '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv20806 Added Files: INSTALL Hints Log Message: No harm in adding these to the main branch either

1 0

CVS: koha database.mysql,1.4,1.5
by Paul POULAIN 03 May '02

03 May '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv32641 Modified Files: database.mysql Log Message: updated database.mysql : dropped unused tables, created indexes : old database.mysql updated by updatedatabase2.pl script Index: database.mysql =================================================================== RCS file: /cvsroot/koha/koha/database.mysql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** database.mysql 2 May 2002 00:23:26 -0000 1.4 --- database.mysql 2 May 2002 09:19:49 -0000 1.5 *************** *** 1,60 **** ! # MySQL dump 7.1 ! # ! # Host: localhost Database: c4test ! #-------------------------------------------------------- ! # Server version 3.22.32-log # ! # Table structure for table 'accountlines' # CREATE TABLE accountlines ( [...1500 lines suppressed...] + CREATE TABLE systempreferences ( ! variable char(50) NOT NULL default '', ! value char(200) default NULL, ! PRIMARY KEY (variable) ! ) TYPE=ISAM PACK_KEYS=1; ! # -------------------------------------------------------- # ! # Table structure for table `users` # + CREATE TABLE users ( ! usercode varchar(10) NOT NULL default '', username text, password text, ! level smallint(6) default NULL, ! PRIMARY KEY (usercode) ! ) TYPE=ISAM PACK_KEYS=1;

2 1

CVS: koha/acqui.simple addbiblioitem.pl,1.1,1.2 additem.pl,1.1,1.2 savebiblio.pl,1.1,1.2 savebiblioitem.pl,1.1,1.2 saveitem.pl,1.1,1.2
by Gynn Lomax 02 May '02

02 May '02

Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv25277/acqui.simple Modified Files: addbiblioitem.pl additem.pl savebiblio.pl savebiblioitem.pl saveitem.pl Log Message: Bug fixes to get the new acqui.simple system working. Index: addbiblioitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblioitem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** addbiblioitem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- addbiblioitem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 17,27 **** ($count, @results) = &getbiblio($biblionumber); ! $title = @results[0]->{'title'}; ! print $input->header; ! print startpage(); ! print startmenu('acquisitions'); ! print << "EOF"; <font size="6"><em>Adding New Group Information - $title</em></font> <table bgcolor="#ffcc00" width="80%" cellpadding="5"> --- 17,31 ---- ($count, @results) = &getbiblio($biblionumber); ! ! if (! $count) { ! print $input->redirect('addbooks.pl'); ! } else { ! $title = @results[0]->{'title'}; ! print $input->header; ! print startpage(); ! print startmenu('acquisitions'); ! print << "EOF"; <font size="6"><em>Adding New Group Information - $title</em></font> <table bgcolor="#ffcc00" width="80%" cellpadding="5"> *************** *** 64,75 **** EOF ! ($count, @results) = &getitemtypes; ! for (my $i = 0; $i < $count; $i++) { ! print << "EOF"; <option value="$results[$i]->{'itemtype'}">$results[$i]->{'itemtype'} - $results[$i]->{'description'} EOF ! } # for ! print << "EOF"; </select></td> </tr> --- 68,79 ---- EOF ! ($count, @results) = &getitemtypes; ! for (my $i = 0; $i < $count; $i++) { ! print << "EOF"; <option value="$results[$i]->{'itemtype'}">$results[$i]->{'itemtype'} - $results[$i]->{'description'} EOF ! } # for ! print << "EOF"; </select></td> </tr> *************** *** 117,121 **** EOF ! print endmenu(); ! print endpage(); } # else --- 121,126 ---- EOF ! print endmenu(); ! print endpage(); ! } # else } # else Index: additem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** additem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- additem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 16,20 **** print $input->redirect('addbooks.pl'); } else { ! ($count, @results) = &getbiblioitem($biblioitemnum); --- 16,20 ---- print $input->redirect('addbooks.pl'); } else { ! ($count, @results) = &getbiblioitem($biblioitemnum); *************** *** 63,67 **** <center> <h2>Section Three: Specific Item Information</h2> ! <form action="saveitems" method="post"> <input type="hidden" name="biblioitemnum" value="$biblioitemnum"> <table> --- 63,67 ---- <center> <h2>Section Three: Specific Item Information</h2> ! <form action="saveitem.pl" method="post"> <input type="hidden" name="biblioitemnum" value="$biblioitemnum"> <table> Index: savebiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** savebiblio.pl 29 Apr 2002 05:29:02 -0000 1.1 --- savebiblio.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 6,16 **** my $input = new CGI; ! my $biblio->{'title'} = $input->param('title'); ! my $biblio->{'subtitle'} = $input->param('subtitle'); ! my $biblio->{'author'} = $input->param('author'); ! my $biblio->{'seriestitle'} = $input->param('seriestitle'); ! my $biblio->{'copyright'} = $input->param('copyrightdate'); ! my $biblio->{'abstract'} = $input->param('abstract'); ! my $biblio->{'notes'} = $input->param('notes'); my $biblionumber; --- 6,17 ---- my $input = new CGI; ! my $biblio = { title => $input->param('title'), ! subtitle => $input->param('subtitle'), ! author => $input->param('author'), ! seriestitle => $input->param('seriestitle'), ! copyright => $input->param('copyrightdate'), ! abstract => $input->param('abstract'), ! notes => $input->param('notes') ! }; # my $biblio my $biblionumber; *************** *** 20,25 **** $biblionumber = &newbiblio($biblio); ! &newsubtitle($biblionumber, $subtitle); ! print $input->redirect('addbiblioitem.pl?biblionumber=$biblionumber'); } # else --- 21,26 ---- $biblionumber = &newbiblio($biblio); ! &newsubtitle($biblionumber, $biblio->{'subtitle'}); ! print $input->redirect("addbiblioitem.pl?biblionumber=$biblionumber"); } # else Index: savebiblioitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/savebiblioitem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** savebiblioitem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- savebiblioitem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 37,40 **** $biblioitemnum = &newbiblioitem($biblioitem); ! print $input->redirect('additem.pl?biblioitemnum=$biblioitemnum'); } # else --- 37,40 ---- $biblioitemnum = &newbiblioitem($biblioitem); ! print $input->redirect("additem.pl?biblioitemnum=$biblioitemnum"); } # else Index: saveitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** saveitem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- saveitem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 9,13 **** my $biblioitemnum = $input->param('biblioitemnum'); my $item = { ! biblioitemnum => $biblioitemnum, homebranch => $input->param('homebranch'), replacementprice => $input->param('replacementprice'), --- 9,13 ---- my $biblioitemnum = $input->param('biblioitemnum'); my $item = { ! biblioitemnumber => $biblioitemnum, homebranch => $input->param('homebranch'), replacementprice => $input->param('replacementprice'), *************** *** 31,35 **** &newitems($item, ($barcode)); ! print $input->redirect('additem.pl?biblioitemnum=$biblioitemnum'); } # else } # else --- 31,35 ---- &newitems($item, ($barcode)); ! print $input->redirect("additem.pl?biblioitemnum=$biblioitemnum"); } # else } # else

1 0