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

hola (fwd)
by Pat Eyler 10 May '02

10 May '02

Thought I'd pass this along to the list. I'm trying to recruit some help in developing and internationalizing koha ... this was my first shot at it. thoughts, comments, questions? -pate ---------- Forwarded message ---------- Date: Thu, 9 May 2002 11:30:34 -0400 (EDT) From: Pat Eyler <pate(a)eylerfamily.org> To: webmasters(a)www.gnu.org.pe Subject: hola hola, yo habla un poco espanol, lo siento. I hope english will work. I'm working on a free software library automation project (for traditional book/media collections) called koha (Maori for 'gift')[1]. It uses perl and mysql, and will run on a variety of free unix-like systems. Currently koha works very well for smaller libraries, and is installed at a number of libraries around the world. Our goal is to turn it into a system capable of handling large libraries, even to the point of supporting National Libraries. Given Peru's recent entrance into the limelight of the Free Software world, it would seem that there is a opportunity for co-operation. Do you know of a Peruvian organization that we could work with us to: a) help localize koha for spanish speakers b) ensure the functionality that peruvian libraries (and the peruvian governmant) need is present in koha c) help build local (Peruvian) interest in and support for koha

1 0

cvs and branching
by Pat Eyler 10 May '02

10 May '02

Here's a quick picture of how we might use CVS branches to manage our upcoming development. An explanation follows. +--MARC-+ / \ / \ -main line--+-----+-----+-------------+-+--------------+-> development \ \ / \ / \ \ / +-rel_1_4-++---> 1.4 branch \ \ / / \ +-rel_1_2-+-+---------------+------> 1.2 branch \ / \ / +---NT----+ (This picture is a gross over-simplification.) The main line is where all normal development should happen (e.g., seperation of presentation and logic and addition of http::template). Sometimes it makes sense to create a branch. This could be to stabilize a release (e.g., re_1_2 and rel_1_4) or to integrate big changes that have happened outside the tree (e.g., MARC or NT). Branches represent temporary copies of the tree, and can be operated on (cvs add, remove, commit, checkout, update, etc) without affecting the main line. Any time we create a branch, we should plan on merging (or backporting) changes back to the main line (and perhaps to other branches as well). In the example above, we already have a rel_1_2 branch. We should create an NT and a MARC branch to hold the changes for these two development efforts. As the NT tree is solidified, we can backport it into the rel_1_2 tree and from there into the main line. Once the code has been backported, we can close this branch down. As the MARC tree solidifies, we can merge it directly back into the main line preparatory to creating the rel_1_4 branch. Again, once backported, this branch can be closed. The rel_1_2 tree should never be closed down. It will represent the ongoing work on the 1.2 stable releases. We will want to merge changes from this branch into the main line on a regular basis. Once the rel_1_4 branch is created, we can backport rel_1_2 changes into that branch as desired. After the rel_1_4 branch has been created, we will want to merge stabilization changes back into the main line from it on a regular basis. For hints on the technical bits involved in using CVS and branches, please look at http://cvsbook.red-bean.com/cvsbook.html (or, even better, buy a copy of the book).

2 4

koha development leadership
by Pat Eyler 10 May '02

10 May '02

--------------------------------------------------------------------------- NOTE: The following should be considered beta quality documentation. It represents my understanding of the rough consensus that came out of an irc meeting. Please feel free to point out mistakes, to clarify points, or suggest improvements. --------------------------------------------------------------------------- During our inaugural irc meeting last night, we talked about providing more of a leadership structure for koha to add some consistency, motivation, and vision to koha development. We talked about a couple of options, ranging from continued anarchy ("there's no leadership like no leadership") to an elected steering committee ("if a camel is a horse designed by committee ..."). In the end we settled on a happy medium ("The art of compromise is giving everyone some of what they want so that, in the end, no one is happy.") The purpose of this email is to explain the basic structure that we settled on as well as the roles and responsibilities of each position. We decided that we (the people on the development list) should elect a 'benevolent dictator' to serve us until he/she decides to pass along the baton to someone else (or looses the mandate of the development list). This person would nominate several key assistants to oversee specific areas of the koha project. This 'cabinet' should look something like this: Benevolent Dictator Release Leader Marketing Leader Recruiter Standards Liason Each of these positions is described below: Benevolent Dictator: This person is responsible for setting the overall tone of koha development. They will determine which Major features belong in a given release, which outside organizations we should focus on building relationships with, etc. Our dictator should be our visionary and strategic thinker. Release Leader: This person is chosen to oversee the development of a specific release. There may be more than one release leader concurrently (e.g., a 1.2 release leader and a 1.4 release leader), the one overseeing the tail end of development on an earlier release while the other is ramping up development on the next release. This person should be; making tactical decisions about merging or removing code, resolving conflicts, and managing a release schedule by encouraging (harassing?) developers. Marketing Leader: This person should be targeting specific organizations to approach about koha. They are not the sales arm of katipo or any other koha support/development company, instead they should be trying to increase awareness (and acceptance) of koha. Examples may be coordinating a presence at ALA regional meetings, collecting koha success stories for distribution on the devel list (and web site), and the like. Recruiter: This persons role is to find solid developers and designers to bring into the koha development and support effort. This should include international recruitment (esp. in markets determined to be important by the Marketing Leader and Benevolent Dictator). It may also include helping/mentoring likely candidates from the koha users list. Standards Liason: This person should help coordinate our standards compliance efforts. They will be tasked with gathering standards documentation and writing (or finding people to write) developer oriented documentation about the standards documentation. (An if you think that last sentence was evil, you should go read some standards documents.)

1 0

Log
by Nicholas Rosasco 10 May '02

10 May '02

I'll be posting the meeting log (if you want a look at it) after I get some sleep, unless someone has an objection. Nick

1 0

Re: Koha steering committee
by Rachel Hamilton-Williams 09 May '02

09 May '02

