[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha tools/export.pl serials/serials-edit.pl op...
|
From: |
Henri-Damien LAURENT |
|
Subject: |
[Koha-cvs] koha tools/export.pl serials/serials-edit.pl op... |
|
Date: |
Fri, 27 Apr 2007 14:00:49 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Changes by: Henri-Damien LAURENT <hdl> 07/04/27 14:00:49
Modified files:
tools : export.pl
serials : serials-edit.pl
opac : opac-MARCdetail.pl
misc/migration_tools/22_to_30: missing090field.pl
misc/cronjobs : update_items.pl
misc : rebuildnonmarc.pl missing090field.pl
marcimport_to_biblioitems.pl exportauth.pl
members : borrowers_details.pl
circ : branchoverdues.pl
cataloguing : additem.pl addbiblio.pl
barcodes : label-item-search.pl
C4 : Serials.pm Letters.pm Biblio.pm
Log message:
Removing $dbh from GetMarcFromKohaField (dbh is not used in this
function.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/tools/export.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-edit.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/koha/misc/migration_tools/22_to_30/missing090field.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/misc/cronjobs/update_items.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/rebuildnonmarc.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/misc/missing090field.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/misc/marcimport_to_biblioitems.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/exportauth.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/borrowers_details.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/additem.pl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-item-search.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Letters.pm?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.200&r2=1.201
Patches:
Index: tools/export.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/export.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tools/export.pl 24 Apr 2007 13:54:30 -0000 1.5
+++ tools/export.pl 27 Apr 2007 14:00:48 -0000 1.6
@@ -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.5 2007/04/24 13:54:30 hdl Exp $
+# $Id: export.pl,v 1.6 2007/04/27 14:00:48 hdl Exp $
use strict;
require Exporter;
@@ -88,7 +88,7 @@
if ( $dont_export_items ) {
# now, find where the itemnumber is stored & extract only the item
my ( $itemnumberfield, $itemnumbersubfield ) =
- GetMarcFromKohaField( $dbh, 'items.itemnumber', '' );
+ GetMarcFromKohaField( 'items.itemnumber', '' );
# and delete it.
foreach ($record->field($itemnumberfield)){
Index: serials/serials-edit.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/serials-edit.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- serials/serials-edit.pl 24 Apr 2007 13:54:30 -0000 1.5
+++ serials/serials-edit.pl 27 Apr 2007 14:00:48 -0000 1.6
@@ -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-edit.pl,v 1.5 2007/04/24 13:54:30 hdl Exp $
+# $Id: serials-edit.pl,v 1.6 2007/04/27 14:00:48 hdl Exp $
=head1 NAME
@@ -211,7 +211,7 @@
if ($item=~/^N/){
#New Item
# if autoBarcode is ON, calculate barcode...
- my ($tagfield,$tagsubfield) =
&GetMarcFromKohaField($dbh,"items.barcode");
+ my ($tagfield,$tagsubfield) =
&GetMarcFromKohaField("items.barcode");
if (C4::Context->preference('autoBarcode')) {
unless ($record->field($tagfield)->subfield($tagsubfield)) {
my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from
items");
Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- opac/opac-MARCdetail.pl 24 Apr 2007 13:54:29 -0000 1.17
+++ opac/opac-MARCdetail.pl 27 Apr 2007 14:00:48 -0000 1.18
@@ -235,7 +235,7 @@
}
}
my ( $holdingbrtagf, $holdingbrtagsubf ) =
- &GetMarcFromKohaField( $dbh, "items.holdingbranch", $itemtype );
+ &GetMarcFromKohaField( "items.holdingbranch", $itemtype );
@big_array =
sort { $a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf} } @big_array;
Index: misc/migration_tools/22_to_30/missing090field.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/migration_tools/22_to_30/missing090field.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- misc/migration_tools/22_to_30/missing090field.pl 29 Mar 2007 16:45:54
-0000 1.4
+++ misc/migration_tools/22_to_30/missing090field.pl 27 Apr 2007 14:00:48
-0000 1.5
@@ -28,8 +28,8 @@
sub MARCmodbiblionumber{
my ($biblionumber,$biblioitemnumber,$record)address@hidden;
- my ($tagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField($dbh,"biblio.biblionumber","");
- my ($tagfield2,$biblioitemtagsubfield) =
&GetMarcFromKohaField($dbh,"biblio.biblioitemnumber","");
+ my ($tagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField("biblio.biblionumber","");
+ my ($tagfield2,$biblioitemtagsubfield) =
&GetMarcFromKohaField("biblio.biblioitemnumber","");
my $update=0;
my @tags = $record->field($tagfield);
Index: misc/cronjobs/update_items.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/cronjobs/update_items.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/cronjobs/update_items.pl 29 Mar 2007 13:30:32 -0000 1.2
+++ misc/cronjobs/update_items.pl 27 Apr 2007 14:00:48 -0000 1.3
@@ -103,8 +103,8 @@
#
# 1st : find where some informations are hidden : itemnumber, date_due,
popularity
#
-my ($itemnumberTag,$itemnumberSubfield) =
GetMarcFromKohaField($dbh,"items.itemnumber","");
-my ($date_dueTag,$date_dueSubfield) =
GetMarcFromKohaField($dbh,"items.issues","");
+my ($itemnumberTag,$itemnumberSubfield) =
GetMarcFromKohaField("items.itemnumber","");
+my ($date_dueTag,$date_dueSubfield) = GetMarcFromKohaField("items.issues","");
my (
while (my $biblionumber=$biblionumber_sth->fetchrow) {
$count++;
Index: misc/rebuildnonmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/rebuildnonmarc.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- misc/rebuildnonmarc.pl 29 Mar 2007 16:45:54 -0000 1.8
+++ misc/rebuildnonmarc.pl 27 Apr 2007 14:00:48 -0000 1.9
@@ -43,7 +43,7 @@
my $starttime = gettimeofday;
#1st of all, find item MARC tag.
-my ($tagfield,$tagsubfield) =
&GetMarcFromKohaField($dbh,"items.itemnumber",'');
+my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.itemnumber",'');
# $dbh->do("lock tables biblio write, biblioitems write, items write,
marc_biblio write, marc_subfield_table write, marc_blob_subfield write,
marc_word write, marc_subfield_structure write, stopwords write");
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
Index: misc/missing090field.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/missing090field.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- misc/missing090field.pl 29 Mar 2007 16:45:54 -0000 1.4
+++ misc/missing090field.pl 27 Apr 2007 14:00:48 -0000 1.5
@@ -27,8 +27,8 @@
sub MARCmodbiblionumber{
my ($biblionumber,$biblioitemnumber,$record)address@hidden;
-my ($tagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField($dbh,"biblio.biblionumber","");
-my ($tagfield2,$biblioitemtagsubfield) =
&GetMarcFromKohaField($dbh,"biblio.biblioitemnumber","");
+my ($tagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField("biblio.biblionumber","");
+my ($tagfield2,$biblioitemtagsubfield) =
&GetMarcFromKohaField("biblio.biblioitemnumber","");
my $update=0;
my @tags = $record->field($tagfield);
Index: misc/marcimport_to_biblioitems.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/marcimport_to_biblioitems.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/marcimport_to_biblioitems.pl 29 Mar 2007 13:30:32 -0000 1.2
+++ misc/marcimport_to_biblioitems.pl 27 Apr 2007 14:00:48 -0000 1.3
@@ -44,7 +44,7 @@
$batch->warnings_off();
$batch->strict_off();
my $i=0;
-my ($tagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField($dbh,"biblio.biblionumber","");
+my ($tagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField("biblio.biblionumber","");
while ( my $record = $batch->next() ) {
my $biblionumber=$record->field($tagfield)->subfield($biblionumtagsubfield);
Index: misc/exportauth.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/exportauth.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/exportauth.pl 9 Mar 2007 14:58:36 -0000 1.2
+++ misc/exportauth.pl 27 Apr 2007 14:00:48 -0000 1.3
@@ -7,7 +7,6 @@
require Exporter;
use C4::Auth;
-use C4::Interface::CGI::Output;
use C4::Output; # contains gettemplate
use C4::Biblio;
use CGI;
Index: members/borrowers_details.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/borrowers_details.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- members/borrowers_details.pl 24 Apr 2007 13:54:29 -0000 1.5
+++ members/borrowers_details.pl 27 Apr 2007 14:00:48 -0000 1.6
@@ -2,7 +2,7 @@
# NOTE: This file uses standard 8-space tabs
# DO NOT SET TAB SIZE TO 4
-# $Id: borrowers_details.pl,v 1.5 2007/04/24 13:54:29 hdl Exp $
+# $Id: borrowers_details.pl,v 1.6 2007/04/27 14:00:48 hdl Exp $
#script to set up screen for modification of borrower details
#written 20/12/99 by address@hidden
@@ -26,14 +26,13 @@
# Suite 330, Boston, MA 02111-1307 USA
use strict;
+use Date::Manip;
+use CGI;
use C4::Auth;
use C4::Context;
use C4::Output;
-use CGI;
use C4::Members;
use C4::Koha;
-
-use Date::Manip;
use C4::Date;
use C4::Input;
use C4::Log;
@@ -70,11 +69,9 @@
categorycode => $data{'categorycode'},
title => $data{'title'},
category_type => $borrowercategory
->{'category_type'},
- # #
"title_".$data{'title'} => "
SELECTED ",
dateofbirth =>
format_date($data{'dateofbirth'}),
description =>
$borrowercategory->{'description'}
-#
);
$template->param(Institution => 1) if ($category_type eq "I");
output_html_with_http_headers $input, $cookie, $template->output;
Index: circ/branchoverdues.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchoverdues.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- circ/branchoverdues.pl 24 Apr 2007 13:54:29 -0000 1.7
+++ circ/branchoverdues.pl 27 Apr 2007 14:00:48 -0000 1.8
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: branchoverdues.pl,v 1.7 2007/04/24 13:54:29 hdl Exp $
+# $Id: branchoverdues.pl,v 1.8 2007/04/27 14:00:48 hdl Exp $
#
# This file is part of Koha.
#
@@ -106,7 +106,7 @@
my @getoverdues = GetOverduesForBranch( $default, $location );
# search for location authorised value
-my ($tag,$subfield) = GetMarcFromKohaField($dbh,'items.location','');
+my ($tag,$subfield) = GetMarcFromKohaField('items.location','');
my $tagslib = &GetMarcStructure($dbh,1,'');
if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
my $values=
GetAuthorisedValues($tagslib->{$tag}->{$subfield}->{authorised_value});
Index: cataloguing/additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/additem.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- cataloguing/additem.pl 24 Apr 2007 13:54:29 -0000 1.15
+++ cataloguing/additem.pl 27 Apr 2007 14:00:48 -0000 1.16
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: additem.pl,v 1.15 2007/04/24 13:54:29 hdl Exp $
+# $Id: additem.pl,v 1.16 2007/04/27 14:00:48 hdl Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -87,7 +87,7 @@
my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
# if autoBarcode is ON, calculate barcode...
if (C4::Context->preference('autoBarcode')) {
- my ($tagfield,$tagsubfield) =
&GetMarcFromKohaField($dbh,"items.barcode");
+ my ($tagfield,$tagsubfield) =
&GetMarcFromKohaField("items.barcode",$frameworkcode);
unless ($record->field($tagfield)->subfield($tagsubfield)) {
my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from
items");
$sth_barcode->execute;
@@ -175,8 +175,8 @@
my %witness; #---- stores the list of subfields used at least once, with the
"meaning" of the code
my @big_array;
#---- finds where items.itemnumber is stored
-my ($itemtagfield,$itemtagsubfield) =
&GetMarcFromKohaField($dbh,"items.itemnumber",$frameworkcode);
-my ($branchtagfield,$branchtagsubfield) =
&GetMarcFromKohaField($dbh,"items.homebranch",$frameworkcode);
+my ($itemtagfield,$itemtagsubfield) =
&GetMarcFromKohaField("items.itemnumber",$frameworkcode);
+my ($branchtagfield,$branchtagsubfield) =
&GetMarcFromKohaField("items.homebranch",$frameworkcode);
foreach my $field (@fields) {
next if ($field->tag()<10);
@@ -206,7 +206,7 @@
$big_array[$i]{$subfield_code}=" " unless
($big_array[$i]{$subfield_code});
}
}
-my ($holdingbrtagf,$holdingbrtagsubf) =
&GetMarcFromKohaField($dbh,"items.holdingbranch",$frameworkcode);
+my ($holdingbrtagf,$holdingbrtagsubf) =
&GetMarcFromKohaField("items.holdingbranch",$frameworkcode);
@big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}}
@big_array;
# now, construct template !
Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- cataloguing/addbiblio.pl 24 Apr 2007 13:54:29 -0000 1.23
+++ cataloguing/addbiblio.pl 27 Apr 2007 14:00:49 -0000 1.24
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbiblio.pl,v 1.23 2007/04/24 13:54:29 hdl Exp $
+# $Id: addbiblio.pl,v 1.24 2007/04/27 14:00:49 hdl Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -127,7 +127,7 @@
return -1;
} else {
if (C4::Context->preference("z3950NormalizeAuthor") and
C4::Context->preference("z3950AuthorAuthFields")){
- my ($tag,$subfield) =
GetMarcFromKohaField($dbh,"biblio.author");
+ my ($tag,$subfield) = GetMarcFromKohaField("biblio.author");
# my $summary = C4::Context->preference("z3950authortemplate");
my $auth_fields =
C4::Context->preference("z3950AuthorAuthFields");
my @auth_fields= split /,/,$auth_fields;
@@ -518,8 +518,8 @@
if ($biblionumber) {
$is_a_modif=1;
# if it's a modif, retrieve bibli and biblioitem numbers for the future
modification of old-DB.
- ($biblionumtagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField($dbh,"biblio.biblionumber",$frameworkcode);
- ($biblioitemnumtagfield,$biblioitemnumtagsubfield) =
&GetMarcFromKohaField($dbh,"biblioitems.biblioitemnumber",$frameworkcode);
+ ($biblionumtagfield,$biblionumtagsubfield) =
&GetMarcFromKohaField("biblio.biblionumber",$frameworkcode);
+ ($biblioitemnumtagfield,$biblioitemnumtagsubfield) =
&GetMarcFromKohaField("biblioitems.biblioitemnumber",$frameworkcode);
# search biblioitems value
my $sth=$dbh->prepare("select biblioitemnumber from biblioitems where
biblionumber=?");
$sth->execute($biblionumber);
Index: barcodes/label-item-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-item-search.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- barcodes/label-item-search.pl 24 Apr 2007 13:54:29 -0000 1.7
+++ barcodes/label-item-search.pl 27 Apr 2007 14:00:49 -0000 1.8
@@ -62,7 +62,7 @@
foreach my $marc (@marclist) {
if ($marc) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, $marc );
+ GetMarcFromKohaField( $marc );
if ($tag) {
push @tags, $dbh->quote("$tag$subfield");
}
Index: C4/Serials.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Serials.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- C4/Serials.pm 29 Mar 2007 13:30:31 -0000 1.13
+++ C4/Serials.pm 27 Apr 2007 14:00:49 -0000 1.14
@@ -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.13 2007/03/29 13:30:31 tipaul Exp $
+# $Id: Serials.pm,v 1.14 2007/04/27 14:00:49 hdl Exp $
use strict;
use C4::Date;
@@ -35,7 +35,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.13 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.14 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -1601,14 +1601,14 @@
unless ($exists) {
my $marcrecord = MARC::Record->new();
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.barcode", $fwk );
+ GetMarcFromKohaField( "items.barcode", $fwk );
my $newField =
MARC::Field->new( "$tag", '', '',
"$subfield" => $info->{barcode} );
$marcrecord->insert_fields_ordered($newField);
if ( $info->{branch} ) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.homebranch",
+ GetMarcFromKohaField( "items.homebranch",
$fwk );
#warn "items.homebranch : $tag , $subfield";
@@ -1623,7 +1623,7 @@
$marcrecord->insert_fields_ordered($newField);
}
( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.holdingbranch",
+ GetMarcFromKohaField( "items.holdingbranch",
$fwk );
#warn "items.holdingbranch : $tag , $subfield";
@@ -1640,7 +1640,7 @@
}
if ( $info->{itemcallnumber} ) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.itemcallnumber",
+ GetMarcFromKohaField( "items.itemcallnumber",
$fwk );
#warn "items.itemcallnumber : $tag , $subfield";
@@ -1657,7 +1657,7 @@
}
if ( $info->{notes} ) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.itemnotes", $fwk );
+ GetMarcFromKohaField( "items.itemnotes", $fwk );
# warn "items.itemnotes : $tag , $subfield";
if ( $marcrecord->field($tag) ) {
@@ -1673,7 +1673,7 @@
}
if ( $info->{location} ) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.location", $fwk );
+ GetMarcFromKohaField( "items.location", $fwk );
# warn "items.location : $tag , $subfield";
if ( $marcrecord->field($tag) ) {
@@ -1689,7 +1689,7 @@
}
if ( $info->{status} ) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.notforloan",
+ GetMarcFromKohaField( "items.notforloan",
$fwk );
# warn "items.notforloan : $tag , $subfield";
@@ -1706,7 +1706,7 @@
}
if ( C4::Context->preference("RoutingSerials") ) {
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.dateaccessioned",
+ GetMarcFromKohaField( "items.dateaccessioned",
$fwk );
if ( $marcrecord->field($tag) ) {
$marcrecord->field($tag)
Index: C4/Letters.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Letters.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- C4/Letters.pm 9 Mar 2007 14:31:47 -0000 1.6
+++ C4/Letters.pm 27 Apr 2007 14:00:49 -0000 1.7
@@ -30,7 +30,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.6 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.7 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -252,7 +252,7 @@
foreach (@$alerts) {
# and parse borrower ...
my $innerletter = $letter;
- my $borinfo = GetMember('',$_->{'borrowernumber'});
+ my $borinfo =
GetMember($_->{'borrowernumber'},'borrowernumber');
parseletter($innerletter,'borrowers',$_->{'borrowernumber'});
# ... then send mail
if ($borinfo->{emailaddress}) {
Index: C4/Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- C4/Biblio.pm 25 Apr 2007 16:26:42 -0000 1.200
+++ C4/Biblio.pm 27 Apr 2007 14:00:49 -0000 1.201
@@ -33,7 +33,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.200 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.201 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
@ISA = qw( Exporter );
@@ -215,8 +215,8 @@
# we build the new field with biblionumber and biblioitemnumber
# we drop the original field
# we add the new builded field.
- ( my $biblio_tag, my $biblio_subfield ) =
GetMarcFromKohaField($dbh,"biblio.biblionumber",$frameworkcode);
- ( my $biblioitem_tag, my $biblioitem_subfield ) =
GetMarcFromKohaField($dbh,"biblioitems.biblioitemnumber",$frameworkcode);
+ ( my $biblio_tag, my $biblio_subfield ) =
GetMarcFromKohaField("biblio.biblionumber",$frameworkcode);
+ ( my $biblioitem_tag, my $biblioitem_subfield ) =
GetMarcFromKohaField("biblioitems.biblioitemnumber",$frameworkcode);
my $newfield;
@@ -502,7 +502,7 @@
}
my $record = GetMarcItem( $biblionumber, $itemnumber );
- my ($tagfield, $tagsubfield) = GetMarcFromKohaField($dbh, $itemfield,'');
+ my ($tagfield, $tagsubfield) = GetMarcFromKohaField( $itemfield,'');
if ($tagfield && $tagsubfield) {
my $tag = $record->field($tagfield);
if ($tag) {
@@ -531,7 +531,7 @@
# get complete MARC record & replace the item field by the new one
my $completeRecord = GetMarcBiblio($biblionumber);
- my ($itemtag,$itemsubfield) =
GetMarcFromKohaField($dbh,"items.itemnumber",$frameworkcode);
+ my ($itemtag,$itemsubfield) =
GetMarcFromKohaField("items.itemnumber",$frameworkcode);
my $itemField = $ItemRecord->field($itemtag);
my @items = $completeRecord->field($itemtag);
foreach (@items) {
@@ -664,7 +664,7 @@
$copy2deleted->execute( $record->as_usmarc(), $itemnumber );
#search item field code
- my ( $itemtag, $itemsubfield ) =
GetMarcFromKohaField($dbh,"items.itemnumber",$frameworkcode);
+ my ( $itemtag, $itemsubfield ) =
GetMarcFromKohaField("items.itemnumber",$frameworkcode);
my @fields = $record->field($itemtag);
# delete the item specified
foreach my $field (@fields) {
@@ -921,7 +921,7 @@
my $sth;
$fwk = '' unless ($fwk);
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.notforloan", $fwk );
+ GetMarcFromKohaField( "items.notforloan", $fwk );
if ( $tag and $subfield ) {
my $sth =
$dbh->prepare(
@@ -1000,7 +1000,7 @@
my $sth;
$fwk = '' unless ($fwk);
my ( $tag, $subfield ) =
- GetMarcFromKohaField( $dbh, "items.location", $fwk );
+ GetMarcFromKohaField( "items.location", $fwk );
if ( $tag and $subfield ) {
my $sth =
$dbh->prepare(
@@ -1502,7 +1502,7 @@
=over 4
-($MARCfield,$MARCsubfield)=GetMarcFromKohaField($dbh,$kohafield,$frameworkcode);
+($MARCfield,$MARCsubfield)=GetMarcFromKohaField($kohafield,$frameworkcode);
Returns the MARC fields & subfields mapped to the koha field
for the given frameworkcode
@@ -1511,7 +1511,7 @@
=cut
sub GetMarcFromKohaField {
- my ( $dbh, $kohafield, $frameworkcode ) = @_;
+ my ( $kohafield, $frameworkcode ) = @_;
return 0, 0 unless $kohafield;
my $relations = C4::Context->marcfromkohafield;
return (
@@ -1636,7 +1636,7 @@
$record = MARC::Record::new_from_xml( $marcxml, "utf8", $marcflavour );
# now, find where the itemnumber is stored & extract only the item
my ( $itemnumberfield, $itemnumbersubfield ) =
- GetMarcFromKohaField( $dbh, 'items.itemnumber', '' );
+ GetMarcFromKohaField( 'items.itemnumber', '' );
my @fields = $record->field($itemnumberfield);
foreach my $field (@fields) {
if ( $field->subfield($itemnumbersubfield) eq $itemnumber ) {
@@ -2228,7 +2228,7 @@
my $res = "";
my ( $tagfield, $subfield ) =
- GetMarcFromKohaField( "", $kohatable . "." . $kohafield,
+ GetMarcFromKohaField( $kohatable . "." . $kohafield,
$frameworkcode );
foreach my $field ( $record->field($tagfield) ) {
if ( $field->tag() < 10 ) {
@@ -2477,7 +2477,7 @@
my $dbh = C4::Context->dbh;
my $frameworkcode = &GetFrameworkCode( $bibnum );
my ( $itemtagfield, $itemtagsubfield ) =
- &GetMarcFromKohaField( $dbh, "items.itemnumber", $frameworkcode );
+ &GetMarcFromKohaField( "items.itemnumber", $frameworkcode );
my $tagslib = &GetMarcStructure( $dbh, 1, $frameworkcode );
my $itemrecord = GetMarcItem( $bibnum, $itemnum) if ($itemnum);
my @loop_data;
@@ -2816,7 +2816,7 @@
my $dbh = C4::Context->dbh;
my ( $tagfield, $tagsubfield ) =
- GetMarcFromKohaField( $dbh, $itemfield, "" );
+ GetMarcFromKohaField( $itemfield, "" );
if ( ($tagfield) && ($tagsubfield) ) {
my $tag = $record->field($tagfield);
if ($tag) {
@@ -3689,8 +3689,11 @@
=cut
-# $Id: Biblio.pm,v 1.200 2007/04/25 16:26:42 tipaul Exp $
+# $Id: Biblio.pm,v 1.201 2007/04/27 14:00:49 hdl Exp $
# $Log: Biblio.pm,v $
+# Revision 1.201 2007/04/27 14:00:49 hdl
+# Removing $dbh from GetMarcFromKohaField (dbh is not used in this function.)
+#
# Revision 1.200 2007/04/25 16:26:42 tipaul
# Koha 3.0 nozebra 1st commit : the script
misc/migration_tools/rebuild_nozebra.pl build the nozebra table, and, if you
set NoZebra to Yes, queries will be done through zebra. TODO :
# - add nozebra table management on biblio editing
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha tools/export.pl serials/serials-edit.pl op...,
Henri-Damien LAURENT <=