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

CVS: koha updatebibitem.pl,1.3,1.4
by Gynn Lomax 15 Apr '02

15 Apr '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv23750 Modified Files: updatebibitem.pl Log Message: Acquisitions::newbiblioitem updated to be usable for new acqui.simple addorder.pl and updatebibitem.pl modified to use new newbiblioitem Index: updatebibitem.pl =================================================================== RCS file: /cvsroot/koha/koha/updatebibitem.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** updatebibitem.pl 12 Feb 2002 21:07:53 -0000 1.3 --- updatebibitem.pl 15 Apr 2002 05:33:33 -0000 1.4 *************** *** 84,88 **** my $loan; if ($flag eq 'notall' && $flag2 eq 'leastone'){ ! $bibitemnum=newbiblioitem($bibnum,$itemtype,$volumeddesc,$classification); modbibitem($bibitemnum,$itemtype,$isbn,$publishercode,$publicationdate,$classification,$dewey,$subclass,$illus,$pages,$volumeddesc,$notes,$size,$place); if ($itemtype =~ /REF/){ --- 84,91 ---- my $loan; if ($flag eq 'notall' && $flag2 eq 'leastone'){ ! $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, ! itemtype => $itemtype, ! volumeddesc => $volumeddesc, ! classification => $classification }); modbibitem($bibitemnum,$itemtype,$isbn,$publishercode,$publicationdate,$classification,$dewey,$subclass,$illus,$pages,$volumeddesc,$notes,$size,$place); if ($itemtype =~ /REF/){

1 0

CVS: koha/C4 Acquisitions.pm,1.3,1.4
by Gynn Lomax 15 Apr '02