Hi, Firstly appologies for not getting back to you on this earlier in the week, and for likely missing most of the meeting today. My biggest question would be "what are the problems we're trying to solve" If we can write those down in a coherant fashion then we can see if a board will solve them. I went and had a look at the Apache and Gnome committee/board sites (after I asked who else worked like this), and found the following things interesting. 1/. One of the prime reasons (given) for setting up a foundation (and they implied board but that my not be the case) was so that other organisations could contribute finacially to a central fund, that would then pay programmers. 2/. They only let people who have contributed be members and elect and be on the board. Which is a bit different to what you're suggestiong. 3/. They weren't big on having people who were "just" users on the board etc. > We're proposing an oversight board (steering committee) for koha. The > board would be elected by the body of koha developers, users, and > related people. (We want to include people into the general body > rather than excluding them, but probably need to think about > controlling membership somehow.) > The board should be responsible for activities such as: > * choosing functionality targets for upcoming releases > * making policy decisions regarding koha > * organizing a koha presence at trade shows and the like > * acting as a liason with outside groups and foundations (GNOME, > KDE, Apache, ALA, etc.) where needed > * creating guidelines for granting developer access to the koha cvs > tree If we need to fund some of these activities (I don't know if we do or not) then we may need to set up Koha as a charity. > The board should meet weekly or bi-weekly (via irc?) and post minutes of > their meetings to the koha (and koha-devel?) mailing lists and to the koha > wiki. > > To reduce potentially improper concentrations of power, only 2 > representatives from any organization should be allowed to serve on > the board at a time (e.g., a company providing development or support > for koha, or a library using koha). > > For now, the board should be something like this: > 4 developer seats > 4 librarian seats > These 8 positions should serve 2 year terms, and half of them > should be up for re-election any given year. (In the first > election, half of the developer and half of the librarian seats > should be elected for a 1 year term.) > 3 at-large seats > The three at-large seats should either serve 1 year terms or > staggered 3 year terms. I think thats too many people. Particularly meeting via IRC that's a lot of people to meet. I'd rather see a smaller committee, but have meetings open to observers or something similar. > The board members should elect a chair person from within their > number, Chairs chould serve a one year term. cheers Rachel _____________________________________________________________ Rachel Hamilton-Williams Katipo Communications WEBMISTRESS ph 021 389 128 or +64 04 934 1285 mailto:rachel@katipo.co.nz PO Box 12487, Wellington http://www.katipo.co.nz New Zealand Koha Open Source Library System http://www.koha.org

1 0

irc meeting tomorrow
by Pat Eyler 09 May '02

09 May '02

After a brief poll on the irc channel, we've come up with a tentative start time of 2PM Katipo Time (GMT+12). This seems to incovenience the majority of the people the least (sorry Sergey and Paul). We can either run with Nick's full blown agenda, or the shorter one I proposed and just plan on more meetings to hit all the items. Rachel, you seem to be the logical chair for the meeting, what do you think? Anyone else? -pate

2 1

CVS: koha installer.pl,1.2.2.1,1.2.2.2
by Mike Mylonas 09 May '02

09 May '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv5541/koha Modified Files: Tag: rel-1-2 installer.pl Log Message: Added testing for Perl and dependancies Index: installer.pl =================================================================== RCS file: /cvsroot/koha/koha/installer.pl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** installer.pl 26 Apr 2002 14:47:17 -0000 1.2.2.1 --- installer.pl 9 May 2002 09:26:47 -0000 1.2.2.2 *************** *** 10,15 **** - - This installer will prompt you with a series of questions. It assumes you (or your system administrator) has installed: --- 10,13 ---- *************** *** 57,62 **** system("tar -x $answer"); #unpack fill out ! #test for Perl and Apache? print "Are you using MySql?(Y/[N]): "; $answer = $_; --- 55,93 ---- system("tar -x $answer"); #unpack fill out + # + # Test for Perl - Do we need to explicity check versions? + # + print "\nChecking perl modules ...\n"; + unless (eval "require 5.004") { + die "Sorry, you need at least Perl 5.004\n"; + } + + + # + # Test for Perl Dependancies + # + my @missing = (); + unless (eval require DBI) { push @missing,"DBI" }; + unless (eval require Date::Manip) { push @missing,"Datr::Manip" } + unless (eval require DBD::mysql) { push @missing,"DBD::mysql" } + unless (eval require Set::Scalar) { push @missing,"Set::Scalar" } + + # + # Print out a list of any missing modules + # + + if (@missing > 0) { + print "\n\n"; + print "You are missing some Perl modules which are required by Koha.\n"; + print "They can be installed by running (as root) the following:\n"; + foreach my $module (@missing) { + print " perl -MCPAN -e 'install \"$module\"'\n"; + } + print "\n"; + exit; + } + ! #test for MySQL? print "Are you using MySql?(Y/[N]): "; $answer = $_;

1 0

CVS: koha detail.pl,1.4,1.5 modbib.pl,1.1.1.1,1.2 updatebiblio.pl,1.1.1.1,1.2
by Gynn Lomax 08 May '02

