[Koha-cvs] koha/C4 Acquisition.pm AuthoritiesMarc.pm BookS... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Thu Dec 7 17:45:44 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/07 16:45:44
Modified files:
C4 : Acquisition.pm AuthoritiesMarc.pm
BookShelves.pm
Log message:
removing warn compilation. (perl -wc)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.3&r2=1.43.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.5&r2=1.28.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/C4/BookShelves.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.15.8.4&r2=1.15.8.5
Patches:
Index: Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.43.2.3
retrieving revision 1.43.2.4
diff -u -b -r1.43.2.3 -r1.43.2.4
--- Acquisition.pm 17 Nov 2006 13:18:58 -0000 1.43.2.3
+++ Acquisition.pm 7 Dec 2006 16:45:43 -0000 1.43.2.4
@@ -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.3 2006/11/17 13:18:58 tipaul Exp $
+# $Id: Acquisition.pm,v 1.43.2.4 2006/12/07 16:45:43 toins 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.3 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.43.2.4 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
# used in receiveorder subroutine
# to provide library specific handling
@@ -447,7 +447,7 @@
#get ordnum MYSQL dependant, but $dbh->last_insert_id returns null
my $ordnum = $dbh->{'mysql_insertid'};
- my $query = "
+ $query = "
INSERT INTO aqorderbreakdown (ordernumber,bookfundid)
VALUES (?,?)
";
@@ -504,7 +504,7 @@
$sort2, $ordnum, $bibnum
);
$sth->finish;
- my $query = "
+ $query = "
UPDATE aqorderbreakdown
SET bookfundid=?
WHERE ordernumber=?
Index: AuthoritiesMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.5
retrieving revision 1.28.2.6
diff -u -b -r1.28.2.5 -r1.28.2.6
--- AuthoritiesMarc.pm 6 Dec 2006 14:19:59 -0000 1.28.2.5
+++ AuthoritiesMarc.pm 7 Dec 2006 16:45:43 -0000 1.28.2.6
@@ -360,7 +360,6 @@
my $subfield;
my $authorised_value;
- my $authtypecode;
my $value_builder;
my $kohafield;
my $seealso;
@@ -572,7 +571,7 @@
if (C4::Context->preference('dontmerge') ){
# save the file in localfile/modified_authorities
my $cgidir = C4::Context->intranetdir ."/cgi-bin";
- unless (opendir(DIR, "$cgidir")) {
+ unless (opendir(DIR,"$cgidir")) {
$cgidir = C4::Context->intranetdir."/";
}
@@ -580,7 +579,7 @@
open AUTH, "> $filename";
print AUTH $authid;
close AUTH;
-}else{
+} else {
&merge($dbh,$authid,$record,$authid,$record);
}
return $authid;
@@ -596,18 +595,6 @@
# FIXME : delete or not in biblio tables (depending on $keep_biblio flag)
}
-
-
-sub AUTHfind_authtypecode {
- my ($dbh,$authid) = @_;
- my $sth = $dbh->prepare("select authtypecode from auth_header where authid=?");
- $sth->execute($authid);
- my ($authtypecode) = $sth->fetchrow;
- return $authtypecode;
-}
-
-
-
sub AUTHhtml2marc {
my ($dbh,$rtags,$rsubfields,$rvalues,%indicators) = @_;
my $prevtag = -1;
@@ -810,7 +797,7 @@
# return if authority does not exist
my @X = $MARCfrom->fields();
return if $#X == -1;
- my @X = $MARCto->fields();
+ @X = $MARCto->fields();
return if $#X == -1;
@@ -893,8 +880,11 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.28.2.5 2006/12/06 14:19:59 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.6 2006/12/07 16:45:43 toins Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.6 2006/12/07 16:45:43 toins
+# removing warn compilation. (perl -wc)
+#
# Revision 1.28.2.5 2006/12/06 14:19:59 hdl
# ABugFixing : Authority count Management.
#
Index: BookShelves.pm
===================================================================
RCS file: /sources/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.15.8.4
retrieving revision 1.15.8.5
diff -u -b -r1.15.8.4 -r1.15.8.5
--- BookShelves.pm 23 Nov 2006 09:05:01 -0000 1.15.8.4
+++ BookShelves.pm 7 Dec 2006 16:45:43 -0000 1.15.8.5
@@ -3,7 +3,7 @@
package C4::BookShelves;
-# $Id: BookShelves.pm,v 1.15.8.4 2006/11/23 09:05:01 tipaul Exp $
+# $Id: BookShelves.pm,v 1.15.8.5 2006/12/07 16:45:43 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -30,7 +30,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.15.8.4 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.15.8.5 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -278,7 +278,7 @@
my $sth = $dbh->prepare($query);
$sth->execute($biblionumber);
my ($itemnumber) = $sth->fetchrow;
- my $query = qq(
+ $query = qq(
SELECT *
FROM shelfcontents
WHERE shelfnumber=? AND itemnumber=?
@@ -406,6 +406,9 @@
#
# $Log: BookShelves.pm,v $
+# Revision 1.15.8.5 2006/12/07 16:45:43 toins
+# removing warn compilation. (perl -wc)
+#
# Revision 1.15.8.4 2006/11/23 09:05:01 tipaul
# enable removal of a bookshelf even if there are items inside
#
More information about the Koha-cvs
mailing list