15 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv23750/C4 Modified Files: Acquisitions.pm Log Message: Acquisitions::newbiblioitem updated to be usable for new acqui.simple addorder.pl and updatebibitem.pl modified to use new newbiblioitem Index: Acquisitions.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Acquisitions.pm 10 Apr 2002 05:49:17 -0000 1.3 --- Acquisitions.pm 15 Apr 2002 05:33:33 -0000 1.4 *************** *** 18,22 **** &findall &needsmod &delitem &delbibitem &delbiblio &delorder &branches &getallorders &getrecorders &updatecurrencies &getorder &getcurrency &updaterecorder ! &updatecost &checkitems &modnote); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], --- 18,22 ---- &findall &needsmod &delitem &delbibitem &delbiblio &delorder &branches &getallorders &getrecorders &updatecurrencies &getorder &getcurrency &updaterecorder ! &updatecost &checkitems &modnote &getitemtypes &getbiblio); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], *************** *** 546,565 **** sub newbiblioitem { ! my ($bibnum,$itemtype,$isbn,$volinf,$class)=@_; ! my $dbh=C4Connect; ! my $query="Select max(biblioitemnumber) from biblioitems"; ! my $sth=$dbh->prepare($query); $sth->execute; ! my $data=$sth->fetchrow_arrayref; ! my $bibitemnum=$$data[0]; ! $bibitemnum++; $sth->finish; ! $query="insert into biblioitems (biblionumber,biblioitemnumber, ! itemtype,isbn,volumeddesc,classification) ! values ! ($bibnum,$bibitemnum,'$itemtype','$isbn','$volinf','$class')"; ! $sth=$dbh->prepare($query); ! # print $query; $sth->execute; $sth->finish; $dbh->disconnect; --- 546,603 ---- sub newbiblioitem { ! my ($biblioitem) = @_; ! my $dbh = C4Connect; ! my $query = "Select max(biblioitemnumber) from biblioitems"; ! my $sth = $dbh->prepare($query); ! my $data; ! my $bibitemnum; ! ! $biblioitem->{'volume'} = $dbh->quote($biblioitem->{'volume'}); ! $biblioitem->{'number'} = $dbh->quote($biblioitem->{'number'}); ! $biblioitem->{'classification'} = $dbh->quote($biblioitem->{'classification'}); ! $biblioitem->{'itemtype'} = $dbh->quote($biblioitem->{'itemtype'}); ! $biblioitem->{'isbn'} = $dbh->quote($biblioitem->{'isbn'}); ! $biblioitem->{'issn'} = $dbh->quote($biblioitem->{'issn'}); ! $biblioitem->{'dewey'} = $dbh->quote($biblioitem->{'dewey'}); ! $biblioitem->{'subclass'} = $dbh->quote($biblioitem->{'subclass'}); ! $biblioitem->{'publicationyear'} = $dbh->quote($biblioitem->{'publicationyear'}); ! $biblioitem->{'publishercode'} = $dbh->quote($biblioitem->{'publishercode'}); ! $biblioitem->{'volumedate'} = $dbh->quote($biblioitem->{'volumedate'}); ! $biblioitem->{'volumeddesc'} = $dbh->quote($biblioitem->{'volumeddesc'}); $biblioitem->{'illus'} = $dbh->quote($biblioitem->{'illus'}); ! $biblioitem->{'pages'} = $dbh->quote($biblioitem->{'pages'}); ! $biblioitem->{'notes'} = $dbh->quote($biblioitem->{'notes'}); ! $biblioitem->{'size'} = $dbh->quote($biblioitem->{'size'}); ! $biblioitem->{'place'} = $dbh->quote($biblioitem->{'place'}); ! $sth->execute; ! $data = $sth->fetchrow_arrayref; ! $bibitemnum = $$data[0] + 1; ! $sth->finish; ! ! $query = "insert into biblioitems set ! biblioitemnumber = $bibitemnum, ! biblionumber = $biblioitem->{'biblionumber'}, ! volume = $biblioitem->{'volume'}, ! number = $biblioitem->{'number'}, ! classification = $biblioitem->{'classification'}, ! itemtype = $biblioitem->{'itemtype'}, ! isbn = $biblioitem->{'isbn'}, ! issn = $biblioitem->{'issn'}, ! dewey = $biblioitem->{'dewey'}, ! subclass = $biblioitem->{'subclass'}, ! publicationyear = $biblioitem->{'publicationyear'}, ! publishercode = $biblioitem->{'publishercode'}, ! volumedate = $biblioitem->{'volumedate'}, ! volumeddesc = $biblioitem->{'volumeddesc'}, ! illus = $biblioitem->{'illus'}, ! pages = $biblioitem->{'pages'}, ! notes = $biblioitem->{'notes'}, ! size = $biblioitem->{'size'}, ! place = $biblioitem->{'place'}"; ! ! $sth = $dbh->prepare($query); $sth->execute; + $sth->finish; $dbh->disconnect; *************** *** 580,590 **** sub newsubtitle { ! my ($bibnum)=@_; ! my $dbh=C4Connect; ! my $query="insert into bibliosubtitle (biblionumber) values ! ($bibnum)"; ! my $sth=$dbh->prepare($query); ! # print $query; $sth->execute; $sth->finish; $dbh->disconnect; --- 618,631 ---- sub newsubtitle { ! my ($bibnum, $subtitle) = @_; ! my $dbh = C4Connect; ! $subtitle = $dbh->quote($subtitle); ! my $query = "insert into bibliosubtitle set ! biblionumber = $bibnum, ! subtitle = $subtitle"; ! my $sth = $dbh->prepare($query); ! $sth->execute; + $sth->finish; $dbh->disconnect; *************** *** 1026,1034 **** $sth->finish; } $sth->finish; $dbh->disconnect; } ! END { } # module clean-up code here (global destructor) --- 1067,1117 ---- $sth->finish; } + $sth->finish; $dbh->disconnect; } ! sub getitemtypes { ! my $dbh = C4Connect; ! my $query = "select * from itemtypes"; ! my $sth = $dbh->prepare($query); ! # || die "Cannot prepare $query" . $dbh->errstr; ! my $count = 0; ! my @results; + $sth->execute; + # || die "Cannot execute $query\n" . $sth->errstr; + while (my $data = $sth->fetchrow_hashref) { + @results[$count] = $data; + $count++; + } # while + + $sth->finish; + $dbh->disconnect; + return($count, @results); + } # sub getitemtypes + + + sub getbiblio { + my ($biblionumber) = @_; + my $dbh = C4Connect; + my $query = "Select * from biblio where biblionumber = $biblionumber"; + my $sth = $dbh->prepare($query); + # || die "Cannot prepare $query" . $dbh->errstr; + my $count = 0; + my @results; + + $sth->execute; + # || die "Cannot execute $query" . $sth->errstr; + while (my $data = $sth->fetchrow_hashref) { + $results[$count] = $data; + $count++; + } # while + $sth->finish; + $dbh->disconnect; + return($count, @results); + } # sub getbiblio + + + END { } # module clean-up code here (global destructor)

1 0

Member Authentication via Internet
by Roger Buck 13 Apr '02

13 Apr '02

I understand that Koha web services are on the agenda but have need for something more immediate. Despite this being a quick and dirty, would obviously be preferable if our work here could help support the main stream development. Current Situation: A school (Department of Education and Training, New South Wales) library specialising in education resources for kids with learning difficulties. The library is only staffed 3 days per week and most borrowing is currently done via fax, postal mail and telephone. Most borrowers are teachers and/or librarians (around 4,000 items and 1,500 borrowers). Our most immediate need is for borrowers to reserve items via Internet for issue (mostly) via postal service. To that end, we need two discrete levels of user access to OPAC services: 1. Public - browse only 2. Members - Registered members authenticated via login using personal username + password (NOT barcode). Members need to browse OPAC and make on-line requests. Currently, getting the service up and running is main priority. Security of user data is non critical as the server will initially only require population of resources database + user authentication data. The full libaray database will not (yet) be exported to koha. What I have done: Isolated a sub-set of the koha *.pl files to provide a working "development" environment for above. on-line opac files are: subjectsearch.pl detail.pl modrequest.pl renewscript.pl reservereport.pl login.pl moredetail.pl request.pl search.pl moremember.pl soupermail Most of the above have been minimally hacked - mostly to simplify the user interface and remove admin features. I have merged request.pl and placerequest.pl I have created a login script to handle authentication login.pl I have added javascript to opac-top.in to handle extended use of cookies for authentication and tracking. I am using "soupermail" ( soupermail.sourceforge.net ) for handling of email requests. All of the above has been done to enable testing and proof of concept. I now need to modify tables for authentication. I was thinking of adding "loginname" and "password" to "borrowers" (the existing "users" table doesn't seem to be appropriate to do that?). Have the devel team given any consideration to how Internet authentication to opac may be handled? Any general suggestions or guidelines so that I don't stray too far away from the intended approach (I assuming my own hacks will only be required short term - until these features are part of the main koha distro.) Also, I'd obviously like to make whatever I do useful to the project. I am only a perl beginner so not proposing any of the above would be useful for the "official" development effort... but still very keen to help in whatever way you might think would be most productive. _Any_ feedback very gratefully appreciated. Thanks. R.

1 0

CVS: koha/C4 Search.pm,1.17,1.18
by Chris Cormack 11 Apr '02

11 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv29372/C4 Modified Files: Search.pm Log Message: Fixing the subject search i broke ;) Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** Search.pm 10 Apr 2002 07:59:28 -0000 1.17 --- Search.pm 10 Apr 2002 09:55:17 -0000 1.18 *************** *** 671,675 **** my $subclass; my $true=0; ! if (($dewey, $subclass) = $sti->fetchrow){ $true=1; } --- 671,675 ---- my $subclass; my $true=0; ! if (($dewey, $subclass) = $sti->fetchrow || $type eq 'subject'){ $true=1; } *************** *** 793,797 **** $i++; } ! $sth->finish; $dbh->disconnect; return(@results); --- 793,810 ---- $i++; } ! $sth->finish; ! my $query2="Select * from aqorders where biblionumber=$biblionumber"; ! my $sth2=$dbh->prepare($query2); ! $sth2->execute; ! my $data; ! my $ocount; ! if ($data=$sth2->fetchrow_hashref){ ! $ocount=$data->{'quantity'} - $data->{'quantityreceived'}; ! if ($ocount > 0){ ! $results[$i]="$data->{'title'}\t$data->{'barcode'}\t$ocount\tOn Order\t\t$data->{'itemnumber'}\t$data->{'itemtype'}\t\t$data->{'biblioitemnumber'}\t$data->{'volumeddesc'}"; ! } ! } ! $sth2->finish; ! $dbh->disconnect; return(@results); *************** *** 855,861 **** my ($bibnum,$type)=@_; my $dbh=C4Connect; ! my $query="Select *,biblio.notes from biblio,biblioitems,bibliosubtitle where biblio.biblionumber=$bibnum ! and biblioitems.biblionumber=$bibnum and ! (bibliosubtitle.biblionumber=$bibnum)"; # print $query; my $sth=$dbh->prepare($query); --- 868,878 ---- my ($bibnum,$type)=@_; my $dbh=C4Connect; ! my $query="Select *,biblio.notes ! from biblio,biblioitems ! left join bibliosubtitle on ! biblio.biblionumber=bibliosubtitle.biblionumber ! ! where biblio.biblionumber=$bibnum ! and biblioitems.biblionumber=$bibnum"; # print $query; my $sth=$dbh->prepare($query);