08 May '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv16527 Modified Files: detail.pl modbib.pl updatebiblio.pl Log Message: Update to catalogue to allow change of biblio abstracts. Related modifications to acqui system to match changes in Acquisition.pm detail.pm changed to show abstract - still working on how to show url's Index: detail.pl =================================================================== RCS file: /cvsroot/koha/koha/detail.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** detail.pl 3 May 2002 02:47:33 -0000 1.4 --- detail.pl 9 May 2002 03:01:40 -0000 1.5 *************** *** 14,31 **** my $title = $input->param('title'); my @items = &ItemInfo(undef, $bib, $type); my $dat = &bibdata($bib); my $count = @items; ! my ($count3, $addauthor) = &addauthor($bib); my $additional = $addauthor->[0]->{'author'}; - my @temp = split('\t', $items[0]); my $main; my $secondary; ! if ($type eq ''){ $type = 'opac'; } # if # setup colours ! if ($type eq 'opac'){ $main = '#99cccc'; $secondary = '#efe5ef'; --- 14,33 ---- my $title = $input->param('title'); my @items = &ItemInfo(undef, $bib, $type); + my @temp = split('\t', $items[0]); my $dat = &bibdata($bib); my $count = @items; ! my ($authorcount, $addauthor) = &addauthor($bib); my $additional = $addauthor->[0]->{'author'}; my $main; my $secondary; + my $colour; ! ! if ($type eq '') { $type = 'opac'; } # if # setup colours ! if ($type eq 'opac') { $main = '#99cccc'; $secondary = '#efe5ef'; *************** *** 34,37 **** --- 36,44 ---- $secondary = '#ffffcc'; } # else + $colour = $secondary; + + for (my $i = 1; $i < $authorcount; $i++) { + $additional .= "|" . $addauthor->[$i]->{'author'}; + } # for print $input->header; *************** *** 41,52 **** if ($type ne 'opac'){ print << "EOF"; ! <a href=request.pl?bib=$bib><img height=42 WIDTH=120 BORDER=0 src=\"/images/requests.gif\" align=right border=0></a> EOF } # if - for (my $i = 1; $i < $count3; $i++) { - $additional .= "|" . $addauthor->[$i]->{'author'}; - } # for - if ($type eq 'catmain'){ print mkheadr(3,"Catalogue Maintenance"); --- 48,55 ---- if ($type ne 'opac'){ print << "EOF"; ! <a href=request.pl?bib=$bib><img height=42 WIDTH=120 BORDER="0" src=\"/images/requests.gif\" align="right" border="0"></a> EOF } # if if ($type eq 'catmain'){ print mkheadr(3,"Catalogue Maintenance"); *************** *** 57,97 **** } else { print mkheadr(3,"$dat->{'title'} $temp[4]"); ! } ! print << "EOF"; ! ! <TABLE CELLSPACING=0 CELLPADDING=5 border=1 align=left width="220">  ! ! <form action=/cgi-bin/koha/modbib.pl method=post> ! <input type=hidden name=bibnum value=$bib> ! <TR VALIGN=TOP> ! ! <td bgcolor="$main" EOF - if ($type ne 'opac'){ - print "background=\"/images/background-mem.gif\""; - } print << "EOF"; ! ><B>BIBLIO RECORD EOF ! if ($type ne 'opac'){ print "$bib"; } - print << "EOF"; - </TD></TR> ! <tr VALIGN=TOP > ! <TD> EOF - if ($type ne 'opac'){ - print "<INPUT TYPE=\"image\" name=\"submit\" VALUE=\"modify\" height=42 WIDTH=93 BORDER=0 src=\"/images/modify-mem.gif\"> - <INPUT TYPE=\"image\" name=\"delete\" VALUE=\"delete\" height=42 WIDTH=93 BORDER=0 src=\"/images/delete-mem.gif\">"; - } print << "EOF"; <br> --- 60,106 ---- } else { print mkheadr(3,"$dat->{'title'} $temp[4]"); ! } # if + print << "EOF"; + <table cellspacing="0" callpadding="5" border="1" align="left" width="220">  + <tr valign="top"> + EOF ! if ($type ne 'opac') { ! print << "EOF"; ! <td bgcolor="$main" background="/images/background-mem.gif"> EOF + } else { + print << "EOF"; + <td bgcolor="$main"> + EOF + } # else print << "EOF"; ! <b>BIBLIO RECORD</b> EOF ! if ($type ne 'opac') { print "$bib"; } + print << "EOF"; + </td> + </tr> + <tr valign="top"> + <td> + EOF ! if ($type ne 'opac') { ! print << "EOF"; ! <form action="/cgi-bin/koha/modbib.pl" method="post"> ! <input type="hidden" name="bibnum" value="$bib"> ! <input type="image" name="submit" value="modify" height="42" width="93" border="0" src="/images/modify-mem.gif"> ! <input type="image" name="delete" value="delete" height="42" width="93" border="0" src="/images/delete-mem.gif"> ! </form> EOF + } # if print << "EOF"; <br> *************** *** 100,105 **** ! if ($type ne 'opac'){ ! print << "EOF"; <b>Subtitle:</b> $dat->{'subtitle'}<br> <b>Author:</b> $dat->{'author'}<br> --- 109,114 ---- ! if ($type ne 'opac') { ! print << "EOF"; <b>Subtitle:</b> $dat->{'subtitle'}<br> <b>Author:</b> $dat->{'author'}<br> *************** *** 117,247 **** EOF ! } ! else { ! if ($dat->{'subtitle'} ne ''){ ! print "<b>Subtitle:</b> $dat->{'subtitle'}<br>"; ! } ! if ($dat->{'author'} ne ''){ ! print "<b>Author:</b> $dat->{'author'}<br>"; ! } ! #Additional Author: <br> ! if ($dat->{'seriestitle'} ne ''){ ! print "<b>Seriestitle:</b> $dat->{'seriestitle'}<br>"; ! } ! if ($dat->{'subject'} ne ''){ ! print "<b>Subject:</b> $dat->{'subject'}<br>"; ! } ! if ($dat->{'copyrightdate'} ne ''){ ! print "<b>Copyright:</b> $dat->{'copyrightdate'}<br>"; ! } ! if ($dat->{'notes'} ne ''){ ! print "<b>Notes:</b> $dat->{'notes'}<br>"; ! } ! if ($dat->{'unititle'} ne ''){ ! print "<b>Unititle:</b> $dat->{'unititle'}<br>"; ! } ! #Analytical Author: <br> ! #Analytical Title: <br> ! if ($dat->{'serial'} ne '0'){ ! print "<b>Serial:</b> Yes<br>"; ! } ! print "<b>Total Number of Items:</b> $count <p> ! "; - } print << "EOF"; ! </form> ! </font></TD> ! </TR> ! </TABLE> ! <img src="/images/holder.gif" width=16 height=300 align=left> EOF - my $i=0; print center(); print mktablehdr; - if ($type eq 'opac'){ ! print mktablerow(6,$main,'Item Type','Class','Branch','Date Due','Last Seen'); } else { ! print mktablerow(6,$main,'Itemtype','Class','Location','Date Due','Last Seen','Barcode',"/images/background-mem.gif"); ! } ! my $colour=1; ! while ($i < $count){ - my @results = split('\t', $items[$i]); - if ($type ne 'opac'){ - $results[1]=mklink("/cgi-bin/koha/moredetail.pl?item=$results[5]&bib=$bib&bi=$results[8]&type=$type",$results[1]); - } - if ($results[2] eq ''){ - $results[2]='Available'; - } - if ($type eq 'catmain'){ - $results[10]=mklink("/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=$results[8]&item=$results[6]","Fix Itemtype"); - } - if ($colour == 1){ if ($type ne 'opac'){ ! if ($type eq 'catmain'){ ! print mktablerow(8,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9],$results[10]); ! } else { ! print mktablerow(7,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! } } else { ! $results[6]=ItemType($results[6]); ! print mktablerow(6,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); ! } ! $colour=0; ! } else{ ! if ($type ne 'opac'){ ! if ($type eq 'catmain'){ ! print mktablerow(8,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9],$results[10]); ! } else { ! print mktablerow(7,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! } } else { ! $results[6]=ItemType($results[6]); ! print mktablerow(6,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); ! } ! $colour=1; ! } ! $i++; ! } print mktableft(); print "<p>"; print mktablehdr(); ! if ($type ne 'opac'){ ! print << "EOF"; ! <TR VALIGN=TOP> ! <TD bgcolor="99cc33" background="/images/background-mem.gif" colspan=2><p><b>HELP</b><br> <b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left] to amend the biblio. Any changes you make will update the record for <b>all</b> the items listed above. <p> <b>Updating the Biblio for only ONE or SOME Items:</b> EOF ! if ($type eq 'catmain'){ ! print << "EOF"; If some of the items listed above need a different biblio, you need to click on the wrong item, then shift the group it belongs to, to the correct biblio. You will need to know the correct biblio number ! <p> ! ! </TR> EOF ! } else { ! print << "EOF"; If some of the items listed above need a different biblio, or are on the wrong biblio, you must use the <a href="acquisitions/">acquisitions</a> process to fix this. You will need to "re-order" the items, and delete them from this biblio. ! <p> ! ! </TR> EOF ! } ! } print mktableft(); print endcenter(); ! print "<br clear=all>"; print endmenu($type); print endpage(); --- 126,292 ---- EOF ! } else { ! if ($dat->{'subtitle'} ne ''){ ! print "<b>Subtitle:</b> $dat->{'subtitle'}<br>"; ! } # if ! if ($dat->{'author'} ne ''){ ! print "<b>Author:</b> $dat->{'author'}<br>"; ! } # if ! ! # Additional Author: <br> ! if ($dat->{'seriestitle'} ne '') { ! print "<b>Seriestitle:</b> $dat->{'seriestitle'}<br>"; ! } # if ! if ($dat->{'subject'} ne '') { ! print "<b>Subject:</b> $dat->{'subject'}<br>"; ! } # if ! if ($dat->{'copyrightdate'} ne '') { ! print "<b>Copyright:</b> $dat->{'copyrightdate'}<br>"; ! } # if ! if ($dat->{'notes'} ne '') { ! print "<b>Notes:</b> $dat->{'notes'}<br>"; ! } # if ! if ($dat->{'unititle'} ne '') { ! print "<b>Unititle:</b> $dat->{'unititle'}<br>"; ! } # if ! ! # Analytical Author: <br> ! # Analytical Title: <br> ! if ($dat->{'serial'} ne '0') { ! print "<b>Serial:</b> Yes<br>"; ! } # if ! ! print << "EOF"; ! <b>Total Number of Items:</b> $count <p> ! EOF ! ! } # if print << "EOF"; ! </font></td> ! </tr> ! </table> ! <img src="/images/holder.gif" width="16" height="300" align="left"> EOF print center(); print mktablehdr; ! if ($type eq 'opac') { ! print mktablerow(6,$main,'Item Type','Class','Branch','Date Due','Last Seen'); ! if ($dat->{'url'} ne '') { ! $dat->{'url'} =~ s/^http:\/\///; ! print mktablerow(6, $colour, 'Website', 'WEB', 'Online', 'Available', "<a href=\"http://$dat->{'url'}\">$dat->{'url'}</a>"); ! } # if } else { ! print mktablerow(7,$main,'Itemtype','Class','Location','Date Due','Last Seen','Barcode',"","/images/background-mem.gif"); ! if ($dat->{'url'} ne '') { ! $dat->{'url'} =~ s/^http:\/\///; ! print mktablerow(7, $colour, 'WEB', '', 'Online', 'Available', "<a href=\"http://$dat->{'url'}\">$dat->{'url'}</a>"); ! } # if ! } # else ! ! $colour = 'white'; ! for (my $i = 0; $i < $count; $i ++) { ! ! my @results = split('\t', $items[$i]); ! ! if ($type ne 'opac') { ! $results[1] = mklink("/cgi-bin/koha/moredetail.pl?item=$results[5]&bib=$bib&bi=$results[8]&type=$type",$results[1]); ! } # if ! ! if ($results[2] eq '') { ! $results[2] = 'Available'; ! } # if ! ! if ($type eq 'catmain'){ ! $results[10] = mklink("/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=$results[8]&item=$results[6]","Fix Itemtype"); ! } # if if ($type ne 'opac'){ ! if ($type eq 'catmain'){ ! print mktablerow(8,$colour,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9],$results[10]); ! } else { ! print mktablerow(7,$colour,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! } # else } else { ! $results[6] = ItemType($results[6]); ! print mktablerow(6,$colour,$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); ! } # else ! ! if ($colour eq $secondary) { ! $colour = 'white'; } else { ! $colour = $secondary; ! } # else ! ! } # for print mktableft(); print "<p>"; print mktablehdr(); ! ! if ($type ne 'opac') { ! print << "EOF"; ! <tr valign="top"> ! <td bgcolor="99cc33" background="/images/background-mem.gif" colspan="2"><p><b>HELP</b><br> <b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left] to amend the biblio. Any changes you make will update the record for <b>all</b> the items listed above. <p> <b>Updating the Biblio for only ONE or SOME Items:</b> EOF ! if ($type eq 'catmain') { ! print << "EOF"; If some of the items listed above need a different biblio, you need to click on the wrong item, then shift the group it belongs to, to the correct biblio. You will need to know the correct biblio number ! <p /> ! </tr> EOF ! } else { ! print << "EOF"; If some of the items listed above need a different biblio, or are on the wrong biblio, you must use the <a href="acquisitions/">acquisitions</a> process to fix this. You will need to "re-order" the items, and delete them from this biblio. ! <p /> ! </tr> EOF ! } # else ! } # if ! print mktableft(); print endcenter(); ! print << "EOF"; ! <br clear=all> ! <p /> ! EOF ! ! if ($type ne 'opac') { ! print << "EOF"; ! <table border="1" cellspacing="0" cellpadding="5" width="90%"> ! <tr valign="top"> ! <td bgcolor="$main" background="/images/background-mem.gif"><b>Abstract</b></td> ! </tr> ! <tr valign="top"> ! <td>$dat->{'abstract'}</td> ! </tr> ! </table> ! EOF ! } else { ! if ($dat->{'abstract'} ne '') { ! print << "EOF"; ! <table border="1" cellspacing="0" cellpadding="5" width="90%"> ! <tr valign="top"> ! <td bgcolor="$main"><b>Abstract</b></td> ! </tr> ! <tr valign="top"> ! <td>$dat->{'abstract'}</td> ! </tr> ! </table> ! EOF ! } # if ! } # else ! print endmenu($type); print endpage(); Index: modbib.pl =================================================================== RCS file: /cvsroot/koha/koha/modbib.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** modbib.pl 19 Dec 2000 23:45:52 -0000 1.1.1.1 --- modbib.pl 9 May 2002 03:01:40 -0000 1.2 *************** *** 13,84 **** my $input = new CGI; ! my $bibnum=$input->param('bibnum'); ! my $data=bibdata($bibnum); ! my ($count,$subject)=subject($data->{'biblionumber'}); ! my ($count2,$subtitle)=subtitle($data->{'biblionumber'}); ! my ($count3,$addauthor)=addauthor($data->{'biblionumber'}); ! my $submit=$input->param('submit.x'); ! if ($submit eq ''){ ! print $input->redirect("/cgi-bin/koha/delbiblio.pl?biblio=$bibnum"); ! } print $input->header; ! #my ($analytictitle)=analytic($biblionumber,'t'); ! #my ($analyticauthor)=analytic($biblionumber,'a'); print startpage(); print startmenu(); - my %inputs; ! #have to get all subtitles, subjects and additional authors ! my $sub=$subject->[0]->{'subject'}; ! for (my $i=1;$i<$count;$i++){ ! $sub=$sub."|".$subject->[$i]->{'subject'}; ! } ! my $additional=$addauthor->[0]->{'author'}; ! for (my $i=1;$i<$count3;$i++){ ! $additional=$additional."|".$addauthor->[$i]->{'author'}; ! } ! ! ! #hash is set up with input name being the key then ! #the value is a tab separated list, the first item being the input type ! $inputs{'Author'}="text\t$data->{'author'}\t0"; ! $data->{'title'}=tidyhtml($data->{'title'}); ! $inputs{'Title'}="text\t$data->{'title'}\t1"; ! my $dewey = $data->{'dewey'}; ! $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; ! if ($dewey < 10){$dewey='00'.$dewey;} ! if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} ! if ($dewey <= 0){ ! $dewey=''; ! } ! $dewey=~ s/\.$//; ! #$inputs{'Class'}="text\t$data->{'classification'}$dewey$data->{'subclass'}\t2"; ! #$inputs{'Item Type'}="text\t$data->{'itemtype'}\t3"; ! $inputs{'Subject'}="textarea\t$sub\t4"; ! #$inputs{'Publisher'}="text\t$data->{'publishercode'}\t5"; ! $inputs{'Copyright date'}="text\t$data->{'copyrightdate'}\t6"; ! #$inputs{'ISBN'}="text\t$data->{'isbn'}\t7"; ! #$inputs{'Publication Year'}="text\t$data->{'publicationyear'}\t8"; ! #$inputs{'Pages'}="text\t$data->{'pages'}\t9"; ! #$inputs{'Illustrations'}="text\t$data->{'illustration'}\t10"; ! $inputs{'Series Title'}="text\t$data->{'seriestitle'}\t11"; ! $inputs{'Additional Author'}="text\t$additional\t12"; ! $inputs{'Subtitle'}="text\t$subtitle->[0]->{'subtitle'}\t13"; ! $inputs{'Unititle'}="text\t$data->{'unititle'}\t14"; ! $inputs{'Notes'}="textarea\t$data->{'notes'}\t15"; ! $inputs{'Serial'}="text\t$data->{'serial'}\t16"; ! #$inputs{'Volume'}="text\t$data->{'volumeddesc'}\t17"; ! $inputs{'Analytic author'}="text\t\t18"; ! $inputs{'Analytic title'}="text\t\t19"; ! ! $inputs{'bibnum'}="hidden\t$data->{'biblionumber'}\t20"; ! $inputs{'bibitemnum'}="hidden\t$data->{'biblioitemnumber'}\t21"; ! ! ! print mkform3('updatebiblio.pl',%inputs); ! #print mktablehdr(); ! #print mktableft(); print endmenu(); print endpage(); --- 13,128 ---- my $input = new CGI; ! my $submit = $input->param('submit.x'); ! my $bibnum = $input->param('bibnum'); ! my $data = &bibdata($bibnum); ! my ($subjectcount, $subject) = &subject($data->{'biblionumber'}); ! my ($subtitlecount, $subtitle) = &subtitle($data->{'biblionumber'}); ! my ($addauthorcount, $addauthor) = &addauthor($data->{'biblionumber'}); ! my $sub = $subject->[0]->{'subject'}; ! my $additional = $addauthor->[0]->{'author'}; ! my %inputs; ! my $dewey; ! ! if ($submit eq '') { ! print $input->redirect("/cgi-bin/koha/delbiblio.pl?biblio=$bibnum"); ! } # if print $input->header; ! # my ($analytictitle) = &analytic($biblionumber,'t'); ! # my ($analyticauthor) = &analytic($biblionumber,'a'); print startpage(); print startmenu(); ! # have to get all subtitles, subjects and additional authors ! for (my $i = 1; $i < $subjectcount; $i++) { ! $sub = $sub . "|" . $subject->[$i]->{'subject'}; ! } # for ! ! for (my $i = 1; $i < $addauthorcount; $i++) { ! $additional = $additional . "|" . $addauthor->[$i]->{'author'}; ! } # for ! ! ! $dewey = $data->{'dewey'}; ! $dewey =~ s/0+$//; ! if ($dewey eq "000.") { ! $dewey = ""; ! } # if ! if ($dewey < 10) { ! $dewey = '00' . $dewey; ! } # if ! if ($dewey < 100 && $dewey > 10) { ! $dewey = '0' . $dewey; ! } # if ! if ($dewey <= 0){ ! $dewey=''; ! } # if ! $dewey = ~ s/\.$//; ! ! $data->{'title'} = &tidyhtml($data->{'title'}); ! ! print << "EOF"; ! <form action="updatebiblio.pl" method="post"> ! <input type="hidden" name="biblionumber" value="$data->{'biblionumber'}"> ! <input type="hidden" name="biblioitemnumber" value="$data=>{'biblioitemnumber'}"> ! <table border="0" cellspacing="0" cellpadding="5"> ! <tr valign="top"> ! <td>Author</td> ! <td><input type="text" name="author" value="$data->{'author'}"></td> ! </tr> ! <tr valign="top"> ! <td>Title</td> ! <td><input type="text" name="title" value="$data->{'title'}"></td> ! </tr> ! <tr valign="top"> ! <td>Abstract</td> ! <td><textarea name="abstract" cols="40" rows="4">$data->{'abstract'}</textarea></td> ! </tr> ! <tr valign="top"> ! <td>Subject</td> ! <td><textarea name="subject" cols="40" rows="4">$sub</textarea></td> ! </tr> ! <tr valign="top"> ! <td>Copyright Date</td> ! <td><input type="text" name="copyrightdate" value="$data->{'copyrightdate'}"></td> ! </tr> ! <tr valign="top"> ! <td>Series Title</td> ! <td><input type="text" name="seriestitle" value="$data->{'seriestitle'}"></td> ! </tr> ! <tr valign="top"> ! <td>Additional Author</td> ! <td><input type="text" name="additionalauthor" value="$additional"></td> ! </tr> ! <tr valign="top"> ! <td>Subtitle</td> ! <td><input type="text" name="subtitle" value="$data->{'subtitle'}"></td> ! </tr> ! <tr valign="top"> ! <td>Unititle</td> ! <td><input type="text" name="unititle" value="$data->{'untitle'}"></td> ! </tr> ! <tr valign="top"> ! <td>Notes</td> ! <td><textarea name="notes" cols="40" rows="4">$data->{'notes'}</textarea></td> ! </tr> ! <tr valign="top"> ! <td>Serial</td> ! <td><input type="text" name="serial" value="$data->{'serial'}"></td> ! </tr> ! <tr valign="top"> ! <td>Analytic Author</td> ! <td><input type="text" name="analyticauthor"></td> ! </tr> ! <tr valign="top"> ! <td>Analytic Title</td> ! <td><input type="text" name="analytictitle"></td> ! </tr> ! </table> ! <br> ! <input type="submit" name="submit" value="Save Changes"> ! </form> ! EOF ! print endmenu(); print endpage(); Index: updatebiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/updatebiblio.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** updatebiblio.pl 19 Dec 2000 23:45:53 -0000 1.1.1.1 --- updatebiblio.pl 9 May 2002 03:01:40 -0000 1.2 *************** *** 7,75 **** use C4::Output; ! my $input= new CGI; ! #print $input->header; ! #print $input->dump; ! ! ! my $title=checkinp($input->param('Title')); ! my $author=checkinp($input->param('Author')); ! my $bibnum=checkinp($input->param('bibnum')); ! my $copyright=checkinp($input->param('Copyright')); ! my $seriestitle=checkinp($input->param('Series')); ! my $serial=checkinp($input->param('Serial')); ! my $unititle=checkinp($input->param('Unititle')); ! my $notes=checkinp($input->param('Notes')); ! ! modbiblio($bibnum,$title,$author,$copyright,$seriestitle,$serial,$unititle,$notes); ! ! my $subtitle=checkinp($input->param('Subtitle')); ! modsubtitle($bibnum,$subtitle); ! ! my $subject=checkinp($input->param('Subject')); ! $subject=uc $subject; ! my @sub=split(/\|/,$subject); ! #print @sub; ! # ! ! my $addauthor=checkinp($input->param('Additional')); ! modaddauthor($bibnum,$addauthor); ! my $count1=@sub; ! ! for (my $i=0; $i<$count1; $i++){ ! $sub[$i]=~ s/ +$//; ! } ! ! #print $input->header; ! my $force=$input->param('Force'); ! my $error=modsubject($bibnum,$force,@sub); if ($error ne ''){ ! print $input->header; ! print startpage(); ! print startmenu(); ! print $error; ! my @subs=split('\n',$error); ! print "<p> Click submit to force the subject"; ! my @names=$input->param; ! my %data; ! my $count=@names; ! for (my $i=0;$i<$count;$i++){ ! if ($names[$i] ne 'Force'){ ! my $value=$input->param("$names[$i]"); ! $data{$names[$i]}="hidden\t$value\t$i"; ! } ! } ! $data{"Force"}="hidden\t$subs[0]\t$count"; ! print mkform3('updatebiblio.pl',%data); ! print endmenu(); ! print endpage(); } else { ! print $input->redirect("detail.pl?type=intra&bib=$bibnum"); ! } sub checkinp{ my ($inp)=@_; ! $inp=~ s/\'/\\\'/g; ! $inp=~ s/\"/\\\"/g; return($inp); } --- 7,75 ---- use C4::Output; ! my $input = new CGI; ! my $bibnum = checkinp($input->param('biblionumber')); ! my $biblio = { ! biblionumber => $bibnum, ! title => $input->param('title')?$input->param('title'):"", ! author => $input->param('author')?$input->param('author'):"", ! abstract => $input->param('abstract')?$input->param('abstract'):"", ! copyright => $input->param('copyrightdate')?$input->param('copyrightdate'):"", ! seriestitle => $input->param('seriestitle')?$input->param('seriestitle'):"", ! serial => $input->param('serial')?$input->param('serial'):"", ! unititle => $input->param('unititle')?$input->param('unititle'):"", ! notes => $input->param('notes')?$input->param('notes'):"", ! }; # my $biblio ! my $subtitle = checkinp($input->param('subtitle')); ! my $subject = checkinp($input->param('subject')); ! my $addauthor = checkinp($input->param('additionalauthor')); ! my $force = $input->param('Force'); ! my %data; ! my @sub; ! my @subs; ! my @names; ! my $count; ! my $error; ! ! &modbiblio($biblio); ! &modsubtitle($bibnum, $subtitle); ! &modaddauthor($bibnum, $addauthor); ! ! $subject = uc($subject); ! @sub = split(/\|/, $subject); ! $count = @sub; ! ! for (my $i = 0; $i < $count; $i++) { ! $sub[$i] =~ s/ +$//; ! } # for ! ! $error = &modsubject($bibnum,$force,@sub); if ($error ne ''){ ! print $input->header; ! print startpage(); ! print startmenu(); ! print $error; ! @subs = split('\n',$error); ! print "<p> Click submit to force the subject"; ! @names = $input->param; ! $count = @names; ! for (my $i = 0; $i < $count; $i++) { ! if ($names[$i] ne 'Force') { ! my $value = $input->param("$names[$i]"); ! $data{$names[$i]} = "hidden\t$value\t$i"; ! } # if ! } # for ! $data{"Force"} = "hidden\t$subs[0]\t$count"; ! print mkform3('updatebiblio.pl', %data); ! print endmenu(); ! print endpage(); } else { ! print $input->redirect("detail.pl?type=intra&bib=$bibnum"); ! } # else sub checkinp{ my ($inp)=@_; ! $inp =~ s/\'/\\\'/g; ! $inp =~ s/\"/\\\"/g; return($inp); }

