[Koha-cvs] koha acqui/finishreceive.pl acqui/newordersugge... [rel_3_0]
paul poulain
paul at koha-fr.org
Fri Nov 17 14:19:00 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 06/11/17 13:19:00
Modified files:
acqui : finishreceive.pl newordersuggestion.pl
authorities : authorities.pl
barcodes : label-item-search.pl
C4 : Acquisition.pm AuthoritiesMarc.pm Biblio.pm
Maintainance.pm Reserves2.pm Search.pm
Serials.pm
C4/Circulation : Circ2.pm
catalogue : detail.pl detailprint.pl ISBDdetail.pl
issuehistory.pl MARCdetail.pl
cataloguing : addbiblio.pl
cataloguing/value_builder: unimarc_field_4XX.pl
circ : bookcount.pl
export : export.pl marc.pl
koha-tmpl/intranet-tmpl/prog/en/authorities: authorities.tmpl
koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbiblio.tmpl
isbnsearch.tmpl
koha-tmpl/intranet-tmpl/prog/en/circ: bookcount.tmpl
koha-tmpl/intranet-tmpl/prog/en/export: marc.tmpl
koha-tmpl/intranet-tmpl/prog/en/serials: serials-edit.tmpl
koha-tmpl/intranet-tmpl/prog/en/tools: export.tmpl
koha-tmpl/opac-tmpl/prog/en:
opac-authoritiessearchresultlist.tmpl
opac-detail.tmpl
opac-full-serial-issues.tmpl
opac-ISBDdetail.tmpl
opac-MARCdetail.tmpl
opac-reserve.tmpl opac-results.tmpl
opac-searchresults.tmpl
opac-serial-issues.tmpl
opac : opac-detail.pl opac-detailprint.pl
opac-ISBDdetail.pl opac-MARCdetail.pl
opac-moredetail.pl opac-reserve.pl
opac-sendbasket.pl
rss : lastAcquired-2.0.tmpl
serials : serials-recieve.pl
tools : export.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.2&r2=1.20.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/newordersuggestion.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.15.2.2&r2=1.15.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-item-search.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/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.2&r2=1.43.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.3&r2=1.28.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.24&r2=1.178.2.25
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Maintainance.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.18&r2=1.18.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.4&r2=1.46.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.26&r2=1.120.2.27
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.7&r2=1.5.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.14&r2=1.114.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.4&r2=1.6.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/detailprint.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/issuehistory.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.3&r2=1.5.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.12&r2=1.14.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/unimarc_field_4XX.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/bookcount.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/export/export.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/koha/export/marc.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?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/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/isbnsearch.tmpl?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/koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32&r2=1.32.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detailprint.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16&r2=1.16.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14&r2=1.14.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.3&r2=1.9.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.29&r2=1.29.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-sendbasket.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10&r2=1.10.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/rss/lastAcquired-2.0.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.8.1&r2=1.1.8.2
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-recieve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/tools/export.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
Patches:
Index: acqui/finishreceive.pl
===================================================================
RCS file: /sources/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- acqui/finishreceive.pl 17 Nov 2006 11:17:30 -0000 1.20.2.2
+++ acqui/finishreceive.pl 17 Nov 2006 13:18:58 -0000 1.20.2.3
@@ -103,7 +103,7 @@
my $createbibitem =
$input->param('createbibitem'); # user wants to create a new bibitem
-#get additional info on bib and bibitem from dbase for additional needed fields before modbiblio.
+#get additional info on biblionumber and bibitem from db for additional needed fields before modbiblio.
( my $bibliocount, my @biblios ) = &getbiblio($biblionumber);
my @biblioitems = &GetBiblioItemByBiblioNumber($biblionumber);
my $biblioitemcount = scalar @biblioitems;
Index: acqui/newordersuggestion.pl
===================================================================
RCS file: /sources/koha/koha/acqui/newordersuggestion.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- acqui/newordersuggestion.pl 10 Aug 2006 12:58:17 -0000 1.3
+++ acqui/newordersuggestion.pl 17 Nov 2006 13:18:58 -0000 1.3.2.1
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: newordersuggestion.pl,v 1.3 2006/08/10 12:58:17 toins Exp $
+# $Id: newordersuggestion.pl,v 1.3.2.1 2006/11/17 13:18:58 tipaul Exp $
=head1 NAME
newordersuggestion.pl
@@ -161,8 +161,8 @@
# there is at least 1 result => return the 1st one
if ($nbresult) {
- #warn "$nbresult => ".@$finalresult[0]->{biblionumber},@$finalresult[0]->{bibid},@$finalresult[0]->{title};
- #warn "DUPLICATE ==>".@$finalresult[0]->{biblionumber},@$finalresult[0]->{bibid},@$finalresult[0]->{title};
+ #warn "$nbresult => ".@$finalresult[0]->{biblionumber},@$finalresult[0]->{biblionumber},@$finalresult[0]->{title};
+ #warn "DUPLICATE ==>".@$finalresult[0]->{biblionumber},@$finalresult[0]->{biblionumber},@$finalresult[0]->{title};
$_->{duplicateBiblionumber} = @$finalresult[0]->{biblionumber};
}
}
Index: authorities/authorities.pl
===================================================================
RCS file: /sources/koha/koha/authorities/authorities.pl,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -b -r1.15.2.2 -r1.15.2.3
--- authorities/authorities.pl 12 Oct 2006 22:04:47 -0000 1.15.2.2
+++ authorities/authorities.pl 17 Nov 2006 13:18:58 -0000 1.15.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: authorities.pl,v 1.15.2.2 2006/10/12 22:04:47 hdl Exp $
+# $Id: authorities.pl,v 1.15.2.3 2006/11/17 13:18:58 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -391,7 +391,6 @@
my $record=MARC::Record->new_from_xml($xml,'UTF-8',(C4::Context->preference("marcflavour") eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")));
$record->encoding('UTF-8');
#warn $record->as_formatted;
- #warn "IN ADDBIB";
# check for a duplicate
# my ($duplicateauthid,$duplicateauthvalue) = C4::AuthoritiesMarc::FindDuplicate($record,$authtypecode) if ($op eq "add") && (!$is_a_modif);
#warn "duplicate:$duplicateauthid,$duplicateauthvalue";
Index: barcodes/label-item-search.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-item-search.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
--- barcodes/label-item-search.pl 31 Aug 2006 16:26:42 -0000 1.4.2.1
+++ barcodes/label-item-search.pl 17 Nov 2006 13:18:58 -0000 1.4.2.2
@@ -149,7 +149,7 @@
for ( $i = 0 ; $i <= ( $total - 1 ) ; $i++ )
{ #total-1 coz the array starts at 0
#warn $i;
- #warn Dumper $results->[$i]{'bibid'};
+ #warn Dumper $results->[$i]{'biblionumber'};
my $type = 'intra';
my @item_results = &GetItemsInfo($results->[$i]{'biblionumber'}, $type );
Index: C4/Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -u -b -r1.43.2.2 -r1.43.2.3
--- C4/Acquisition.pm 2 Nov 2006 14:56:13 -0000 1.43.2.2
+++ C4/Acquisition.pm 17 Nov 2006 13:18:58 -0000 1.43.2.3
@@ -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: Acquisition.pm,v 1.43.2.2 2006/11/02 14:56:13 tipaul Exp $
+# $Id: Acquisition.pm,v 1.43.2.3 2006/11/17 13:18:58 tipaul Exp $
use strict;
require Exporter;
@@ -30,7 +30,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.43.2.2 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.43.2.3 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
# used in receiveorder subroutine
# to provide library specific handling
@@ -577,7 +577,7 @@
sub ModReceiveOrder {
my (
- $biblio, $ordnum, $quantrec, $user, $cost,
+ $biblionumber, $ordnum, $quantrec, $user, $cost,
$invoiceno, $freight, $rrp, $bookfund
)
= @_;
@@ -589,11 +589,11 @@
WHERE biblionumber=? AND ordernumber=?
";
my $sth = $dbh->prepare($query);
- my $suggestionid = GetSuggestionFromBiblionumber( $dbh, $biblio );
+ my $suggestionid = GetSuggestionFromBiblionumber( $dbh, $biblionumber );
if ($suggestionid) {
- ModStatus( $suggestionid, 'AVAILABLE', '', $biblio );
+ ModStatus( $suggestionid, 'AVAILABLE', '', $biblionumber );
}
- $sth->execute( $quantrec, $invoiceno, $cost, $freight, $rrp, $biblio,
+ $sth->execute( $quantrec, $invoiceno, $cost, $freight, $rrp, $biblionumber,
$ordnum );
$sth->finish;
@@ -648,7 +648,7 @@
=cut
sub SearchOrder {
- my ( $search, $id, $biblio, $catview ) = @_;
+ my ( $search, $id, $biblionumber, $catview ) = @_;
my $dbh = C4::Context->dbh;
my @data = split( ' ', $search );
my @searchterms;
@@ -656,7 +656,7 @@
@searchterms = ($id);
}
map { push( @searchterms, "$_%", "% $_%" ) } @data;
- push( @searchterms, $search, $search, $biblio );
+ push( @searchterms, $search, $search, $biblionumber );
my $query;
if ($id) {
$query =
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
diff -u -b -r1.28.2.3 -r1.28.2.4
--- C4/AuthoritiesMarc.pm 17 Nov 2006 11:17:30 -0000 1.28.2.3
+++ C4/AuthoritiesMarc.pm 17 Nov 2006 13:18:58 -0000 1.28.2.4
@@ -873,7 +873,7 @@
$update=1;
}#for each tag
}#foreach tagfield
-my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,"") ;
+ my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,"") ;
if ($update==1){
# FIXME : this NEWmodbiblio does not exist anymore...
&NEWmodbiblio($dbh,$marcrecord,$oldbiblio->{'biblionumber'},undef,"0000") ;
@@ -893,8 +893,15 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.28.2.3 2006/11/17 11:17:30 tipaul Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.4 2006/11/17 13:18:58 tipaul Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.4 2006/11/17 13:18:58 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.3 2006/11/17 11:17:30 tipaul
# code cleaning : removing use of "bib", and replacing with "biblionumber"
#
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.24
retrieving revision 1.178.2.25
diff -u -b -r1.178.2.24 -r1.178.2.25
--- C4/Biblio.pm 17 Nov 2006 11:18:47 -0000 1.178.2.24
+++ C4/Biblio.pm 17 Nov 2006 13:18:58 -0000 1.178.2.25
@@ -265,7 +265,7 @@
=over 4
-$bib = AddItem( $dbh, $record, $biblionumber)
+$biblionumber = AddItem( $dbh, $record, $biblionumber)
Exported function (core API) for adding a new item to Koha
@@ -323,7 +323,7 @@
$record->append_fields($newtag);
}
# add the item
- my $bib = &MARCadditem( $dbh, $record, $item->{'biblionumber'} );
+ my $biblionumber = &MARCadditem( $dbh, $record, $item->{'biblionumber'} );
return ($item->{biblionumber}, $item->{biblioitemnumber},$itemnumber);
}
@@ -2446,8 +2446,6 @@
my ($biblio) = @_;
my $dbh = C4::Context->dbh;
my $bibnum = _koha_add_biblio( $dbh, $biblio );
- # finds new (MARC bibid
- # my $biblionumber = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
my $record = &MARCkoha2marcBiblio( $dbh, $bibnum );
MARCaddbiblio($dbh,$record, $bibnum,'' );
return ($bibnum);
@@ -2476,8 +2474,6 @@
my $dbh = C4::Context->dbh;
my $biblionumber=_koha_modify_biblio($dbh,$biblio);
my $record = MARCkoha2marcBiblio($dbh,$biblionumber,$biblionumber);
- # finds new (MARC bibid
- my $biblionumber = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
MARCmodbiblio($dbh,$biblionumber,$record,"",0);
return($biblionumber);
} # sub modbiblio
@@ -2527,16 +2523,15 @@
=cut
sub modsubject {
- my ( $bibnum, $force, @subject ) = @_;
+ my ( $biblionumber, $force, @subject ) = @_;
my $dbh = C4::Context->dbh;
- my $error = &_koha_modify_subject( $dbh, $bibnum, $force, @subject );
+ my $error = &_koha_modify_subject( $dbh, $biblionumber, $force, @subject );
if ($error eq ''){
# When MARC is off, ensures that the MARC biblio table gets updated with new
# subjects, of course, it deletes the biblio in marc, and then recreates.
# This check is to ensure that no MARC data exists to lose.
if (C4::Context->preference("MARC") eq '0'){
- my $MARCRecord = &MARCkoha2marcBiblio($dbh,$bibnum);
- my $biblionumber = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
+ my $MARCRecord = &MARCkoha2marcBiblio($dbh,$biblionumber);
&MARCmodbiblio($dbh,$biblionumber, $MARCRecord);
}
}
@@ -2603,8 +2598,7 @@
# it's faster and zebra and marc will be synched anyway by the cron job
unless ($op eq "setstatus") {
my $MARCitem = &MARCkoha2marcItem( $dbh, $item->{'biblionumber'}, $item->{'itemnum'} );
- my $biblionumber = &MARCfind_MARCbibid_from_oldbiblionumber( $dbh, $item->{biblionumber} );
- &MARCmoditem( $dbh, $MARCitem, $biblionumber, $item->{itemnum}, 0 );
+ &MARCmoditem( $dbh, $MARCitem, $item->{biblionumber}, $item->{itemnum}, 0 );
}
}
@@ -2922,10 +2916,9 @@
} # sub deletebiblioitem
sub delbiblio {
- my ($biblio) = @_;
+ my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
- &OLDdelbiblio( $dbh, $biblio );
- my $biblionumber = &MARCfind_MARCbibid_from_oldbiblionumber( $dbh, $biblio );
+ &OLDdelbiblio( $dbh, $biblionumber );
&MARCdelbiblio( $dbh, $biblionumber, 0 );
}
@@ -3649,8 +3642,15 @@
=cut
-# $Id: Biblio.pm,v 1.178.2.24 2006/11/17 11:18:47 tipaul Exp $
+# $Id: Biblio.pm,v 1.178.2.25 2006/11/17 13:18:58 tipaul Exp $
# $Log: Biblio.pm,v $
+# Revision 1.178.2.25 2006/11/17 13:18:58 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.178.2.24 2006/11/17 11:18:47 tipaul
# * removing useless subs
# * moving bibid to biblionumber where needed
Index: C4/Maintainance.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Maintainance.pm,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- C4/Maintainance.pm 6 Jun 2006 23:20:30 -0000 1.18
+++ C4/Maintainance.pm 17 Nov 2006 13:18:58 -0000 1.18.2.1
@@ -128,13 +128,13 @@
=cut
#'
sub shiftgroup{
- my ($bib,$bi)=@_;
+ my ($biblionumber,$bi)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("update biblioitems set biblionumber=? where biblioitemnumber=?");
- $sth->execute($bib,$bi);
+ $sth->execute($biblionumber,$bi);
$sth->finish;
$sth=$dbh->prepare("update items set biblionumber=? where biblioitemnumber=?");
- $sth->execute($bib,$bi);
+ $sth->execute($biblionumber,$bi);
$sth->finish;
}
@@ -177,10 +177,10 @@
=cut
#'
sub undeletebib{
- my ($bib)=@_;
+ my ($biblionumber)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select * from deletedbiblio where biblionumber=?");
- $sth->execute($bib);
+ $sth->execute($biblionumber);
if (my @data=$sth->fetchrow_array){
$sth->finish;
# FIXME - Doesn't this keep the same biblionumber? Isn't this
@@ -195,7 +195,7 @@
$sth->finish;
}
$sth=$dbh->prepare("DELETE FROM deletedbiblio WHERE biblionumber=?");
- $sth->execute($bib);
+ $sth->execute($biblionumber);
$sth->finish;
}
Index: C4/Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.4
retrieving revision 1.46.2.5
diff -u -b -r1.46.2.4 -r1.46.2.5
--- C4/Reserves2.pm 10 Nov 2006 09:44:05 -0000 1.46.2.4
+++ C4/Reserves2.pm 17 Nov 2006 13:18:58 -0000 1.46.2.5
@@ -20,7 +20,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Reserves2.pm,v 1.46.2.4 2006/11/10 09:44:05 btoumi Exp $
+# $Id: Reserves2.pm,v 1.46.2.5 2006/11/17 13:18:58 tipaul Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
my $library_name = C4::Context->preference("LibraryName");
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.4 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.5 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -296,7 +296,7 @@
#'
sub FindReserves {
- my ($bib, $bor) = @_;
+ my ($biblionumber, $bor) = @_;
my $dbh = C4::Context->dbh;
my @bind;
@@ -315,11 +315,11 @@
AND (found <> \'F\' OR found IS NULL)
/;
- if ($bib ne '') {
+ if ($biblionumber ne '') {
$query.= '
AND biblionumber = ?
';
- push @bind, $bib;
+ push @bind, $biblionumber;
}
if ($bor ne '') {
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.26
retrieving revision 1.120.2.27
diff -u -b -r1.120.2.26 -r1.120.2.27
--- C4/Search.pm 17 Nov 2006 11:17:30 -0000 1.120.2.26
+++ C4/Search.pm 17 Nov 2006 13:18:58 -0000 1.120.2.27
@@ -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.26 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.27 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -257,15 +257,15 @@
my @result = ();
my $subtitle; # Added by JF for Subtitles
- # find bibids from results
+ # find biblionumber from results
#put them in @result
foreach my $rec (@results) {
my $record = MARC::Record->new_from_usmarc($rec);
#warn "record :=".$record->as_formatted;
my $oldbiblio = MARCmarc2koha($dbh,$record,'');
- push @result, $oldbiblio->{'biblionumber'}; #FIXME bibid?
+ push @result, $oldbiblio->{'biblionumber'};
}
- # we have bibid list. Now, loads title and author from [offset] to [offset]+[length]
+ # we have biblionumber list. Now, loads title and author from [offset] to [offset]+[length]
my $counter = $offset;
# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
# so if you dont' has an item, you get a not nice empty value.
@@ -273,13 +273,12 @@
FROM biblio
LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
- WHERE biblio.biblionumber = ?"); #marc_biblio.biblionumber AND bibid = ?");
+ WHERE biblio.biblionumber = ?");
my $sth_subtitle = $dbh->prepare("SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); # Added BY JF for Subtitles
my @finalresult = ();
my @CNresults=();
my $totalitems=0;
my $oldline;
- my ($oldbibid, $oldauthor, $oldtitle);
my $sth_itemCN;
if (C4::Context->preference('hidelostitems')) {
$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL) order by homebranch");
@@ -439,7 +438,7 @@
my $query;
my $search;
my $type;
- my ($biblionumber,$bibid,$title);
+ my ($biblionumber,$title);
# search duplicate on ISBN, easy and fast..
#$search->{'avoidquerylog'}=1;
if ($result->{isbn}) {
@@ -2398,7 +2397,7 @@
sub getMARCurls {
- my ($dbh, $bibid, $marcflavour) = @_;
+ my ($dbh, $biblionumber, $marcflavour) = @_;
my ($mintag, $maxtag);
if ($marcflavour eq "MARC21") {
$mintag = "856";
@@ -2408,7 +2407,7 @@
$maxtag = "619";
}
-my $record=MARCgetbiblio($dbh,$bibid);
+my $record=MARCgetbiblio($dbh,$biblionumber);
my @marcurls;
my $url = "";
my $subfil = "";
Index: C4/Serials.pm
===================================================================
RCS file: /sources/koha/koha/C4/Serials.pm,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -b -r1.5.2.7 -r1.5.2.8
--- C4/Serials.pm 17 Nov 2006 10:53:03 -0000 1.5.2.7
+++ C4/Serials.pm 17 Nov 2006 13:18:59 -0000 1.5.2.8
@@ -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.pm,v 1.5.2.7 2006/11/17 10:53:03 hdl Exp $
+# $Id: Serials.pm,v 1.5.2.8 2006/11/17 13:18:59 tipaul Exp $
use strict;
use C4::Date;
@@ -32,7 +32,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.5.2.7 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.5.2.8 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
@@ -1198,8 +1198,7 @@
}
}
- my $bibid=MARCfind_MARCbibid_from_oldbiblionumber($dbh,$data->{biblionumber});
- my $fwk=MARCfind_frameworkcode($dbh,$bibid);
+ my $fwk=MARCfind_frameworkcode($dbh,$data->{'biblionumber'});
if ($info->{barcode}){
my @errors;
my $exists = itemdata($info->{'barcode'});
@@ -1300,7 +1299,7 @@
$marcrecord->insert_fields_ordered($newField);
}
}
- AddItem($dbh,$marcrecord,$bibid);
+ AddItem($dbh,$marcrecord,$data->{'biblionumber'});
return 1;
}
return (0, at errors);
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.14
retrieving revision 1.114.2.15
diff -u -b -r1.114.2.14 -r1.114.2.15
--- C4/Circulation/Circ2.pm 15 Nov 2006 18:01:22 -0000 1.114.2.14
+++ C4/Circulation/Circ2.pm 17 Nov 2006 13:18:59 -0000 1.114.2.15
@@ -3,7 +3,7 @@
package C4::Circulation::Circ2;
-# $Id: Circ2.pm,v 1.114.2.14 2006/11/15 18:01:22 toins Exp $
+# $Id: Circ2.pm,v 1.114.2.15 2006/11/17 13:18:59 tipaul Exp $
#package to deal with Returns
#written 3/11/99 by olwen at katipo.co.nz
@@ -45,7 +45,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.14 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.15 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -552,14 +552,6 @@
if ($dotransfer) {
dotransfer($iteminformation->{'itemnumber'}, $fbr, $tbr);
# don't need to update MARC anymore, we do it in batch now
- #my $dbh= C4::Context->dbh;
- #my ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"items.holdingbranch");
- #my $bibid = MARCfind_MARCbibid_from_oldbiblionumber( $dbh, $iteminformation->{'biblionumber'} );
- #my $marcitem = MARCgetitem($dbh, $bibid, $iteminformation->{'itemnumber'});
- #if ($marcitem->field($tagfield)){
- # $marcitem->field($tagfield)->update($tagsubfield=> $tbr);
- # MARCmoditem($dbh,$marcitem,$bibid,$iteminformation->{'itemnumber'});
- # }
$messages->{'WasTransfered'} = 1;
}
return ($dotransfer, $messages, $iteminformation);
Index: catalogue/detail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/detail.pl,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -b -r1.6.2.4 -r1.6.2.5
--- catalogue/detail.pl 2 Nov 2006 15:31:23 -0000 1.6.2.4
+++ catalogue/detail.pl 17 Nov 2006 13:18:59 -0000 1.6.2.5
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: detail.pl,v 1.6.2.4 2006/11/02 15:31:23 tipaul Exp $
+# $Id: detail.pl,v 1.6.2.5 2006/11/17 13:18:59 tipaul Exp $
use strict;
require Exporter;
@@ -38,7 +38,7 @@
my $biblionumber=$query->param('biblionumber');
if (!$biblionumber){
- $biblionumber=$query->param('bib');
+ $biblionumber=$query->param('biblionumber');
}
# change back when ive fixed request.pl
Index: catalogue/detailprint.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/detailprint.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
--- catalogue/detailprint.pl 31 Aug 2006 16:30:30 -0000 1.1.2.1
+++ catalogue/detailprint.pl 17 Nov 2006 13:18:59 -0000 1.1.2.2
@@ -34,7 +34,7 @@
my $type=$query->param('type');
($type) || ($type='intra');
-my $biblionumber=$query->param('bib');
+my $biblionumber=$query->param('biblionumber');
# change back when ive fixed request.pl
my @items = GetItemsInfo($biblionumber, $type);
Index: catalogue/ISBDdetail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/ISBDdetail.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- catalogue/ISBDdetail.pl 13 Feb 2006 16:36:48 -0000 1.2
+++ catalogue/ISBDdetail.pl 17 Nov 2006 13:18:59 -0000 1.2.2.1
@@ -26,8 +26,7 @@
=head1 DESCRIPTION
-This script needs a biblionumber in bib parameter (bibnumber
-from koha style DB. Automaticaly maps to marc biblionumber).
+This script needs a biblionumber as parameter
=head1 FUNCTIONS
Index: catalogue/issuehistory.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/issuehistory.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- catalogue/issuehistory.pl 14 Nov 2006 15:07:20 -0000 1.1.2.4
+++ catalogue/issuehistory.pl 17 Nov 2006 13:18:59 -0000 1.1.2.5
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: issuehistory.pl,v 1.1.2.4 2006/11/14 15:07:20 toins Exp $
+# $Id: issuehistory.pl,v 1.1.2.5 2006/11/17 13:18:59 tipaul Exp $
use strict;
require Exporter;
@@ -37,11 +37,11 @@
# getting cgi params.
my $params = $query->Vars;
-my $bib = $params->{'biblionumber'};
+my $biblionumber = $params->{'biblionumber'};
my $title = $params->{'title'};
my $author = $params->{'author'};
-my $issues = GetIssuesFromBiblio($bib);
+my $issues = GetIssuesFromBiblio($biblionumber);
my $total = scalar @$issues;
if($total && !$title){
@@ -50,7 +50,7 @@
}
$template->param(
- biblionumber => $bib,
+ biblionumber => $biblionumber,
total => scalar @$issues,
title => $title,
author => $author,
Index: catalogue/MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/MARCdetail.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- catalogue/MARCdetail.pl 17 Nov 2006 11:17:30 -0000 1.5.2.3
+++ catalogue/MARCdetail.pl 17 Nov 2006 13:18:59 -0000 1.5.2.4
@@ -26,8 +26,7 @@
=head1 DESCRIPTION
-This script needs a biblionumber in bib parameter (bibnumber
-from koha style DB. Automaticaly maps to marc biblionumber).
+This script needs a biblionumber as parameter
It shows the biblio in a (nice) MARC format depending on MARC
parameters tables.
@@ -68,12 +67,6 @@
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
-# $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
-# $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
-# $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber) if not ($itemtype);
-# $itemtype = '' if ($itemtype eq 'Default');
-# warn "itemtype :".$itemtype;
-
my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
#my $record = C4::Search::get_record($biblionumber);
Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.14.2.12
retrieving revision 1.14.2.13
diff -u -b -r1.14.2.12 -r1.14.2.13
--- cataloguing/addbiblio.pl 15 Nov 2006 17:17:24 -0000 1.14.2.12
+++ cataloguing/addbiblio.pl 17 Nov 2006 13:18:59 -0000 1.14.2.13
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbiblio.pl,v 1.14.2.12 2006/11/15 17:17:24 tipaul Exp $
+# $Id: addbiblio.pl,v 1.14.2.13 2006/11/17 13:18:59 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -438,7 +438,7 @@
#=========================
my $input = new CGI;
my $error = $input->param('error');
-my $biblionumber=$input->param('biblionumber'); # if bib exists, it's a modif, not a new biblio.
+my $biblionumber=$input->param('biblionumber'); # if biblionumber exists, it's a modif, not a new biblio.
my $breedingid = $input->param('breedingid');
my $z3950 = $input->param('z3950');
my $op = $input->param('op');
@@ -520,7 +520,7 @@
# die;
}
# check for a duplicate
- my ($duplicatebiblionumber,$duplicatebibid,$duplicatetitle) = FindDuplicate($record) if ($op eq "addbiblio") && (!$is_a_modif);
+ my ($duplicatebiblionumber,$duplicatebiblionumber,$duplicatetitle) = FindDuplicate($record) if ($op eq "addbiblio") && (!$is_a_modif);
my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
# it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
if (!$duplicatebiblionumber or $confirm_not_duplicate) {
@@ -549,7 +549,7 @@
biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
biblioitemnumber => $biblioitemnumber,
duplicatebiblionumber => $duplicatebiblionumber,
- duplicatebibid => $duplicatebibid,
+ duplicatebibid => $duplicatebiblionumber,
duplicatetitle => $duplicatetitle,
);
}
@@ -606,7 +606,7 @@
#------------------------------------------------------------------------------------------------------------------------------
} else {
#------------------------------------------------------------------------------------------------------------------------------
- # If we're in a duplication case, we have to set to "" the bibid and biblionumber
+ # If we're in a duplication case, we have to set to "" the biblionumber
# as we'll save the biblio as a new one.
if ($op eq "duplicate")
{
Index: cataloguing/value_builder/unimarc_field_4XX.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/value_builder/Attic/unimarc_field_4XX.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- cataloguing/value_builder/unimarc_field_4XX.pl 10 Oct 2006 14:51:39 -0000 1.1.2.3
+++ cataloguing/value_builder/unimarc_field_4XX.pl 17 Nov 2006 13:18:59 -0000 1.1.2.4
@@ -89,17 +89,17 @@
flagsrequired => {editcatalogue => 1},
debug => 1,
});
- #get bibid
- my $bibid;
- my $req= $dbh->prepare("SELECT distinctrow bibid,biblionumber FROM `marc_biblio` WHERE biblionumber= ?");
+ #get biblionumber
+ my $biblionumber;
+ my $req= $dbh->prepare("SELECT distinctrow $biblionumber,biblionumber FROM `marc_biblio` WHERE biblionumber= ?");
$req->execute($bibnum);
- ($bibid,$bibnum) = $req->fetchrow;
- #warn "bibid :".$bibid;
+ ($biblionumber,$bibnum) = $req->fetchrow;
+ #warn "$biblionumber :".$biblionumber;
#get marc record
- $marcrecord = MARCgetbiblio($dbh,$bibid);
+ $marcrecord = MARCgetbiblio($dbh,$biblionumber);
# warn "record : ".$marcrecord->as_formatted;
- my $subfield_value_9=$bibid;
+ my $subfield_value_9=$biblionumber;
my $subfield_value_0;
$subfield_value_0=$marcrecord->field('001')->data if $marcrecord->field('001');
my $subfield_value_a;
@@ -195,7 +195,7 @@
}
$template->param(fillinput => 1,
index => $query->param('index')."",
- bibid=>$bibid?$bibid:"",
+ $biblionumber=>$biblionumber?$biblionumber:"",
subfield_value_9=>$subfield_value_9,
subfield_value_0=>$subfield_value_0,
subfield_value_a=>$subfield_value_a,
Index: circ/bookcount.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/bookcount.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
--- circ/bookcount.pl 19 Oct 2006 10:01:42 -0000 1.1.2.1
+++ circ/bookcount.pl 17 Nov 2006 13:18:59 -0000 1.1.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: bookcount.pl,v 1.1.2.1 2006/10/19 10:01:42 toins Exp $
+# $Id: bookcount.pl,v 1.1.2.2 2006/11/17 13:18:59 tipaul Exp $
#written 7/3/2002 by Finlay
#script to display reports
@@ -42,7 +42,7 @@
my $input = new CGI;
my $itm = $input->param('itm');
my $bi = $input->param('bi');
-my $bib = $input->param('bib');
+my $biblionumber = $input->param('biblioitemnumber');
my $branches = GetBranches(\%env);
my $idata = itemdatanum($itm);
@@ -87,7 +87,7 @@
push(@branchloop,\%linebranch);
}
-$template->param( bib => $bib,
+$template->param( biblionumber => $biblionumber,
title => $data->{'title'},
author => $data->{'author'},
barcode => $idata->{'barcode'},
Index: export/export.pl
===================================================================
RCS file: /sources/koha/koha/export/Attic/export.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- export/export.pl 18 Oct 2006 08:07:05 -0000 1.1.4.2
+++ export/export.pl 17 Nov 2006 13:18:59 -0000 1.1.4.3
@@ -15,13 +15,13 @@
my $outfile = $ARGV[0];
open(OUT,">$outfile") or die $!;
my $query = new CGI;
- my $start_bib = $query->param("start_bib");
- my $end_bib = $query->param("end_bib");
+ my $StartingBiblionumber = $query->param("StartingBiblionumber");
+ my $EndingBiblionumber = $query->param("EndingBiblionumber");
my $dbh=C4::Context->dbh;
my $sth;
- if ($start_bib && $end_bib) {
+ if ($StartingBiblionumber && $EndingBiblionumber) {
$sth=$dbh->prepare("select biblionumber from biblioitems where biblionumber >=? and biblionumber <=? order by biblionumber");
- $sth->execute($start_bib,$end_bib);
+ $sth->execute($StartingBiblionumber,$EndingBiblionumber);
} else {
$sth=$dbh->prepare("select biblionumber from biblioitems order by biblionumber");
$sth->execute();
Index: export/marc.pl
===================================================================
RCS file: /sources/koha/koha/export/Attic/marc.pl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- export/marc.pl 1 Sep 2006 14:18:50 -0000 1.7.2.1
+++ export/marc.pl 17 Nov 2006 13:18:59 -0000 1.7.2.2
@@ -17,8 +17,8 @@
if ($op eq "export") {
print $query->header( -type => 'application/octet-stream',
-attachment=>'koha.mrc');
- my $start_bib = $query->param("start_bib");
- my $end_bib = $query->param("end_bib");
+ my $StartingBiblionumber = $query->param("StartingBiblionumber");
+ my $EndingBiblionumber = $query->param("EndingBiblionumber");
my $format = $query->param("format");
my $branch = $query->param("branch");
my $start_callnumber = $query->param("start_callnumber");
@@ -26,8 +26,8 @@
my $limit = $query->param("limit");
my $strsth;
$strsth="select bibid from marc_biblio ";
- if ($start_bib && $end_bib) {
- $strsth.=" where biblionumber>=$start_bib and biblionumber<=$end_bib ";
+ if ($StartingBiblionumber && $EndingBiblionumber) {
+ $strsth.=" where biblionumber>=$StartingBiblionumber and biblionumber<=$EndingBiblionumber ";
}elsif ($format) {
if ($strsth=~/ where/){
$strsth=~s/ where (.*)/,biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\' and $1/;
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl 12 Oct 2006 22:04:47 -0000 1.2.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl 17 Nov 2006 13:18:59 -0000 1.2.2.2
@@ -175,7 +175,7 @@
strQuery += "&issn="+document.forms['f'].field_value[i].value;
}
}
- newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
+ newin=window.open("../z3950/search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
}
function AddField(field) {
Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl 17 Nov 2006 11:18:30 -0000 1.1.2.9
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.10
@@ -8,7 +8,7 @@
<h1><!-- TMPL_IF NAME="biblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
<div id="action">
- <!-- TMPL_IF name="bibid" -->
+ <!-- TMPL_IF name="biblionumber" -->
<input type="button" value="Save Bibliographic Record and go to Items" onclick="Check(this.form)" accesskey="w" />
<!-- TMPL_ELSE -->
<input type="button" value="Add Bibliographic Record and go to Items" onclick="Check(this.form)" accesskey="w" />
@@ -47,10 +47,10 @@
<!-- show duplicate warning on tab 0 only -->
<!-- TMPL_IF name="duplicatebiblionumber" -->
<div class="error">
- <p>Is this a duplicate of <a href="../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
+ <p>Is this a duplicate of <a href="../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
<p>You must either :</p>
<ul>
- <li>If it <em>is</em> a duplicate, <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->">Edit Items</a> of the existing record.</li>
+ <li>If it <em>is</em> a duplicate, <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->">Edit Items</a> of the existing record.</li>
<li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
</ul>
</div>
@@ -296,7 +296,7 @@
}
}
if(error < 4){
- newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
+ newin=window.open("../z3950/search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
} else {
alert("To perform a z39.50 search, you must enter at least one of the following: \n\n ISBN\n ISSN\n Title\n Author\n");
}
Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/isbnsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/isbnsearch.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/isbnsearch.tmpl 6 Oct 2006 12:46:42 -0000 1.2.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/isbnsearch.tmpl 17 Nov 2006 13:18:59 -0000 1.2.2.2
@@ -42,7 +42,7 @@
<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add items</a></td>
<!-- TMPL_ELSE -->
<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Biblio</a></td>
- <td><a href="additem.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->">Edit Items</a></td>
+ <td><a href="additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></td>
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="NOTMARC" -->
<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate">Duplicate</a></td><!-- /TMPL_UNLESS --></tr>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/Attic/bookcount.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl 19 Oct 2006 10:07:09 -0000 1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.4
@@ -5,7 +5,7 @@
<h1>
<!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></a></h1>
<h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
-<div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR Name="bib" -->"><input type="hidden" name="type" value="intra"><input type="submit" class="submit" value="Brief Display"></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->"><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="bib" -->"><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"> <input type="submit" class="submit" value="Item Details"></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bib" -->" name="bib"> <input type="submit" value="Place Reserve" class="submit"></form><!-- /TMPL_IF --></div>
+<div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->"><input type="hidden" name="type" value="intra"><input type="submit" class="submit" value="Brief Display"></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->"><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"> <input type="submit" class="submit" value="Item Details"></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber"> <input type="submit" value="Place Reserve" class="submit"></form><!-- /TMPL_IF --></div>
<div class="data">
<table>
<tr><th>Home Branch: </th><td> <!-- TMPL_VAR Name="homebranch" --> </td></tr>
Index: koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/export/Attic/marc.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl 22 Jul 2005 16:31:28 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.1
@@ -3,8 +3,8 @@
<h1>MARC Export</h1>
<h4>Export in MARC format the following biblios:</h4>
<form method="post">
-<p>From biblio number: <input type="text" name="start_bib" />
-to biblio number: <input type="text" name="end_bib" /></p>
+<p>From biblio number: <input type="text" name="StartingBiblionumber" />
+to biblio number: <input type="text" name="EndingBiblionumber" /></p>
<p>(leave blank to export every biblio)</p>
<input type="hidden" name="op" value="export" />
<input type="submit" value="Export" />
Index: koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/Attic/serials-edit.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl 15 Nov 2006 15:15:50 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.3
@@ -12,7 +12,7 @@
<input type="submit" value="Save" class="button" accesskey="w" /> <!--onClick="Check(this.form)" -->
<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription Details</a>
<!-- <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Search All Subscriptions</a> -->
- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a>
+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a>
</div>
<!--TMPL_IF Name="barcode_not_unique" -->
Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
Index: koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl 30 Oct 2006 10:07:46 -0000 1.3.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl 17 Nov 2006 13:18:59 -0000 1.3.2.4
@@ -7,8 +7,8 @@
<div id="bloc25">
<h2 class="parameters">Select biblios to export</h2>
<form method="post">
- <p><label>from biblio number</label><input type="text" name="start_bib">
- to biblio number : <input type="text" name="end_bib"></p>
+ <p><label>from biblio number</label><input type="text" name="StartingBiblionumber">
+ to biblio number : <input type="text" name="EndingBiblionumber"></p>
<p><label>Document type</label><!--TMPL_VAR Name="CGIitemtype"--></p>
<p><label>Branch</label><select name="branch">
<option value="">Default</option>
Index: koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-authoritiessearchresultlist.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl 30 Oct 2006 10:09:24 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.2
@@ -36,7 +36,7 @@
<th width="70%">Authorized Headings</th>
<th width="10%">Type of Heading</th>
<!-- TMPL_UNLESS name="isEDITORS" -->
- <th width="10%">Bib Records</th>
+ <th width="10%">Biblio records</th>
<!-- /TMPL_UNLESS -->
<th width="10%">Full Authorized Heading</th>
</tr>
Index: koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl 17 Nov 2006 11:18:31 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.2
@@ -12,8 +12,8 @@
<ul>
<!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
<li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
-<!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
-<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
+<!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
+<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
<!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
<li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
</ul>
Index: koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl 3 Mar 2006 20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.1
@@ -8,7 +8,7 @@
<!-- TMPL_UNLESS name="popup" -->
<div id="main">
<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
- <form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
+ <form action="opac-detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
<!-- /TMPL_UNLESS -->
<div class="tabs">
Index: koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl 17 Nov 2006 11:18:31 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.2
@@ -52,15 +52,15 @@
<!-- TMPL_UNLESS NAME="norequests" -->
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="submit" name="submit" value="Place Reserve" />
- <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+ <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
</form>
<!-- /TMPL_UNLESS -->
-<form action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="MARC View" /></form>
+<form action="opac-MARCdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="MARC View" /></form>
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Simple View" /></form>
+<form action="opac-detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Simple View" /></form>
-<form action="opac-detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
+<form action="opac-detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
<form action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
Index: koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl 17 Nov 2006 11:18:31 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl 17 Nov 2006 13:18:59 -0000 1.1.2.2
@@ -8,14 +8,14 @@
<!-- TMPL_UNLESS NAME="norequests" -->
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="submit" name="submit" VALUE="Place Reserve" />
- <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+ <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
</form>
<!-- /TMPL_UNLESS -->
-<!-- Hide from NPL --><form action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="ISBD" /></form><!-- /Hide from NPL -->
+<!-- Hide from NPL --><form action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="ISBD" /></form><!-- /Hide from NPL -->
<form action="opac-detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
-<form action="opac-detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
+<form action="opac-detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
<!-- TMPL_IF name="virtualshelves" --><form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Add to My Book List" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- /TMPL_IF -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl 3 Mar 2006 20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl 17 Nov 2006 13:19:00 -0000 1.1.2.1
@@ -12,7 +12,7 @@
<!-- TMPL_IF NAME="too_much_oweing" --><p class="error">Sorry, you cannot make reserves because you owe <!-- TMPL_VAR NAME="too_much_oweing" -->. </p> <!-- /TMPL_IF -->
<!-- TMPL_IF NAME="too_many_reserves" --><p class="error">Sorry, you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves. </p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="already_reserved" --><p class="error">You already have a reserve placed on this item.
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon back" value="Return to Item Detail Screen" /></form></p>
+<form action="opac-detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon back" value="Return to Item Detail Screen" /></form></p>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="no_items_selected" --><p class="error">You must select at least one item.</p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="no_branch_selected" --><p class="error">You must select a branch for pickup!</p><!-- /TMPL_IF -->
@@ -24,7 +24,7 @@
<div id="main">
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="hidden" name="item_types_selected" value="1">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
<h2>Reservation Details</h2>
<div class="form">
<table>
@@ -81,7 +81,7 @@
<div id="main">
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="hidden" name="place_reserve" value="1">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
<div class="details">
<table>
<tr><th>Title: </th><td><span class="title"><!-- TMPL_VAR NAME="title" --></span></td></tr>
Index: koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 17 Nov 2006 11:18:31 -0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 17 Nov 2006 13:19:00 -0000 1.1.2.4
@@ -97,7 +97,7 @@
<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
<!-- TMPL_IF name="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td><!-- TMPL_IF NAME="AmazonContent" --><a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="image" class="thumbnail" /></a><!-- /TMPL_IF --></td>
- <td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->by <a href="opac-search.pl?do=search&q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE --> <!-- /TMPL_IF -->
+ <td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->by <a href="opac-search.pl?do=search&q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE --> <!-- /TMPL_IF -->
<p> <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl 17 Nov 2006 11:18:31 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl 17 Nov 2006 13:19:00 -0000 1.1.2.2
@@ -51,13 +51,13 @@
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="results" -->
<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
- <td><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br /><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /></td>
+ <td><label for="biblionumber<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br /><input type="checkbox" name="biblionumber" id="biblionumber<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /></td>
<!-- TMPL_IF NAME="AmazonContent" -->
<td><a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="" border="0" /><!--<img class="large" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01._PE_SCLZZZZZZZ_.jpg" title="Enlarged view of image" alt="Enlarged view of image" />
--></a></td>
<!-- /TMPL_IF -->
- <td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+ <td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl 3 Mar 2006 20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl 17 Nov 2006 13:19:00 -0000 1.1.2.1
@@ -5,7 +5,7 @@
<div id="main">
<h1>Issues for a subscription</h1>
- <form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
+ <form action="opac-detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
<form method="post" name="f">
<!-- TMPL_LOOP name="subscription_LOOP" -->
Index: opac/opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -b -r1.32 -r1.32.2.1
--- opac/opac-detail.pl 11 Aug 2006 16:08:28 -0000 1.32
+++ opac/opac-detail.pl 17 Nov 2006 13:19:00 -0000 1.32.2.1
@@ -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: opac-detail.pl,v 1.32 2006/08/11 16:08:28 toins Exp $
+# $Id: opac-detail.pl,v 1.32.2.1 2006/11/17 13:19:00 tipaul Exp $
use strict;
require Exporter;
@@ -42,7 +42,7 @@
}
);
-my $biblionumber = $query->param('bib');
+my $biblionumber = $query->param('biblionumber');
$template->param( biblionumber => $biblionumber );
# change back when ive fixed request.pl
@@ -119,11 +119,10 @@
my @results = ( $dat, );
if ( C4::Boolean::true_p($marc) ) {
my $dbh = C4::Context->dbh;
- my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber( $dbh, $biblionumber );
my $marcflavour = C4::Context->preference("marcflavour");
- my $marcnotesarray = &getMARCnotes( $dbh, $bibid, $marcflavour );
+ my $marcnotesarray = &getMARCnotes( $dbh, $biblionumber, $marcflavour );
$results[0]->{MARCNOTES} = $marcnotesarray;
- my $marcsubjctsarray = &getMARCsubjects( $dbh, $bibid, $marcflavour );
+ my $marcsubjctsarray = &getMARCsubjects( $dbh, $biblionumber, $marcflavour );
$results[0]->{MARCSUBJCTS} = $marcsubjctsarray;
# $template->param(MARCNOTES => $marcnotesarray);
Index: opac/opac-detailprint.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detailprint.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- opac/opac-detailprint.pl 22 Sep 2005 10:01:46 -0000 1.3
+++ opac/opac-detailprint.pl 17 Nov 2006 13:19:00 -0000 1.3.2.1
@@ -33,7 +33,7 @@
my $type=$query->param('type');
($type) || ($type='intra');
-my $biblionumber=$query->param('bib');
+my $biblionumber=$query->param('biblionumber');
# change back when ive fixed request.pl
my @items = ItemInfo(undef, $biblionumber, $type);
Index: opac/opac-ISBDdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -b -r1.16 -r1.16.2.1
--- opac/opac-ISBDdetail.pl 11 Aug 2006 15:45:37 -0000 1.16
+++ opac/opac-ISBDdetail.pl 17 Nov 2006 13:19:00 -0000 1.16.2.1
@@ -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: opac-ISBDdetail.pl,v 1.16 2006/08/11 15:45:37 toins Exp $
+# $Id: opac-ISBDdetail.pl,v 1.16.2.1 2006/11/17 13:19:00 tipaul Exp $
=head1 NAME
@@ -26,8 +26,7 @@
=head1 DESCRIPTION
-This script needs a biblionumber in bib parameter (bibnumber
-from koha style DB. Automaticaly maps to marc biblionumber).
+This script needs a biblionumber as parameter
It shows the biblio in a (nice) MARC format depending on MARC
parameters tables.
@@ -63,14 +62,11 @@
my $dbh=C4::Context->dbh;
-my $biblionumber=$query->param('bib');
-my $bibid = $query->param('bibid');
-$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
-$biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
-my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
+my $biblionumber=$query->param('biblionumber');
+my $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber);
my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
-my $record =MARCgetbiblio($dbh,$bibid);
+my $record =MARCgetbiblio($dbh,$biblionumber);
#coping with subscriptions
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- opac/opac-MARCdetail.pl 11 Aug 2006 15:45:37 -0000 1.14
+++ opac/opac-MARCdetail.pl 17 Nov 2006 13:19:00 -0000 1.14.2.1
@@ -26,8 +26,7 @@
=head1 DESCRIPTION
-This script needs a biblionumber in bib parameter (bibnumber
-from koha style DB. Automaticaly maps to marc biblionumber).
+This script needs a biblionumber as parameter
It shows the biblio in a (nice) MARC format depending on MARC
parameters tables.
@@ -62,14 +61,11 @@
my $dbh=C4::Context->dbh;
-my $biblionumber=$query->param('bib');
-my $bibid = $query->param('bibid');
-$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
-$biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
-my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
+my $biblionumber=$query->param('biblionumber');
+my $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber);
my $tagslib = &MARCgettagslib($dbh,0,$itemtype);
-my $record =MARCgetbiblio($dbh,$bibid);
+my $record =MARCgetbiblio($dbh,$biblionumber);
# open template
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-MARCdetail.tmpl",
Index: opac/opac-moredetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-moredetail.pl,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -b -r1.9.2.3 -r1.9.2.4
--- opac/opac-moredetail.pl 17 Nov 2006 11:17:30 -0000 1.9.2.3
+++ opac/opac-moredetail.pl 17 Nov 2006 13:19:00 -0000 1.9.2.4
@@ -32,7 +32,7 @@
print startmenu($type);
my $blah;
-my $biblionumber=$input->param('bib');
+my $biblionumber=$input->param('biblionumber');
my $title=$input->param('title');
my $bi=$input->param('bi');
my $data=bibitemdata($bi);
Index: opac/opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -b -r1.29 -r1.29.2.1
--- opac/opac-reserve.pl 21 Jul 2006 09:51:42 -0000 1.29
+++ opac/opac-reserve.pl 17 Nov 2006 13:19:00 -0000 1.29.2.1
@@ -33,7 +33,7 @@
# $bordat[0] = $borr;
# get biblionumber.....
-my $biblionumber = $query->param('bib');
+my $biblionumber = $query->param('biblionumber');
my $bibdata = bibdata($biblionumber);
$template->param($bibdata);
Index: opac/opac-sendbasket.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- opac/opac-sendbasket.pl 26 Oct 2005 09:13:11 -0000 1.10
+++ opac/opac-sendbasket.pl 17 Nov 2006 13:19:00 -0000 1.10.2.1
@@ -27,9 +27,6 @@
my $email_add=$query->param('email_add');
my $email_sender=$query->param('email_sender');
my $dbh=C4::Context->dbh;
-my $sth;
-$sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
-
if ($email_add) {
my $email_from = C4::Context->preference('KohaAdminEmailAddress');
@@ -62,9 +59,8 @@
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
- $sth->execute($biblionumber);
- my ($bibid) = $sth->fetchrow;
- my $record = MARCgetbiblio($dbh,$bibid);
+
+ my $record = MARCgetbiblio($dbh,$biblionumber);
$iso2709 .= $record->as_usmarc();
push (@results, $dat);
Index: rss/lastAcquired-2.0.tmpl
===================================================================
RCS file: /sources/koha/koha/rss/lastAcquired-2.0.tmpl,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -b -r1.1.8.1 -r1.1.8.2
--- rss/lastAcquired-2.0.tmpl 17 Nov 2006 11:17:30 -0000 1.1.8.1
+++ rss/lastAcquired-2.0.tmpl 17 Nov 2006 13:19:00 -0000 1.1.8.2
@@ -25,7 +25,7 @@
<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 -->
<!-- TMPL_IF NAME="notes" --><p><!-- TMPL_VAR NAME="notes" --></p><!-- /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: serials/serials-recieve.pl
===================================================================
RCS file: /sources/koha/koha/serials/Attic/serials-recieve.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- serials/serials-recieve.pl 30 Oct 2006 10:22:46 -0000 1.4.2.2
+++ serials/serials-recieve.pl 17 Nov 2006 13:19:00 -0000 1.4.2.3
@@ -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-recieve.pl,v 1.4.2.2 2006/10/30 10:22:46 tipaul Exp $
+# $Id: serials-recieve.pl,v 1.4.2.3 2006/11/17 13:19:00 tipaul Exp $
=head1 NAME
@@ -203,8 +203,7 @@
my ($totalissues, at serialslist) = GetSerials($subscriptionid);
if (C4::Context->preference("serialsadditems")){
- my $bibid=MARCfind_MARCbibid_from_oldbiblionumber($dbh,$subscription->{biblionumber});
- my $fwk=MARCfind_frameworkcode($dbh,$bibid);
+ my $fwk=MARCfind_frameworkcode($dbh,$subscription->{biblionumber});
my $branches = GetBranches;
my @branchloop;
Index: tools/export.pl
===================================================================
RCS file: /sources/koha/koha/tools/export.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- tools/export.pl 3 Oct 2006 12:42:55 -0000 1.1.2.2
+++ tools/export.pl 17 Nov 2006 13:19:00 -0000 1.1.2.3
@@ -16,7 +16,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: export.pl,v 1.1.2.2 2006/10/03 12:42:55 toins Exp $
+# $Id: export.pl,v 1.1.2.3 2006/11/17 13:19:00 tipaul Exp $
use HTML::Template;
use strict;
@@ -35,8 +35,8 @@
if ($op eq "export") {
print $query->header('Content-Type: text/marc');
- my $start_bib = $query->param("start_bib");
- my $end_bib = $query->param("end_bib");
+ my $StartingBiblionumber = $query->param("StartingBiblionumber");
+ my $EndingBiblionumber = $query->param("EndingBiblionumber");
my $format = $query->param("format");
my $branch = $query->param("branch");
my $start_callnumber = $query->param("start_callnumber");
@@ -44,8 +44,8 @@
my $limit = $query->param("limit");
my $strsth;
$strsth="select bibid from marc_biblio ";
- if ($start_bib && $end_bib) {
- $strsth.=" where biblionumber>=$start_bib and biblionumber<=$end_bib ";
+ if ($StartingBiblionumber && $EndingBiblionumber) {
+ $strsth.=" where biblionumber>=$StartingBiblionumber and biblionumber<=$EndingBiblionumber ";
}elsif ($format) {
if ($strsth=~/ where/){
$strsth=~s/ where (.*)/,biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\' and $1/;
More information about the Koha-cvs
mailing list