4 3

CVS: koha-html/intranet-html/images front-admin.gif,NONE,1.1 front-mouseover-admin.gif,NONE,1.1 front-circulation.gif,1.1.1.1,1.2 koha-front-background.gif,1.1.1.1,1.2
by Paul POULAIN 10 Apr '02

10 Apr '02

Update of /cvsroot/koha/koha-html/intranet-html/images In directory usw-pr-cvs1:/tmp/cvs-serv11610/images Modified Files: front-circulation.gif koha-front-background.gif Added Files: front-admin.gif front-mouseover-admin.gif Log Message: added /admin/ links on index.html page --- NEW FILE --- GIF89ao% + Š.€.ox"37¡-fk|%<?--oq ,,*(,{|$\]RS ÍÎ WY[^a×ØÙ×2D?5œàáâãäåæçèéêëìŸ4íðñòóôõö÷7994üü3ÿ0bÄ" 0 S¡³gÍ¢¢ö%ÄgØP â£G`Â°b!,þ[*^{J·Ùµ(&2»É·¯_.ÿ Lž°á;}"Ê°šÑ£nÁ[·²](DjèÛÌ¹³çÏ CMºŽéÑ3h^Íºµë×°cËÝ¯ö¯À`$HÌBCBte6ËÈ¯Yòµ¹sO§KN=ë¬ëaÅ-Xa1$kÔÊÈSñÐ!šû÷ðãËO¿ŸýûøëK¿¿ÿÿ XábTh¹eSXâ¢6êè£¡ÈwhP2 45aZa6hàÓš€b Í5¥Šªêª¬¶êê«°ÇA¬ŽÖjëžæªë®¹ràëbAí§à:£ÅZvÍ>4ëì³ÎÒNkíµØfkmµÚvë³7ôðížäkî¹èŠ«îºÓîâ./Ÿ PØ÷S ~*æ_žæØü®øä/ùðÇ':ç©7ïüóÐG/ýó¬äºZ?Éî 3|ßNšþY Úa}6Ùp¯mŸ6iï6ØgÏ-ÿüJúñ Ç Líý÷/O}\&í1ûÌ@2Ð lÙÒ&HÁ Zð ÆÂþk{a fÂáË¡wÈÃúP;ËEYxñåM<ºW@ x[ÛzÖ5Å*V«R©E.zñÔ2WžØEÆ2ñhLã³ÞÅ}xG2hw¬%2ñxUZ Sõd£ê# ùÇ@U>ÁF"YÈC2V¯&IÉJZòTÌ¯Þþ kBv!š@¿RòšänQ³|ÇRõbFõ¿k\ *X4§IÍ Á ØÌŠ6·ÉM5) i8GÚACPŽìÛ5ŠÀTCî'*EtûyEÉÔpŽ F œæ©PKßÕªZõªI2£Ìšg0ATª¬0DA TÑšZ×ÊÖ«¬% )}uHÀ^ Q«mc%è à.à l \ÀÈ --- NEW FILE --- GIF89ao% «ÕX®×] ÆV|Ccz6¥LžÜq¹Ütš]¿ß³Ñx§ÃpJU5¹Ó]ÉäÄÞœÖÆ1Ì3»/Í8Î<Ï@©5EX¡ÐC¡ÐD¢ÑE£ÑG€ÒI£ÑHÅDv4¥ÒJ¥ÒLŠÓMžC§ÓOYp*šÔQ§ÓPšÓQ©ÔSªÕU°×a)2³Ùg¶Úm·Ûo©ÉfžÛq¹Üs»ÝvºÜu®ÎnœÞ{ÁàÃá5=%ÅâÆâÇãÈãÉä±Ç§lkyNÉãÊä€¹y² 9GpYw% 64.(&!B|è@°`Bº<Š¡Ã Xx $3jÂ1H?~@ðÁÇéuürdÉ(WIÒdL,iŸŒéqŠK73vìÙ²&L8}*³èÎCsþ<UéSšMuò ªiR§@rêuìR¬_µRÍJ§T£þ÷tàË§ÏF -R "4dáËÃ-#~hÀJ0"KL².2»\¹òeÍ;Kþ¬sgÒM{Æ\ZŽkÔ¡EÃVœ4íÉ³_³NíóîËa÷Î-û÷mÜÆuÛVÞyêÍ,X Hqâúýû¡{àœ0tž¥ #J dF>€8N¥@.9ãY¹¢ZÖHŠ*IåR¢fÁ¥&u×ñÕ×vÝQXá Æçuøá 0b{a`A!5êè£B0IVÚÒ€<Xêš€>Pª©H~ j§Z)§jj©®*ª«úê€Ò:+©·Šªª¬»â«¯¿ÖdR\rÑµ0° |ù¥'!OdH Vû¡8dÁaCß¡J'ó5€Iã.··d'æÒnºàÂ.'äv[_CéÖçî»œØ7/Ÿê^Â.5÷Â{p%æ°¿ ðžöþñoŒ8ÌÆ£ÛPŸói\pÈLrº¿$(âSW²'4kÐ ^øY@ ï£Ï@TÁ È¢²Å0tñ\£³ø-±\£ÃÈF/¶Ño$ãÓ8G7quü¢ïF>Êñqü#éH;Ò€#ßH=R}Äc!É3ZòÌ€mþ°x²@\ ,ë4;EŽ@C¶p9Tåß§3Ï®!GØÀô§»Ü-yÍ£ó|iºèe{Ä$]0y<`&³zÇì%2×LÞaïy»#Ç¹Íã-sŒÜ^2°RÈ#<ÀÇ>€~Öµ`ËX^YØÐ« :Ñq@ÊHÇ h ºP2šCJÑ&Ô¡mèE+Jt µhP ¡#hH%zQŽ£+E)@I Ò*ôŠ5ý(N/ ÓÊ4:=õhDBÒ¶T:%ÅšRºÔŠô©O¥uêþí B^Hß ^ÙÄzÖóãÜÎà'Là¬pZÕÖ0µ!m]«[ã*×·º®h¥+^áº×¹Úõ¯åë\×žªµ¯zœë`ýØÆÖµ±U,dWÁJÖ°µle ÛVÆNö¯ElaGKÚÒŽCÇ<èžl4ÈvÕU¡ Q8€žÇ5nrÜ0(·žÊ]®s¡Ë\æ&Áºîu§kÝèr÷»Ï¥®s±Üí7ŒÍ=ïvµKÞãVŒæn|µ»ÞöÊ7»Ïín}ï«ßõú¿ê}Là ®à±2þt²íË@ÐyÎ³«ŒõªoK-*6$&±GLâøÄ(N±WÌâ»øÅ0±gãÐøÆ8^q Büµª>.OO+/á"_öYÃ0q:ùÉP²§Œ`RùÊõ99>uÞ³íÀ2dWÒ³È>2>lEžùÍp³çLç:ÛùÎxÎ³÷Ìç>ûùÏŽ Mh9÷ðÐZŽ ð¢;=NÌd&û0lO4ÛsÍXr ÍéN{úÓ µšGMê:/ RªT€íúFÅR°{Tš?õz×ÃîSì:mªÜçN÷ºÛýîxÏ»Þ÷Îw»Cþ5*U×JÀ³!ð6üq)VËÃýténW®k>c¿Š6ÃùÌØU^xæ2[7ìÒþôô)ç±¹|ŠGhB±-+ÌxÍu.~·Cf öþö·t@&8t žØø5€CrQ,næCBJ®ŠÞ¶~£9íç~;ÃOapÜbL¡g;¢×ÖÃyÓôM/þMÐ<×;Ïyš·<He 7èôZäfàás3 "q;àfÇ{A09ð !è¡ëñ3pœq_Ya9ceég e kylormévYkY@%U×ácWñ+`Çþ7-U©aPG !(99IQ©>` =áB¡«I§ £¥¡É©ù¶µùŽ¹¬® Á9ôP¢9ŒIížtu!ÊÒ~ñù°@±a N°?Ã Hã å2ç êyì1ëíÙòÉöYŸpàúÉ êÐòBðéüÙûùè© ïY öYñ01q¯Å¯u3SÖ)109 Index: front-circulation.gif =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/images/front-circulation.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsz3I7xa and /tmp/cvscSPNWa differ Index: koha-front-background.gif =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/images/koha-front-background.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvs7DGhec and /tmp/cvsOh4fae differ

1 0

CVS: koha/C4 Search.pm,1.16,1.17
by Chris Cormack 10 Apr '02

10 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv30778/C4 Modified Files: Search.pm Log Message: Working on a fix to speed up title and author searches Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** Search.pm 13 Mar 2002 07:36:49 -0000 1.16 --- Search.pm 10 Apr 2002 07:59:28 -0000 1.17 *************** *** 463,471 **** my $i=1; $query="select *,biblio.author,biblio.biblionumber from ! biblioitems,biblio left join additionalauthors on additionalauthors.biblionumber =biblio.biblionumber ! where biblioitems.biblionumber=biblio.biblionumber ! and ((biblio.author like '$key[0]%' or biblio.author like '% $key[0]%' or additionalauthors.author like '$key[0]%' or additionalauthors.author --- 463,470 ---- my $i=1; $query="select *,biblio.author,biblio.biblionumber from ! biblio left join additionalauthors on additionalauthors.biblionumber =biblio.biblionumber ! where ((biblio.author like '$key[0]%' or biblio.author like '% $key[0]%' or additionalauthors.author like '$key[0]%' or additionalauthors.author *************** *** 505,524 **** #or seriestitle like '%$search->{'title'}%')"; } ! 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='$search->{'dewey'}' "; ! } ! if ($search->{'illustrator'} ne ''){ ! $query.=" and illus like '%".$search->{'illustrator'}."%' "; ! } ! $query.=" group by biblio.biblionumber"; } else { --- 504,508 ---- #or seriestitle like '%$search->{'title'}%')"; } ! $query.=" group by biblio.biblionumber"; } else { *************** *** 540,548 **** my $count=@key; my $i=1; ! $query="select * from biblio,biblioitems left join bibliosubtitle on biblio.biblionumber=bibliosubtitle.biblionumber where - biblioitems.biblionumber=biblio.biblionumber and (((title like '$key[0]%' or title like '% $key[0]%' or title like '% $key[0]')"; while ($i<$count){ --- 524,531 ---- my $count=@key; my $i=1; ! $query="select * from biblio left join bibliosubtitle on biblio.biblionumber=bibliosubtitle.biblionumber where (((title like '$key[0]%' or title like '% $key[0]%' or title like '% $key[0]')"; while ($i<$count){ *************** *** 563,581 **** } $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='$search->{'dewey'}' "; - } - if ($search->{'illustrator'} ne ''){ - $query.=" and illus like '%".$search->{'illustrator'}."%' "; - } } } elsif ($search->{'class'} ne ''){ --- 546,549 ---- *************** *** 681,691 **** my $limit= $num+$offset; 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; $dewey=~s/\.*0*$//; ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass"); $sti->finish; if ($count > $offset && $count <= $limit){ if ($type ne 'subject' && $type ne 'precise'){ --- 649,682 ---- my $limit= $num+$offset; while (my $data=$sth->fetchrow_hashref){ ! my $query="select dewey,subclass from biblioitems where biblionumber=$data->{'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='$search->{'dewey'}' "; ! } ! if ($search->{'illustrator'} ne ''){ ! $query.=" and illus like '%".$search->{'illustrator'}."%' "; ! } ! #print $query; ! my $sti=$dbh->prepare($query); $sti->execute; ! my $dewey; ! my $subclass; ! my $true=0; ! if (($dewey, $subclass) = $sti->fetchrow){ ! $true=1; ! } $dewey=~s/\.*0*$//; ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass"); $sti->finish; + if ($true == 1){ if ($count > $offset && $count <= $limit){ if ($type ne 'subject' && $type ne 'precise'){ *************** *** 699,702 **** --- 690,694 ---- } $count++; + } } $sth->finish;

1 0

CVS: koha-html/intranet-html index.html,1.3,1.4
by Paul POULAIN 10 Apr '02

10 Apr '02

Update of /cvsroot/koha/koha-html/intranet-html In directory usw-pr-cvs1:/tmp/cvs-serv11352 Modified Files: index.html Log Message: Added link to /admin/ scripts Index: index.html =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** index.html 8 Mar 2001 21:34:45 -0000 1.3 --- index.html 10 Apr 2002 10:55:11 -0000 1.4 *************** *** 33,43 **** </HEAD> ! <BODY ! BGCOLOR="#99cc33" ! text="black" ! ! ! alink="#663366" ! leftmargin=0 topmargin=0 marginheight=0 --- 33,43 ---- </HEAD> ! <BODY ! BGCOLOR="#99cc33" ! text="black" ! ! ! alink="#663366" ! leftmargin=0 topmargin=0 marginheight=0 *************** *** 46,181 **** <center> <table cellspacing=0 cellpadding=0 border=0 > - - <tr valign=top > - <td background="images/koha-front-background.gif"><img src="images/holder.gif" - width=1 height=420 align=left alt=" " hspace=0 vspace=0 ><table cellspacing=0 cellpadding=0 border=0 > -  - <tr valign=top > ! <td background=" "><img src="images/holder.gif" width=186 height=42 ! alt=" " hspace=0 vspace=0 ></td> ! <td background=" "><img src="images/holder.gif" width=30 height=42 ! alt=" " hspace=0 vspace=0 ></td> ! <td background=" "><img src="images/holder.gif" width=25 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=15 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=47 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=120 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=120 height=42 ! alt=" " hspace=0 vspace=0></td> ! </tr> ! !  ! <tr valign=top > ! <td background=" " colspan=3><img src="images/holder.gif" ! width=1 height=1 hspace=0 vspace=0></td> ! ! <td background=" " colspan=4><a href="/catalogue/" onMouseOver="if(document.images)document.search.src='images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='images/front-search.gif'"><img src="images/front-search.gif" width=320 height=37 name="search" ! hspace=0 vspace=0 border=0></a></td> ! </tr> ! <FORM ACTION="/cgi-bin/koha/search.pl" method=post> ! <tr valign=top > ! <td background=" " rowspan=3 align="right" colspan=4><img src="images/holder.gif" ! width=1 height=35 ! alt=" " hspace=0 vspace=0><br> ! <img src="images/koha-front-koha.gif" width=200 height=128 ! alt="Koha: Horowhenua Library Trust" hspace=0 vspace=0></td> ! <td></td> ! <td background=" " colspan=3> ! <input type=text size="27" name="keyword"><input type=reset value="clr"><br> ! ! <font size=1 face="arial,helvetica" ><b>Type in the box and press the enter key.</b><br> ! <a href="/catalogue/"> ! <font size=2 face="arial narrow,arial,helvetica"> ! <img src="images/front-arrow-purple.gif" width=27 height=22 ! alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br> ! ! <img src="images/holder.gif" width=1 height=8 ! alt=" " hspace=0 vspace=0></td> ! ! </tr> ! ! </form> ! !  ! ! <tr valign=top ><form action="/cgi-bin/koha/member.pl" method=post > ! <td background=" " colspan=3><a href="/members/" onMouseOver="if(document.images)document.member.src='images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='images/front-member.gif'"><img src="images/front-member.gif" width=304 height=37 name="member" ! hspace=0 vspace=0 border=0></td> ! ! </tr> ! ! ! <tr valign=top > ! <td></td> ! <form action="/cgi-bin/koha/member.pl" method=post > ! ! <td background=" " colspan=2 ><input type=text size="27" name="member"><input type=reset value="clr"><br> ! <font size=1 face="arial,helvetica" ><b>Type in the box and press the enter key.</b><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0></td> ! </tr>  ! ! ! ! <tr valign=top > ! <td></td> ! <td></td> ! <td></td> ! <td background=" " colspan=4><A href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" onMouseOver="if(document.images)document.acquisitions.src='images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='images/front-acquisitions.gif'"><img src="images/front-acquisitions.gif" width=320 height=36 name="acquisitions" ! hspace=0 vspace=0 border=0></a><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0 ></td> ! ! ! </tr> ! ! !  ! ! ! <tr valign=top > ! ! <td></td> ! <td></td> ! <td background=" " colspan=5> <A href="/reports/" onMouseOver="if(document.images)document.reports.src='images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='images/front-reports.gif'"><img src="images/front-reports.gif" width=346 height=37 name="reports" ! hspace=0 vspace=0 border=0></a><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0 ></td> ! ! ! </tr> ! !  ! ! ! <tr valign=top > ! ! <td></td><td background=" " colspan=5> <A href="/cgi-bin/koha/circ/circulation.pl" onMouseOver="if(document.images)document.circulation.src='images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='images/front-circulation.gif'"><img src="images/front-circulation.gif" width=346 height=37 name="circulation" ! hspace=0 vspace=0 border=0></a> ! <br> ! <font size=2 face="arial,helvetica" > ! See Also: <A HREF="http://opac.library.org.nz">OPAC</a> || <A HREF="http://www.library.org.nz">Library Website</a> ! </td> ! ! ! </tr> ! </table> - - </td> - </tr> - </table> - </center> --- 46,188 ---- <center> <table cellspacing=0 cellpadding=0 border=0 > <tr valign=top > ! <td background="images/koha-front-background.gif"><img src="images/holder.gif" ! width=1 height=420 align=left alt=" " hspace=0 vspace=0 > ! <table cellspacing=0 cellpadding=0 border=0 > !  ! <tr valign=top > ! <td background=" "><img src="images/holder.gif" width=150 height=42 ! alt=" " hspace=0 vspace=0 ></td> ! <td background=" "><img src="images/holder.gif" width=30 height=42 ! alt=" " hspace=0 vspace=0 ></td> ! <td background=" "><img src="images/holder.gif" width=25 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=25 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=25 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=35 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=80 height=42 ! alt=" " hspace=0 vspace=0></td> ! <td background=" "><img src="images/holder.gif" width=90 height=42 ! alt=" " hspace=0 vspace=0></td> ! </tr>  ! <tr valign=top > ! <td background=" " colspan=5><img src="images/holder.gif" ! width=1 height=1 hspace=0 vspace=0></td> ! ! <td background=" " colspan=3><a href="/catalogue/" onMouseOver="if(document.images)document.search.src='images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='images/front-search.gif'"><img src="images/front-search.gif" width=320 height=37 name="search" ! hspace=0 vspace=0 border=0></a></td> ! </tr> ! <FORM ACTION="/cgi-bin/koha/search.pl" method=post> ! <tr valign=top > ! <td background=" " rowspan=3 align="right" colspan=5> ! <img src="images/holder.gif" ! width=1 height=35 ! alt=" " hspace=0 vspace=0><br> ! <img src="images/koha-front-koha.gif" width=200 height=128 ! alt="Koha: Horowhenua Library Trust" hspace=0 vspace=0></td> ! <td></td> ! <td background=" " colspan=3> ! <input type=text size="27" name="keyword"><input type=reset value="clr"><br> ! ! <font size=1 face="arial,helvetica" ><b>Type in the box and press the enter key.</b><br> ! <a href="/catalogue/"> ! <font size=2 face="arial narrow,arial,helvetica"> ! <img src="images/front-arrow-purple.gif" width=27 height=22 ! alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br> ! ! <img src="images/holder.gif" width=1 height=8 ! alt=" " hspace=0 vspace=0></td> ! ! </tr> ! </form> ! !  ! ! <tr valign=top > ! <td></td> ! <form action="/cgi-bin/koha/member.pl" method=post > ! <td background=" " colspan=2> ! <a href="/members/" onMouseOver="if(document.images)document.member.src='images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='images/front-member.gif'"> ! <img src="images/front-member.gif" width=304 height=37 name="member" ! hspace=0 vspace=0 border=0> ! </td> ! ! </tr> ! <tr valign=top > ! <td></td> ! <form action="/cgi-bin/koha/member.pl" method=post > ! ! <td background=" " colspan=2 > ! <input type=text size="27" name="member"> ! <input type=reset value="clr"><br> ! <font size=1 face="arial,helvetica" ><b>Type in the box and press the enter key.</b><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0></td> ! </tr>  ! <tr valign=top > ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td background=" " colspan=3><A href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" onMouseOver="if(document.images)document.acquisitions.src='images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='images/front-acquisitions.gif'"><img src="images/front-acquisitions.gif" width=320 height=36 name="acquisitions" ! hspace=0 vspace=0 border=0></a><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0 ></td> ! ! ! </tr> ! ! !  ! <tr valign=top > ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td background=" " colspan=4> <A href="/reports/" onMouseOver="if(document.images)document.reports.src='images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='images/front-reports.gif'"><img src="images/front-reports.gif" width=346 height=37 name="reports" ! hspace=0 vspace=0 border=0></a><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0 ></td> ! </tr> ! !  ! <tr valign=top > ! ! <td></td> ! <td></td> ! <td></td> ! <td background=" " colspan=5> <A href="/admin/" onMouseOver="if(document.images)document.admin.src='images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='images/front-admin.gif'"><img src="images/front-admin.gif" width=346 height=37 name="admin" ! hspace=0 vspace=0 border=0></a><br> ! <img src="images/holder.gif" width=1 height=12 ! alt=" " hspace=0 vspace=0 ></td> ! ! ! </tr> ! !  ! <tr valign=top > ! ! <td></td> ! <td background=" " colspan=7> <A href="/cgi-bin/koha/circ/circulation.pl" onMouseOver="if(document.images)document.circulation.src='images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='images/front-circulation.gif'"><img src="images/front-circulation.gif" width=346 height=37 name="circulation" ! hspace=0 vspace=0 border=0></a> ! <br> ! <font size=2 face="arial,helvetica" > ! See Also: <A HREF="http://opac.library.org.nz">OPAC</a> || <A HREF="http://www.library.org.nz">Library Website</a> ! </td> ! </tr> ! </table> </td> ! </tr> </table> </center>

1 0

CVS: koha/C4 Acquisitions.pm,1.2,1.3
by Gynn Lomax 10 Apr '02

10 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv3623 Modified Files: Acquisitions.pm Log Message: Altered newbiblio to be more generic - so can use with new acui.simple scripts (which are not finished yet). Index: Acquisitions.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Acquisitions.pm 12 Feb 2002 21:07:21 -0000 1.2 --- Acquisitions.pm 10 Apr 2002 05:49:17 -0000 1.3 *************** *** 382,399 **** sub newbiblio { ! my ($title,$author,$copyright)=@_; ! my $dbh=C4Connect; ! my $query="Select max(biblionumber) from biblio"; ! my $sth=$dbh->prepare($query); $sth->execute; ! my $data=$sth->fetchrow_arrayref; ! my $bibnum=$$data[0]; ! $bibnum++; $sth->finish; ! $query="insert into biblio (biblionumber,title,author,copyrightdate) values ! ($bibnum,'$title','$author','$copyright')"; ! $sth=$dbh->prepare($query); # print $query; $sth->execute; $sth->finish; $dbh->disconnect; --- 382,415 ---- sub newbiblio { ! my ($biblio) = @_; ! my $dbh = &C4Connect; ! my $query = "Select max(biblionumber) from biblio"; ! my $sth = $dbh->prepare($query); $sth->execute; ! my $data = $sth->fetchrow_arrayref; ! my $bibnum = $$data[0] + 1; ! my $series = 0; ! ! $biblio->{'title'} = $dbh->quote($biblio->{'title'}); ! $biblio->{'author'} = $dbh->quote($biblio->{'author'}); ! $biblio->{'copyright'} = $dbh->quote($biblio->{'copyright'}); ! $biblio->{'seriestitle'} = $dbh->quote($biblio->{'seriestitle'}); ! $biblio->{'notes'} = $dbh->quote($biblio->{'notes'}); ! if ($biblio->{'seriestitle'}) { $series = 1 }; ! $sth->finish; ! $query = "insert into biblio set ! biblionumber = $bibnum, ! title = $biblio->{'title'}, ! author = $biblio->{'author'}, ! copyrightdate = $biblio->{'copyright'}, ! series = $series; ! seriestitle = $biblio->{'seriestitle'}, ! notes = $biblio->{'notes'}"; ! ! $sth = $dbh->prepare($query); # print $query; $sth->execute; + $sth->finish; $dbh->disconnect;

1 0

CVS: koha/acqui addorder.pl,1.1.1.1,1.2
by Gynn Lomax 10 Apr '02

10 Apr '02

Update of /cvsroot/koha/koha/acqui In directory usw-pr-cvs1:/tmp/cvs-serv3089 Modified Files: addorder.pl Log Message: Updates to use changed newbiblio sub in C4/Acquisitions.pm Index: addorder.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** addorder.pl 19 Dec 2000 23:45:56 -0000 1.1.1.1 --- addorder.pl 10 Apr 2002 05:47:07 -0000 1.2 *************** *** 48,52 **** if ($existing eq 'no'){ #if it doesnt create it ! $bibnum=newbiblio($title,$author,$copyright); $bibitemnum=newbiblioitem($bibnum,$itemtype,$isbn); newsubtitle($bibnum); --- 48,54 ---- if ($existing eq 'no'){ #if it doesnt create it ! $bibnum=newbiblio({ title => $title, ! author =>$author, ! copyright => $copyright }); $bibitemnum=newbiblioitem($bibnum,$itemtype,$isbn); newsubtitle($bibnum);

1 0

CVS: koha/misc fines2.pl,1.4,1.5
by Pat Eyler 09 Apr '02

09 Apr '02

Update of /cvsroot/koha/koha/misc In directory usw-pr-cvs1:/tmp/cvs-serv28795 Modified Files: fines2.pl Log Message: whacked a couple of bits that Chris marked as okay to delete. Index: fines2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/fines2.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** fines2.pl 9 Apr 2002 23:30:48 -0000 1.4 --- fines2.pl 10 Apr 2002 00:02:59 -0000 1.5 *************** *** 25,33 **** my $overdueItemsCounted=0 if $DEBUG; - # FIXME - # delete this? - # yep just a debuging thing - #$numOverdueItems=1000; - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =localtime(time); $mon++; --- 25,28 ---- *************** *** 36,44 **** my $date=Date_DaysSince1BC($mon,$mday,$year); - # FIXME - # delete this? - # another debugging thing, and yep it can go (you can make the script fake a day, say u want to rerun the overdues for - # a day when for some reason the script didnt run) - #my $date=Date_DaysSince1BC(1,24,2002); print $date if $DEBUG; --- 31,34 ---- *************** *** 90,97 **** # If this isn't needed it should be deleted # - # if ($amount ==5){ # marklost(); # } if ($borrower->{'categorycode'} eq 'C'){ # FIXME # this should be a --- 80,87 ---- # If this isn't needed it should be deleted # # if ($amount ==5){ # marklost(); # } + if ($borrower->{'categorycode'} eq 'C'){ # FIXME # this should be a

1 0