1 0

CVS: koha/acqui addorder.pl,1.3,1.4 finishreceive.pl,1.2,1.3
by Gynn Lomax 08 May '02

08 May '02

Update of /cvsroot/koha/koha/acqui In directory usw-pr-cvs1:/tmp/cvs-serv16527/acqui Modified Files: addorder.pl finishreceive.pl Log Message: Update to catalogue to allow change of biblio abstracts. Related modifications to acqui system to match changes in Acquisition.pm detail.pm changed to show abstract - still working on how to show url's Index: addorder.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** addorder.pl 15 Apr 2002 05:33:33 -0000 1.3 --- addorder.pl 9 May 2002 03:01:40 -0000 1.4 *************** *** 8,18 **** use C4::Output; use C4::Acquisitions; - #use Date::Manip; my $input = new CGI; - #print $input->header; - #print startpage(); - #print startmenu('acquisitions'); - #print $input->dump; my $existing=$input->param('existing'); my $title=$input->param('title'); --- 8,13 ---- *************** *** 40,44 **** my $ecost=$input->param('ecost'); my $gst=$input->param('GST'); - #check to see if orderexists my $orderexists=$input->param('orderexists'); --- 35,38 ---- *************** *** 48,59 **** if ($existing eq 'no'){ #if it doesnt create it ! $bibnum = &newbiblio({ title => $title, ! author =>$author, ! copyright => $copyright }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, ! itemtype => $itemtype, ! isben => $isbn }); newsubtitle($bibnum); ! modbiblio($bibnum,$title,$author,$copyright,$series); } else { $bibnum=$input->param('biblio'); --- 42,57 ---- if ($existing eq 'no'){ #if it doesnt create it ! $bibnum = &newbiblio({ title => $title?$title:"", ! author => $author?$author:"", ! copyright => $copyright?$copyright:"" }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, ! itemtype => $itemtype?$itemtype:"", ! isben => $isbn?$isbn:"" }); newsubtitle($bibnum); ! modbiblio({ biblionumber => $bibnum, ! title => $title?$title:"", ! author => $author?$author:"", ! copyrightdate => $copyright?$copyright:"", ! series => $series?$series:"" }); } else { $bibnum=$input->param('biblio'); *************** *** 63,69 **** $bibitemnum=newbiblioitem($bibnum,$itemtype,$isbn); } ! modbiblio($bibnum,$title,$author,$copyright,$series); } ! if ($orderexists ne ''){ modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst); }else { --- 61,71 ---- $bibitemnum=newbiblioitem($bibnum,$itemtype,$isbn); } ! modbiblio({ biblionumber => $bibnum, ! title => $title?$title:"", ! author => $author?$author:"", ! copyrightdate => $copyright?$copyright:"", ! series => $series?$series:"" }); } ! if ($orderexists ne '') { modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst); }else { *************** *** 71,76 **** } } else { - #print $input->header; - #print "del"; $bibnum=$input->param('biblio'); delorder($bibnum,$ordnum); --- 73,76 ---- *************** *** 78,82 **** print $input->redirect("newbasket.pl?id=$supplier&basket=$basketno"); - #print $input->dump; - #print endmenu('acquisitions'); - #print endpage(); --- 78,79 ---- Index: finishreceive.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** finishreceive.pl 29 Apr 2002 05:25:41 -0000 1.2 --- finishreceive.pl 9 May 2002 03:01:40 -0000 1.3 *************** *** 14,18 **** my $user=$input->remote_user; #print $input->dump; ! my $biblio=$input->param('biblio'); my $ordnum=$input->param('ordnum'); my $quantrec=$input->param('quantityrec'); --- 14,18 ---- my $user=$input->remote_user; #print $input->dump; ! my $biblionumber = $input->param('biblio'); my $ordnum=$input->param('ordnum'); my $quantrec=$input->param('quantityrec'); *************** *** 21,25 **** my $cost=$input->param('cost'); my $invoiceno=$input->param('invoice'); - my $id=$input->param('id'); my $bibitemno=$input->param('biblioitemnum'); my $data=bibitemdata($bibitemno); --- 21,24 ---- *************** *** 38,47 **** my $itemtype=$input->param('format'); my $isbn=$input->param('ISBN'); ! my $series=$input->param('Series'); ! my $bookseller=$input->param('bookseller'); ! $id=$bookseller; ! my $title=$input->param('title'); ! my $author=$input->param('author'); ! my $copyright=$input->param('copyright'); if ($quantrec != 0){ --- 37,49 ---- my $itemtype=$input->param('format'); my $isbn=$input->param('ISBN'); ! my $bookseller = $input->param('bookseller'); ! my $id = $bookseller; ! my $biblio = { ! biblionumber => $biblionumber, ! title => $input->param('title')?$input->param('title'):"", ! author => $input->param('author')?$input->param('author'):"", ! copyrightdate => $input->param('copyright')?$input->param('copyright'):"", ! series => $input->param('Series')?$input->param('Series'):"" ! }; # my $biblio if ($quantrec != 0){ *************** *** 60,69 **** # print "$bibitemno"; $class="Periodical"; ! $bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class); # print "here $bibitemno"; } if ($quantity != 0){ ! receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund); ! modbiblio($biblio,$title,$author,$copyright,$series); modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size); #print $notes; --- 62,71 ---- # print "$bibitemno"; $class="Periodical"; ! $bibitemno=newbiblioitem($biblionumber,$itemtype,$isbn,$volinf,$class); # print "here $bibitemno"; } if ($quantity != 0){ ! receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund); ! modbiblio($biblio); modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size); #print $notes; *************** *** 81,85 **** } my ($error) = newitems({ biblioitemnumber => $bibitemno, ! biblionumber => $biblio, replacementprice => $replacement, price => $cost, --- 83,87 ---- } my ($error) = newitems({ biblioitemnumber => $bibitemno, ! biblionumber => $biblionumber, replacementprice => $replacement, price => $cost, *************** *** 100,104 **** } else { print $input->header; ! delorder($biblio,$ordnum); print $input->redirect("/acquisitions/"); } --- 102,106 ---- } else { print $input->header; ! delorder($biblionumber,$ordnum); print $input->redirect("/acquisitions/"); }

