[Koha-cvs] koha acqui/finishreceive.pl C4/AuthoritiesMarc.... [rel_3_0]
paul poulain
paul at koha-fr.org
Fri Nov 17 12:17:31 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 06/11/17 11:17:31
Modified files:
acqui : finishreceive.pl
C4 : AuthoritiesMarc.pm Search.pm
catalogue : MARCdetail.pl moredetail.pl search.pl
maint : catmaintain.pl shiftbib.pl
members : moremember.pl
misc/translator: tmpl_process3.pl
opac : opac-moredetail.pl
reserve : modrequest.pl placerequest.pl request.pl
rss : lastAcquired-1.0.tmpl lastAcquired-2.0.tmpl
lastAcquired.tmpl rss.pl
serials : serials-collection.pl
Log message:
code cleaning : removing use of "bib", and replacing with "biblionumber"
WARNING : I tried to do carefully, but there are probably some mistakes.
So if you encounter a problem you didn't have before, look for this change !!!
anyway, I urge everybody to use only "biblionumber", instead of "bib", "bi", "biblio" or anything else. will be easier to maintain !!!
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/finishreceive.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.20.2.1&r2=1.20.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.2&r2=1.28.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.25&r2=1.120.2.26
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.2&r2=1.5.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/moredetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/maint/catmaintain.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7&r2=1.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/maint/shiftbib.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4&r2=1.4.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.6&r2=1.28.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/misc/translator/tmpl_process3.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.22&r2=1.22.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-moredetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.2&r2=1.9.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/modrequest.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/placerequest.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.5&r2=1.6.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/rss/lastAcquired-1.0.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/rss/lastAcquired-2.0.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/rss/lastAcquired.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/rss/rss.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-collection.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
Patches:
Index: acqui/finishreceive.pl
===================================================================
RCS file: /sources/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -b -r1.20.2.1 -r1.20.2.2
--- acqui/finishreceive.pl 30 Aug 2006 16:38:51 -0000 1.20.2.1
+++ acqui/finishreceive.pl 17 Nov 2006 11:17:30 -0000 1.20.2.2
@@ -191,7 +191,7 @@
if ($catview) {
&moditem($itemhash);
print $input->redirect(
-"/cgi-bin/koha/moredetail.pl?type=$itemtype&bib=$biblionumber&bi=$biblioitemnumber"
+"/cgi-bin/koha/moredetail.pl?type=$itemtype&biblionumber=$biblionumber&bi=$biblioitemnumber"
);
}
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -b -r1.28.2.2 -r1.28.2.3
--- C4/AuthoritiesMarc.pm 12 Oct 2006 22:04:47 -0000 1.28.2.2
+++ C4/AuthoritiesMarc.pm 17 Nov 2006 11:17:30 -0000 1.28.2.3
@@ -875,6 +875,7 @@
}#foreach tagfield
my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,"") ;
if ($update==1){
+ # FIXME : this NEWmodbiblio does not exist anymore...
&NEWmodbiblio($dbh,$marcrecord,$oldbiblio->{'biblionumber'},undef,"0000") ;
}
@@ -892,8 +893,15 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.28.2.2 2006/10/12 22:04:47 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.3 2006/11/17 11:17:30 tipaul Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.3 2006/11/17 11:17:30 tipaul
+# code cleaning : removing use of "bib", and replacing with "biblionumber"
+#
+# WARNING : I tried to do carefully, but there are probably some mistakes.
+# So if you encounter a problem you didn't have before, look for this change !!!
+# anyway, I urge everybody to use only "biblionumber", instead of "bib", "bi", "biblio" or anything else. will be easier to maintain !!!
+#
# Revision 1.28.2.2 2006/10/12 22:04:47 hdl
# Authorities working with zebra.
# zebra Configuration files are comitted next.
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.25
retrieving revision 1.120.2.26
diff -u -b -r1.120.2.25 -r1.120.2.26
--- C4/Search.pm 16 Nov 2006 09:08:38 -0000 1.120.2.25
+++ C4/Search.pm 17 Nov 2006 11:17:30 -0000 1.120.2.26
@@ -39,7 +39,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.120.2.25 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.26 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -2771,6 +2771,7 @@
my $tmprecord = MARC::Record->new();
$tmprecord->encoding('UTF-8');
my $tmptitle;
+ # srote the minimal record in author/title (depending on MARC flavour)
if (C4::Context->preference("marcflavour") eq "UNIMARC") {
$tmptitle = MARC::Field->new( '200',' ',' ',
a => $term,
@@ -2780,7 +2781,6 @@
a => $term,
b => $occ);
}
- warn $tmptitle->as_formatted;
$tmprecord->append_fields($tmptitle);
$results_hash->{'RECORDS'}[$j] = $tmprecord->as_usmarc();
}
Index: catalogue/MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/MARCdetail.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- catalogue/MARCdetail.pl 2 Nov 2006 16:17:37 -0000 1.5.2.2
+++ catalogue/MARCdetail.pl 17 Nov 2006 11:17:30 -0000 1.5.2.3
@@ -65,10 +65,6 @@
my $dbh=C4::Context->dbh;
my $biblionumber=$query->param('biblionumber');
-if (!$biblionumber){
- $biblionumber = $query->param('bib');
-}
-# my $bibid = $query->param('bibid');
my $itemtype = $query->param('frameworkcode');
my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
Index: catalogue/moredetail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/moredetail.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- catalogue/moredetail.pl 3 Nov 2006 08:29:52 -0000 1.4.2.1
+++ catalogue/moredetail.pl 17 Nov 2006 11:17:30 -0000 1.4.2.2
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-# $Id: moredetail.pl,v 1.4.2.1 2006/11/03 08:29:52 toins Exp $
+# $Id: moredetail.pl,v 1.4.2.2 2006/11/17 11:17:30 tipaul Exp $
# Copyright 2000-2003 Katipo Communications
#
@@ -50,7 +50,7 @@
# get variables
-my $biblionumber=$query->param('bib');
+my $biblionumber=$query->param('biblionumber');
my $title=$query->param('title');
my $bi=$query->param('bi');
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- catalogue/search.pl 10 Nov 2006 16:40:52 -0000 1.1.2.6
+++ catalogue/search.pl 17 Nov 2006 11:17:30 -0000 1.1.2.7
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.6 2006/11/10 16:40:52 toins Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.7 2006/11/17 11:17:30 tipaul Exp $
#
# Copyright 2006 LibLime
#
@@ -252,10 +252,10 @@
# The following should only be loaded if we're bringing up the advanced search template
if ( $template_name eq "catalogue/advsearch.tmpl" ) {
# load the servers (used for searching -- to do federated searching, etc.)
- my $primary_servers_loop = displayPrimaryServers();
+ my $primary_servers_loop;# = displayPrimaryServers();
$template->param(outer_servers_loop => $primary_servers_loop,);
- my $secondary_servers_loop = displaySecondaryServers();
+ my $secondary_servers_loop;# = displaySecondaryServers();
$template->param(outer_sup_servers_loop => $secondary_servers_loop,);
# load the limit types (icon-based limits in advanced search page)
@@ -271,7 +271,7 @@
# FIXME: this stuff should be cleaned up a bit and the html should be turned
# into flags for the template -- I'll work on that soon -- JF
my @search_boxes_array;
- my $search_boxes_count = 3; # should be a syspref
+ my $search_boxes_count = 1; # should be a syspref
for (my $i=0;$i<=$search_boxes_count;$i++) {
my $this_index =[@$indexes]; # clone the data, not just the reference
#@$this_index[$i]->{selected} = "selected";
@@ -348,7 +348,7 @@
@servers = split("\0",$params->{'server'}) if $params->{'server'};
unless (@servers) {
#FIXME: this should be handled using Context.pm
- @servers = ("biblioserver","");
+ @servers = ("biblioserver");
# @servers = C4::Context->config("biblioserver");
}
Index: maint/catmaintain.pl
===================================================================
RCS file: /sources/koha/koha/maint/Attic/catmaintain.pl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- maint/catmaintain.pl 4 Jul 2006 14:36:52 -0000 1.7
+++ maint/catmaintain.pl 17 Nov 2006 11:17:30 -0000 1.7.2.1
@@ -74,13 +74,13 @@
push @it, {
'title' => $results->[$i]->{'title'},
'author' => $results->[$i]->{'author'},
- 'undelete' => "type=finun&bib=$results->[$i]->{'biblionumber'}",
+ 'undelete' => "type=finun&biblionumber=$results->[$i]->{'biblionumber'}",
};
}
%params = ('loop' => \@it);
} elsif ($type eq 'finun'){
- my $bib=$input->param('bib');
+ my $biblionumber=$input->param('biblionumber');
undeletebib($bib);
} elsif ($type eq 'fixitemtype'){
Index: maint/shiftbib.pl
===================================================================
RCS file: /sources/koha/koha/maint/Attic/shiftbib.pl,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -b -r1.4 -r1.4.8.1
--- maint/shiftbib.pl 12 Jan 2004 16:55:48 -0000 1.4
+++ maint/shiftbib.pl 17 Nov 2006 11:17:30 -0000 1.4.8.1
@@ -32,13 +32,12 @@
print $input->header;
my $type=$input->param('type');
my $bi=$input->param('bi');
-my $bib=$input->param('bib');
+my $biblionumber=$input->param('biblionumber');
my $type=$input->param('type'); # FIXME - Redundant
print startpage();
print startmenu('catalog');
if ($type eq 'change'){
- my $biblionumber=$input->param('biblionumber');
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("Select * from biblio where biblionumber=?");
$sth->execute($biblionumber);
@@ -49,12 +48,12 @@
Are you sure?
<p>
";
- print "<a href=/cgi-bin/koha/maint/shiftbib.pl?type=update&bi=$bi&bib=$biblionumber>Yes</a>";
+ print "<a href=/cgi-bin/koha/maint/shiftbib.pl?type=update&bi=$bi&biblionumber=$biblionumber>Yes</a>";
} elsif ($type eq 'update'){
- shiftgroup($bib,$bi);
+ shiftgroup($biblionumber,$bi);
print "Shifted";
} else {
- print "Shifting Group $bi from biblio $bib to <p>";
+ print "Shifting Group $bi from biblio $biblionumber to <p>";
print "<form action=/cgi-bin/koha/maint/shiftbib.pl method=post>";
print "<input name=bi type=hidden value=$bi>";
print "<input type=hidden name=type value=change>";
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -b -r1.28.2.6 -r1.28.2.7
--- members/moremember.pl 15 Nov 2006 15:47:07 -0000 1.28.2.6
+++ members/moremember.pl 17 Nov 2006 11:17:30 -0000 1.28.2.7
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.28.2.6 2006/11/15 15:47:07 btoumi Exp $
+# $Id: moremember.pl,v 1.28.2.7 2006/11/17 11:17:30 tipaul Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -191,7 +191,7 @@
#check item is not reserved
my ($restype,$reserves)=CheckReserves($issue->[$i]{'itemnumber'});
if ($restype){
-# print "<TD><a href=/cgi-bin/koha/reserve/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>";
+# print "<TD><a href=/cgi-bin/koha/reserve/request.pl?biblionumber=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>";
# } elsif ($issue->[$i]->{'renewals'} > 0) {
# print "<TD>Previously Renewed - no renewals</td></tr>";
$row{'norenew'}=1;
Index: misc/translator/tmpl_process3.pl
===================================================================
RCS file: /sources/koha/koha/misc/translator/tmpl_process3.pl,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -b -r1.22 -r1.22.2.1
--- misc/translator/tmpl_process3.pl 4 May 2005 09:01:59 -0000 1.22
+++ misc/translator/tmpl_process3.pl 17 Nov 2006 11:17:30 -0000 1.22.2.1
@@ -255,17 +255,18 @@
unless defined $href->{'""'};
$charset_out = TmplTokenizer::charset_canon $2
if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/;
- for my $msgid (keys %$href) {
- if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) {
- my $candidate = TmplTokenizer::charset_canon $2;
- die "Conflicting charsets in msgid: $charset_in vs $candidate\n"
- if defined $charset_in && $charset_in ne $candidate;
- $charset_in = $candidate;
- }
- }
+ $charset_in = 'utf-8';
+# for my $msgid (keys %$href) {
+# if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) {
+# my $candidate = TmplTokenizer::charset_canon $2;
+# die "Conflicting charsets in msgid: $charset_in vs $candidate => $msgid\n"
+# if defined $charset_in && $charset_in ne $candidate;
+# $charset_in = $candidate;
+# }
+# }
}
if (!defined $charset_in) {
- $charset_in = TmplTokenizer::charset_canon 'iso8859-1';
+ $charset_in = TmplTokenizer::charset_canon 'utf-8';
warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n";
}
Index: opac/opac-moredetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-moredetail.pl,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- opac/opac-moredetail.pl 19 Sep 2006 22:30:38 -0000 1.9.2.2
+++ opac/opac-moredetail.pl 17 Nov 2006 11:17:30 -0000 1.9.2.3
@@ -32,14 +32,14 @@
print startmenu($type);
my $blah;
-my $bib=$input->param('bib');
+my $biblionumber=$input->param('bib');
my $title=$input->param('title');
my $bi=$input->param('bi');
my $data=bibitemdata($bi);
my (@items)=itemissues($bi);
-my $ordernum = GetOrderNumber($bib,$bi);
+my $ordernum = GetOrderNumber($biblionumber,$bi);
my $order = GetOrder($ordernum);
#print @items;
@@ -59,18 +59,18 @@
$dewey=~ s/\.$//;
print <<printend
<br>
-<a href=/cgi-bin/koha/reserve/request.pl?bib=$bib><img src=/images/requests.gif width=120 height=42 border=0 align=right border=0></a>
+<a href=/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber><img src=/images/requests.gif width=120 height=42 border=0 align=right border=0></a>
printend
;
if ($type eq 'catmain'){
print "<FONT SIZE=6><em>Catalogue Maintenance</em></FONT><br>";
}
print <<printend
-<FONT SIZE=6><em><a href=/cgi-bin/koha/catalogue/detail.pl?bib=$bib&type=intra>$data->{'title'} ($data->{'author'})</a></em></FONT><P>
+<FONT SIZE=6><em><a href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&type=intra>$data->{'title'} ($data->{'author'})</a></em></FONT><P>
<p>
<form action=/cgi-bin/koha/modbibitem.pl>
<input type=hidden name=bibitem value=$bi>
-<input type=hidden name=biblio value=$bib>
+<input type=hidden name=biblio value=$biblionumber>
<!-------------------BIBLIO ITEM------------>
<TABLE CELLSPACING=0 CELLPADDING=5 border=1 align=left>
<TR VALIGN=TOP>
@@ -82,7 +82,7 @@
<INPUT TYPE="image" name="delete" VALUE="delete" height=42 WIDTH=93 BORDER=0 src="/images/delete-mem.gif">
<br>
<FONT SIZE=2 face="arial, helvetica">
-<b>Biblionumber:</b> $bib<br>
+<b>Biblionumber:</b> $biblionumber<br>
<b>Item Type:</b> $data->{'itemtype'}<br>
<b>Loan Length:</b> $data->{'loanlength'}<br>
<b>Rental Charge:</b> $data->{'rentalcharge'}<br>
@@ -101,7 +101,7 @@
printend
;
if ($type eq 'catmain'){
- print "<br><a href=/cgi-bin/koha/maint/shiftbib.pl?bi=$data->{'biblioitemnumber'}&bib=$data->{'biblionumber'}>Shift to another biblio</a>";
+ print "<br><a href=/cgi-bin/koha/maint/shiftbib.pl?bi=$data->{'biblioitemnumber'}&biblionumber=$data->{'biblionumber'}>Shift to another biblio</a>";
}
print <<printend
@@ -167,7 +167,7 @@
<b>Paid for:</b> $items[$i]->{'paidfor'}<br>
<b>Notes:</b> $items[$i]->{'itemnotes'}<br>
<b>Renewals:</b> $items[$i]->{'renewals'}<br>
-<b><a href=/cgi-bin/koha/acqui/orderreceive.pl?recieve=$ordernum&biblio=$bib&invoice=$order->{'booksellerinvoicenumber'}&catview=yes>Accession</a> Date: $items[$i]->{'dateaccessioned'}<br>
+<b><a href=/cgi-bin/koha/acqui/orderreceive.pl?recieve=$ordernum&biblio=$biblionumber&invoice=$order->{'booksellerinvoicenumber'}&catview=yes>Accession</a> Date: $items[$i]->{'dateaccessioned'}<br>
printend
;
if ($items[$i]->{'wthdrawn'} eq '1'){
@@ -179,7 +179,7 @@
<b>Cancelled: $items[$i]->{'wthdrawn'}<br>
<b>Total Issues:</b> $items[$i]->{'issues'}<br>
<b>Group Number:</b> $bi <br>
-<b>Biblio number:</b> $bib <br>
+<b>Biblio number:</b> $biblionumber <br>
Index: reserve/modrequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/modrequest.pl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- reserve/modrequest.pl 20 Sep 2006 15:47:49 -0000 1.2.2.1
+++ reserve/modrequest.pl 17 Nov 2006 11:17:30 -0000 1.2.2.2
@@ -49,5 +49,5 @@
if ($from eq 'borrower'){
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrower[0]");
} else {
- print $input->redirect("/cgi-bin/koha/reserve/request.pl?bib=$biblionumber[0]");
+ print $input->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
}
Index: reserve/placerequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/placerequest.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- reserve/placerequest.pl 20 Sep 2006 15:47:49 -0000 1.3.2.2
+++ reserve/placerequest.pl 17 Nov 2006 11:17:30 -0000 1.3.2.3
@@ -35,7 +35,7 @@
my @bibitems=$input->param('biblioitem');
my @reqbib=$input->param('reqbib');
-my $biblio=$input->param('biblio');
+my $biblionumber=$input->param('biblio');
my $borrower=$input->param('member');
my $notes=$input->param('notes');
my $branch=$input->param('pickup');
@@ -78,15 +78,15 @@
my $const;
if ($input->param('request') eq 'any'){
$const='a';
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
+ CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblionumber,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
} elsif ($reqbib[0] ne ''){
$const='o';
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
+ CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblionumber,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
} else {
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
+ CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
}
-print $input->redirect("request.pl?bib=$biblio");
+print $input->redirect("request.pl?biblionumber=$biblionumber");
} elsif ($bornum eq ''){
print $input->header();
print "Invalid card number please try again";
Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -b -r1.6.2.5 -r1.6.2.6
--- reserve/request.pl 17 Oct 2006 13:47:41 -0000 1.6.2.5
+++ reserve/request.pl 17 Nov 2006 11:17:30 -0000 1.6.2.6
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: request.pl,v 1.6.2.5 2006/10/17 13:47:41 alaurin Exp $
+# $Id: request.pl,v 1.6.2.6 2006/11/17 11:17:30 tipaul Exp $
#script to place reserves/requests
#writen 2/1/00 by chris at katipo.oc.nz
@@ -55,8 +55,8 @@
});
# get biblio information....
-my $bib = $input->param('bib');
-my $dat = bibdata($bib);
+my $biblionumber = $input->param('biblionumber');
+my $dat = bibdata($biblionumber);
# Select borrowers infos
my $findborrower = $input->param('findborrower');
@@ -161,7 +161,7 @@
}
# get existing reserves .....
-my ($count, $reserves) = FindReserves($bib, undef);
+my ($count, $reserves) = FindReserves($biblionumber, undef);
my $totalcount = $count;
my $alreadyreserved;
@@ -193,7 +193,7 @@
my @branchcodes;
my %itemnumbers_of_biblioitem;
-my @itemnumbers = @{get_itemnumbers_of($bib)->{$bib}};
+my @itemnumbers = @{get_itemnumbers_of($biblionumber)->{$biblionumber}};
my $iteminfos_of = GetItemInfosOf(@itemnumbers);
foreach my $itemnumber (@itemnumbers) {
@@ -407,7 +407,7 @@
optionloop =>\@optionloop,
bibitemloop => \@bibitemloop,
date => $date,
- bib => $bib,
+ biblionumber => $biblionumber,
findborrower => $findborrower,
cardnumber => $cardnumber,
CGIselectborrower => $CGIselectborrower,
Index: rss/lastAcquired-1.0.tmpl
===================================================================
RCS file: /sources/koha/koha/rss/lastAcquired-1.0.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -b -r1.1 -r1.1.8.1
--- rss/lastAcquired-1.0.tmpl 11 Aug 2004 20:58:03 -0000 1.1
+++ rss/lastAcquired-1.0.tmpl 17 Nov 2006 11:17:30 -0000 1.1.8.1
@@ -18,21 +18,21 @@
<items>
<rdf:Seq>
<!-- TMPL_LOOP NAME="ITEMS" -->
- <rdf:li resource="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="bibid" -->"/>
+ <rdf:li resource="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"/>
<!-- /TMPL_LOOP -->
</rdf:Seq>
</items>
</channel>
<!-- TMPL_LOOP NAME="ITEMS" -->
- <item rdf:about="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="bibid" -->">
+ <item rdf:about="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
<title><!-- TMPL_VAR NAME="TITLE" --><!-- TMPL_IF NAME="AUTHOR" --> by <!-- TMPL_VAR AUTHOR --><!-- /TMPL_IF --></title>
- <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="bibid" --></link>
+ <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" --></link>
<description><![CDATA[<!-- TMPL_VAR NAME="TITLE" --><!-- TMPL_IF NAME="AUTHOR" --> by <!-- TMPL_VAR NAME="AUTHOR" --><!-- /TMPL_IF -->
<br><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" -->
<br><!-- TMPL_VAR NAME="pages" --><!-- TMPL_VAR NAME="illus" --><!-- TMPL_VAR NAME="size" -->
<!-- TMPL_IF NAME="notes" --><br><br><!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
-<a href="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="bibid" -->">View Details</a> | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="bibid" -->">Reserve this Item</a><!-- TMPL_IF NAME="author" --> | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" -->&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a><!-- /TMPL_IF -->
+<a href="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">View Details</a> | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Reserve this Item</a><!-- TMPL_IF NAME="author" --> | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" -->&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a><!-- /TMPL_IF -->
]]></description>
</item>
<!-- /TMPL_LOOP -->
Index: rss/lastAcquired-2.0.tmpl
===================================================================
RCS file: /sources/koha/koha/rss/lastAcquired-2.0.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -b -r1.1 -r1.1.8.1
--- rss/lastAcquired-2.0.tmpl 11 Aug 2004 20:58:03 -0000 1.1
+++ rss/lastAcquired-2.0.tmpl 17 Nov 2006 11:17:30 -0000 1.1.8.1
@@ -20,7 +20,7 @@
<!-- TMPL_LOOP NAME="ITEMS" -->
<item>
<title><!-- TMPL_VAR NAME="TITLE" --><!-- TMPL_IF NAME="AUTHOR" --> by <!-- TMPL_VAR NAME="AUTHOR" --><!-- /TMPL_IF --></title>
- <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="bibid" --></link>
+ <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" --></link>
<description><![CDATA[<!-- TMPL_VAR NAME="TITLE" --><!-- TMPL_IF NAME="AUTHOR" --> by <!-- TMPL_VAR NAME="AUTHOR" --><!-- /TMPL_IF -->
<br><!-- TMPL_IF NAME="publishercode" --><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --><br><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="pages" --><!-- TMPL_VAR NAME="pages" --><!-- TMPL_VAR NAME="illus" --><!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
Index: rss/lastAcquired.tmpl
===================================================================
RCS file: /sources/koha/koha/rss/lastAcquired.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -b -r1.2 -r1.2.8.1
--- rss/lastAcquired.tmpl 12 Jan 2004 20:00:09 -0000 1.2
+++ rss/lastAcquired.tmpl 17 Nov 2006 11:17:30 -0000 1.2.8.1
@@ -21,7 +21,7 @@
<TMPL_LOOP NAME=ITEMS>
<item>
<title><TMPL_VAR TITLE>, by <TMPL_VAR AUTHOR></title>
- <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="bibid"></link>
+ <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=<TMPL_VAR NAME="biblionumber"></link>
</item>
</TMPL_LOOP>
Index: rss/rss.pl
===================================================================
RCS file: /sources/koha/koha/rss/rss.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- rss/rss.pl 11 Sep 2005 23:55:19 -0000 1.3
+++ rss/rss.pl 17 Nov 2006 11:17:30 -0000 1.3.2.1
@@ -24,9 +24,9 @@
<category><!-- TMPL_VAR NAME="itemtype" --></category>
<description><![CDATA[Call Number: <!-- TMPL_VAR NAME="callno" --><br />
<!-- TMPL_IF NAME="notes" -->Notes: <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
-<a href="https://libcat.nbbc.edu/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="bibid" -->">View Details</a> <!-- TMPL_IF NAME="reservable" -->| <a href="https://libcat.nbbc.edu/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="bibid" -->">Reserve this Item</a><!-- /TMPL_IF -->]]>
+<a href="https://libcat.nbbc.edu/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">View Details</a> <!-- TMPL_IF NAME="reservable" -->| <a href="https://libcat.nbbc.edu/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Reserve this Item</a><!-- /TMPL_IF -->]]>
</description>
- <link>https://libcat.nbbc.edu/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR name="bibid" --></link>
+ <link>https://libcat.nbbc.edu/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" --></link>
</item>
<!-- /TMPL_LOOP -->
Index: serials/serials-collection.pl
===================================================================
RCS file: /sources/koha/koha/serials/Attic/serials-collection.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- serials/serials-collection.pl 13 Nov 2006 09:33:20 -0000 1.1.2.1
+++ serials/serials-collection.pl 17 Nov 2006 11:17:31 -0000 1.1.2.2
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: serials-collection.pl,v 1.1.2.1 2006/11/13 09:33:20 hdl Exp $
+# $Id: serials-collection.pl,v 1.1.2.2 2006/11/17 11:17:31 tipaul Exp $
use strict;
use CGI;
@@ -40,6 +40,14 @@
my $sth;
# my $id;
my ($template, $loggedinuser, $cookie);
+($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "serials/serials-collection.tmpl",
+ query => $query,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {catalogue => 1},
+ debug => 1,
+ });
my $biblionumber = $query->param('biblionumber');
my $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber);
my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
@@ -47,13 +55,6 @@
my $title = $subscriptions->[0]{bibliotitle};
my $yearmin=($subscriptions->[0]{year} eq "manage" && scalar(@$subscriptions)>1)? $subscriptions->[1]{year} :$subscriptions->[0]{year};
my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
-($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "serials/serials-collection.tmpl",
- query => $query,
- type => "intranet",
- authnotrequired => 1,
- debug => 1,
- });
$template->param(
biblionumber => $query->param('biblionumber'),
More information about the Koha-cvs
mailing list