1 0

CVS: koha/C4 Acquisitions.pm,1.7,1.8 Output.pm,1.6,1.7 Search.pm,1.21,1.22
by Gynn Lomax 08 May '02

08 May '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv21556 Modified Files: Acquisitions.pm Output.pm Search.pm Log Message: Update to catalogue to allow change of biblio abstracts. Related modifications to acqui system to match changes in Acquisition.pm detail.pm changed to show abstract - still working on how to show url's Index: Acquisitions.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Acquisitions.pm 3 May 2002 02:47:33 -0000 1.7 --- Acquisitions.pm 9 May 2002 01:07:36 -0000 1.8 *************** *** 339,356 **** sub branches { ! my $dbh=C4Connect; ! my $query="Select * from branches"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my @results; ! my $i=0; ! while (my $data=$sth->fetchrow_hashref){ ! $results[$i]=$data; ! $i++; ! } ! $sth->finish; ! $dbh->disconnect; ! return($i,@results); ! } sub bookfundbreakdown { --- 339,358 ---- sub branches { ! my $dbh = C4Connect; ! my $query = "Select * from branches"; ! my $sth = $dbh->prepare($query); ! my $i = 0; ! my @results; ! ! $sth->execute; ! while (my $data = $sth->fetchrow_hashref) { ! $results[$i] = $data; ! $i++; ! } # while ! ! $sth->finish; ! $dbh->disconnect; ! return($i, @results); ! } # sub branches sub bookfundbreakdown { *************** *** 420,436 **** } sub modbiblio { ! my ($bibnum, $title, $author, $copyright, $seriestitle, $serial, $unititle, $notes)=@_; my $dbh = C4Connect; ! my $query = "Update biblio set ! title = '$title', ! author = '$author', ! copyrightdate = '$copyright', ! seriestitle = '$seriestitle', ! serial = '$serial', ! unititle = '$unititle', ! notes = '$notes' ! where biblionumber = $bibnum"; ! my $sth = $dbh->prepare($query); $sth->execute; --- 422,452 ---- } + sub modbiblio { ! my ($biblio) = @_; my $dbh = C4Connect; ! my $query; ! my $sth; ! ! $biblio->{'title'} = $dbh->quote($biblio->{'title'}); ! $biblio->{'author'} = $dbh->quote($biblio->{'author'}); ! $biblio->{'abstract'} = $dbh->quote($biblio->{'abstract'}); ! $biblio->{'copyrightdate'} = $dbh->quote($biblio->{'copyrightdate'}); ! $biblio->{'seriestitle'} = $dbh->quote($biblio->{'serirestitle'}); ! $biblio->{'serial'} = $dbh->quote($biblio->{'serial'}); ! $biblio->{'unititle'} = $dbh->quote($biblio->{'unititle'}); ! $biblio->{'notes'} = $dbh->quote($biblio->{'notes'}); ! ! $query = "Update biblio set ! title = $biblio->{'title'}, ! author = $biblio->{'author'}, ! abstract = $biblio->{'abstract'}, ! copyrightdate = $biblio->{'copyrightdate'}, ! seriestitle = $biblio->{'seriestitle'}, ! serial = $biblio->{'serial'}, ! unititle = $biblio->{'unititle'}, ! notes = $biblio->{'notes'} ! where biblionumber = $biblio->{'biblionumber'}"; ! $sth = $dbh->prepare($query); $sth->execute; *************** *** 438,453 **** $sth->finish; $dbh->disconnect; ! return($bibnum); ! } sub modsubtitle { ! my ($bibnum,$subtitle)=@_; ! my $dbh=C4Connect; ! my $query="update bibliosubtitle set subtitle='$subtitle' where biblionumber=$bibnum"; ! my $sth=$dbh->prepare($query); $sth->execute; $sth->finish; $dbh->disconnect; ! } sub modaddauthor { --- 454,474 ---- $sth->finish; $dbh->disconnect; ! return($biblio->{'biblionumber'}); ! } # sub modbiblio ! sub modsubtitle { ! my ($bibnum, $subtitle) = @_; ! my $dbh = C4Connect; ! my $query = "update bibliosubtitle set ! subtitle = '$subtitle' ! where biblionumber = $bibnum"; ! my $sth = $dbh->prepare($query); ! $sth->execute; $sth->finish; $dbh->disconnect; ! } # sub modsubtitle ! sub modaddauthor { *************** *** 476,537 **** sub modsubject { ! my ($bibnum,$force,@subject)=@_; ! my $dbh=C4Connect; ! my $count=@subject; my $error; ! for (my $i=0;$i<$count;$i++){ ! $subject[$i]=~ s/^ //g; ! $subject[$i]=~ s/ $//g; ! my $query="select * from catalogueentry where entrytype='s' and ! catalogueentry='$subject[$i]'"; ! my $sth=$dbh->prepare($query); $sth->execute; ! if (my $data=$sth->fetchrow_hashref){ ! } else { ! if ($force eq $subject[$i]){ ! #subject not in aut, chosen to force anway ! #so insert into cataloguentry so its in auth file ! $query="Insert into catalogueentry (entrytype,catalogueentry) ! values ('s','$subject[$i]')"; ! my $sth2=$dbh->prepare($query); ! # print $query; $sth2->execute; $sth2->finish; ! } else { ! $error="$subject[$i]\n does not exist in the subject authority file"; ! $query= "Select * from catalogueentry where ! entrytype='s' and (catalogueentry like '$subject[$i] %' or ! catalogueentry like '% $subject[$i] %' or catalogueentry like ! '% $subject[$i]')"; ! my $sth2=$dbh->prepare($query); ! # print $query; $sth2->execute; ! while (my $data=$sth2->fetchrow_hashref){ ! $error=$error."<br>$data->{'catalogueentry'}"; ! } $sth2->finish; ! # $error=$error."<br>$query"; ! } ! } $sth->finish; ! } ! if ($error eq ''){ ! my $query="Delete from bibliosubject where biblionumber=$bibnum"; ! # print $query; ! my $sth=$dbh->prepare($query); ! # print $query; $sth->execute; $sth->finish; ! for (my $i=0;$i<$count;$i++){ ! $sth=$dbh->prepare("Insert into bibliosubject values ('$subject[$i]',$bibnum)"); ! # print $subject[$i]; $sth->execute; $sth->finish; ! } ! } $dbh->disconnect; return($error); ! } sub modbibitem { --- 497,566 ---- sub modsubject { ! my ($bibnum, $force, @subject) = @_; ! my $dbh = C4Connect; ! my $count = @subject; my $error; ! for (my $i = 0; $i < $count; $i++) { ! $subject[$i] =~ s/^ //g; ! $subject[$i] =~ s/ $//g; ! my $query = "select * from catalogueentry ! where entrytype = 's' ! and catalogueentry = '$subject[$i]'"; ! my $sth = $dbh->prepare($query); $sth->execute; ! ! if (my $data = $sth->fetchrow_hashref) { } else { ! if ($force eq $subject[$i]) { ! ! # subject not in aut, chosen to force anway ! # so insert into cataloguentry so its in auth file ! $query = "Insert into catalogueentry ! (entrytype,catalogueentry) ! values ('s','$subject[$i]')"; ! my $sth2 = $dbh->prepare($query); ! $sth2->execute; $sth2->finish; ! ! } else { ! ! $error = "$subject[$i]\n does not exist in the subject authority file"; ! $query = "Select * from catalogueentry ! where entrytype = 's' ! and (catalogueentry like '$subject[$i] %' ! or catalogueentry like '% $subject[$i] %' ! or catalogueentry like '% $subject[$i]')"; ! my $sth2 = $dbh->prepare($query); ! $sth2->execute; ! while (my $data = $sth2->fetchrow_hashref) { ! $error = $error."<br>$data->{'catalogueentry'}"; ! } # while $sth2->finish; ! } # else ! } # else $sth->finish; ! } # else ! ! if ($error eq '') { ! my $query = "Delete from bibliosubject where biblionumber = $bibnum"; ! my $sth = $dbh->prepare($query); ! $sth->execute; $sth->finish; ! ! for (my $i = 0; $i < $count; $i++) { ! $sth = $dbh->prepare("Insert into bibliosubject ! values ('$subject[$i]', $bibnum)"); ! $sth->execute; $sth->finish; ! } # for ! } # if ! $dbh->disconnect; return($error); ! } # sub modsubject sub modbibitem { Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Output.pm 21 Apr 2002 04:45:21 -0000 1.6 --- Output.pm 9 May 2002 01:07:36 -0000 1.7 *************** *** 216,229 **** } ! sub mkform3{ ! my ($action,%inputs)=@_; ! my $string="<form action=$action method=post>\n"; ! $string=$string.mktablehdr(); my $key; ! my @keys=sort keys %inputs; my @order; ! my $count=@keys; ! my $i2=0; ! while ( $i2<$count) { my $value=$inputs{$keys[$i2]}; my @data=split('\t',$value); --- 216,229 ---- } ! sub mkform3 { ! my ($action, %inputs) = @_; ! my $string = "<form action=\"$action\" method=\"post\">\n"; ! $string .= mktablehdr(); my $key; ! my @keys = sort(keys(%inputs)); my @order; ! my $count = @keys; ! my $i2 = 0; ! while ($i2 < $count) { my $value=$inputs{$keys[$i2]}; my @data=split('\t',$value); Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** Search.pm 7 May 2002 00:08:20 -0000 1.21 --- Search.pm 9 May 2002 01:07:36 -0000 1.22 *************** *** 726,751 **** sub bibdata { ! 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); $sth->execute; ! my $data=$sth->fetchrow_hashref; $sth->finish; ! $query="Select * from bibliosubject where biblionumber='$bibnum'"; $sth=$dbh->prepare($query); $sth->execute; ! while (my $dat=$sth->fetchrow_hashref){ ! $data->{'subject'}.=" | $dat->{'subject'}"; } ! #print $query; $sth->finish; $dbh->disconnect; --- 726,751 ---- sub bibdata { ! 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"; ! ! my $sth = $dbh->prepare($query); $sth->execute; ! my $data = $sth->fetchrow_hashref; $sth->finish; ! ! $query = "Select * from bibliosubject where biblionumber = '$bibnum'"; $sth=$dbh->prepare($query); $sth->execute; ! while (my $dat = $sth->fetchrow_hashref){ ! $data->{'subject'} .= " | $dat->{'subject'}"; } ! $sth->finish; $dbh->disconnect;

1 0