+ " />

Pay Fines By Amount
- Amount to be paid: $ - + Amount to be paid: $

@@ -92,34 +91,33 @@ From rch at liblime.com Sun Nov 4 23:46:28 2007 From: rch at liblime.com (Ryan Higgins) Date: Sun, 04 Nov 2007 22:46:28 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/circ return... [rel_2_2] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_2_2 Changes by: Ryan Higgins 07/11/04 22:46:28 Modified files: koha-tmpl/intranet-tmpl/npl/en/circ: returns.tmpl Log message: adding transferred msg to returns CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.4&r2=1.2.2.5 Patches: Index: returns.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/returns.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -b -r1.2.2.4 -r1.2.2.5 --- returns.tmpl 9 Mar 2006 18:04:19 -0000 1.2.2.4 +++ returns.tmpl 4 Nov 2007 22:46:27 -0000 1.2.2.5 @@ -103,6 +103,9 @@ Please return to + + Item transferred. + Not On Issue. From szrj1m at yahoo.com Thu Nov 15 04:48:58 2007 From: szrj1m at yahoo.com (Mason James) Date: Thu, 15 Nov 2007 03:48:58 +0000 Subject: [Koha-cvs] koha/C4 Import.pm [rel_2_2] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_2_2 Changes by: Mason James 07/11/15 03:48:58 Added files: C4 : Import.pm Log message: some handy subs() for importing marc, CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Import.pm?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1 Patches: Index: Import.pm =================================================================== RCS file: Import.pm diff -N Import.pm --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Import.pm 15 Nov 2007 03:48:58 -0000 1.1.2.1 @@ -0,0 +1,144 @@ +#!/usr/bin/perl -w + +package C4::Import; + +use strict; + +use MARC::File::USMARC; +use MARC::Record; +use MARC::Batch; +use MARC::Charset; +MARC::Charset->ignore_errors(1); + +use C4::Context; + +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); + +$VERSION = 0.01; + + at ISA = qw(Exporter); + + at EXPORT = qw( + &fMARC8ToUTF8 strip_blank_subfields +); + +sub strip_blank_subfields { + my ($record) = @_; +### $record; + + my @del_fields = $record->fields(); + foreach my $del_field (@del_fields) { + my @subs = $del_field->subfields(); + if ( $del_field->{'_tag'} > 10 ) { + foreach my $sub (@subs) { + my $name = $$sub[0]; + my $value = $$sub[1]; + if ( !$value && $value ne '0' ) { + $del_field->delete_subfield( code => $name ); + } + } + } + } + return $record; +} + +sub fMARC8ToUTF8($$) { + my ($record) = shift; + my ($verbose) = shift; + if ($verbose) { + if ( $verbose >= 2 ) { + my $leader = $record->leader(); + $leader =~ s/ /#/g; + print "\n000 " . $leader; + } + } + foreach my $field ( $record->fields() ) { + if ( $field->is_control_field() ) { + if ($verbose) { + if ( $verbose >= 2 ) { + my $fieldName = $field->tag(); + my $fieldValue = $field->data(); + $fieldValue =~ s/ /#/g; + print "\n" . $fieldName; + print ' ' . $fieldValue; + } + } + } + else { + my @subfieldsArray; + my $fieldName = $field->tag(); + my $indicator1Value = $field->indicator(1); + my $indicator2Value = $field->indicator(2); + if ($verbose) { + if ( $verbose >= 2 ) { + $indicator1Value =~ s/ /#/; + $indicator2Value =~ s/ /#/; + print "\n" + . $fieldName . ' ' + . $indicator1Value + . $indicator2Value; + } + } + foreach my $subfield ( $field->subfields() ) { + my $subfieldName = $subfield->[0]; + my $subfieldValue = $subfield->[1]; + $subfieldValue = MARC::Charset::marc8_to_utf8($subfieldValue); + + # Alas, MARC::Field::update() does not work correctly. + ## push (@subfieldsArray, $subfieldName, $subfieldValue); + + push @subfieldsArray, [ $subfieldName, $subfieldValue ]; + if ($verbose) { + if ( $verbose >= 2 ) { + print " \$" . $subfieldName . ' ' . $subfieldValue; + } + } + } + + # Alas, MARC::Field::update() does not work correctly. + # + # The first instance in the field of a of a repeated subfield + # overwrites the content from later instances with the content + # from the first instance. + ## $field->update(@subfieldsArray); + + foreach my $subfieldRow (@subfieldsArray) { + my $subfieldName = $subfieldRow->[0]; + $field->delete_subfields($subfieldName); + } + foreach my $subfieldRow (@subfieldsArray) { + $field->add_subfields(@$subfieldRow); + } + + if ($verbose) { + if ( $verbose >= 2 ) { + + # Reading the indicator values again is not necessary. + # They were not converted. + # $indicator1Value = $field->indicator(1); + # $indicator2Value = $field->indicator(2); + # $indicator1Value =~ s/ /#/; + # $indicator2Value =~ s/ /#/; + print "\nCONVERTED TO UTF-8:\n" + . $fieldName . ' ' + . $indicator1Value + . $indicator2Value; + foreach my $subfield ( $field->subfields() ) { + my $subfieldName = $subfield->[0]; + my $subfieldValue = $subfield->[1]; + print " \$" . $subfieldName . ' ' . $subfieldValue; + } + } + } + if ($verbose) { + if ( $verbose >= 2 ) { + print "\n" if $verbose; + } + } + } + } + $record->encoding('UTF-8'); + return $record; +} + +1; From kyle.m.hall at gmail.com Mon Nov 19 15:46:24 2007 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Mon, 19 Nov 2007 14:46:24 +0000 Subject: [Koha-cvs] koha/C4 Koha.pm Circulation/Circ2.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 07/11/19 14:46:24 Modified files: C4 : Koha.pm C4/Circulation : Circ2.pm Log message: Stats for renewals were not including the borrowernumber, or the itemtype. Fixed. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.17&r2=1.22.2.4.2.18 http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.87.2.14.2.34&r2=1.87.2.14.2.35 Patches: Index: Koha.pm =================================================================== RCS file: /sources/koha/koha/C4/Koha.pm,v retrieving revision 1.22.2.4.2.17 retrieving revision 1.22.2.4.2.18 diff -u -b -r1.22.2.4.2.17 -r1.22.2.4.2.18 --- Koha.pm 8 Jul 2007 22:14:21 -0000 1.22.2.4.2.17 +++ Koha.pm 19 Nov 2007 14:46:23 -0000 1.22.2.4.2.18 @@ -84,8 +84,9 @@ &getPreviousItemIssues &getItemnumberByBarcode + &getitemtypes -&getitemtypes + &GetItemType $DEBUG); @@ -1265,6 +1266,21 @@ } +sub GetItemType { + my ( $itemnumber ) = @_; + + my $dbh = C4::Context->dbh; + + my $sth = $dbh->prepare("SELECT biblioitems.itemtype FROM items, biblioitems WHERE items.biblionumber = biblioitems.biblionumber AND items.itemnumber = ?"); + $sth->execute( $itemnumber ) or return( 0 ); + + my $row = $sth->fetchrow_hashref; + + my $itemtype = $$row{'itemtype'}; + $sth->finish; + + return( $itemtype ); +} 1; __END__ Index: Circulation/Circ2.pm =================================================================== RCS file: /sources/koha/koha/C4/Circulation/Attic/Circ2.pm,v retrieving revision 1.87.2.14.2.34 retrieving revision 1.87.2.14.2.35 diff -u -b -r1.87.2.14.2.34 -r1.87.2.14.2.35 --- Circulation/Circ2.pm 31 Oct 2007 15:37:05 -0000 1.87.2.14.2.34 +++ Circulation/Circ2.pm 19 Nov 2007 14:46:24 -0000 1.87.2.14.2.35 @@ -3,7 +3,7 @@ package C4::Circulation::Circ2; -# $Id: Circ2.pm,v 1.87.2.14.2.34 2007/10/31 15:37:05 kylemhall Exp $ +# $Id: Circ2.pm,v 1.87.2.14.2.35 2007/11/19 14:46:24 kylemhall Exp $ #package to deal with Returns #written 3/11/99 by olwen at katipo.co.nz @@ -1825,7 +1825,8 @@ $sth->finish; # Log the renewal - UpdateStats($env,$env->{'branchcode'},'renew','','',$itemno); + my $itemtype = GetItemType( $itemno ); + UpdateStats($env,$env->{'branchcode'},'renew','','',$itemno, $itemtype, $bornum); # Charge a new rental fee, if applicable? my ($charge,$type)=calc_charges($env, $itemno, $bornum); From cmurdock at ccfls.org Tue Nov 20 16:02:38 2007 From: cmurdock at ccfls.org (Cindy Murdock) Date: Tue, 20 Nov 2007 15:02:38 +0000 Subject: [Koha-cvs] koha/C4 Biblio.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Cindy Murdock 07/11/20 15:02:38 Modified files: C4 : Biblio.pm Log message: Changed line 961 to update deletedbiblioitems instead of deleteditems; it was trying to write to the 'marc' field, which doesn't exist in deleteditems but is instead in deletedbiblioitems. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.115.2.51.2.44&r2=1.115.2.51.2.45 Patches: Index: Biblio.pm =================================================================== RCS file: /sources/koha/koha/C4/Biblio.pm,v retrieving revision 1.115.2.51.2.44 retrieving revision 1.115.2.51.2.45 diff -u -b -r1.115.2.51.2.44 -r1.115.2.51.2.45 --- Biblio.pm 20 Sep 2007 20:14:05 -0000 1.115.2.51.2.44 +++ Biblio.pm 20 Nov 2007 15:02:37 -0000 1.115.2.51.2.45 @@ -957,7 +957,7 @@ my $record = MARCgetbiblio( $dbh, $biblionumber); # backup the record - my $copy2deleted = $dbh->prepare("UPDATE deleteditems SET marc=? WHERE itemnumber=?"); + my $copy2deleted = $dbh->prepare("UPDATE deletedbiblioitems SET marc=? WHERE biblioitemnumber=?"); $copy2deleted->execute( $record->as_usmarc(), $itemnumber ); # search item field code @@ -3158,8 +3158,13 @@ =cut -# $Id: Biblio.pm,v 1.115.2.51.2.44 2007/09/20 20:14:05 clm Exp $ +# $Id: Biblio.pm,v 1.115.2.51.2.45 2007/11/20 15:02:37 clm Exp $ # $Log: Biblio.pm,v $ +# Revision 1.115.2.51.2.45 2007/11/20 15:02:37 clm +# Changed line 961 to update deletedbiblioitems instead of deleteditems; +# it was trying to write to the 'marc' field, which doesn't exist in deleteditems +# but is instead in deletedbiblioitems. +# # Revision 1.115.2.51.2.44 2007/09/20 20:14:05 clm # The koha_modify_item sub wasn't saving changes to price or replacementprice. Fixed. # From cmurdock at ccfls.org Tue Nov 20 19:31:29 2007 From: cmurdock at ccfls.org (Cindy Murdock) Date: Tue, 20 Nov 2007 18:31:29 +0000 Subject: [Koha-cvs] koha/C4 Biblio.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Cindy Murdock 07/11/20 18:31:29 Modified files: C4 : Biblio.pm Log message: Fixed sub _koha_modify_item so that changes to itemnotes & itemlost are actually saved. Also removed update to biblioitemnumber, since it seemed to be inserting '0' into biblioitemnumber on editing an item instead of the actual bibitemnum. I don't think it's necessary to rewrite that while we're just modifying item level data anyway. Should $item->{bibitemnum} really be $item->{biblioitemnumber}? I tried changing that, but it didn't seem to fix biblioitemnumber being set to 0, so I left it untouched. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.115.2.51.2.45&r2=1.115.2.51.2.46 Patches: Index: Biblio.pm =================================================================== RCS file: /sources/koha/koha/C4/Biblio.pm,v retrieving revision 1.115.2.51.2.45 retrieving revision 1.115.2.51.2.46 diff -u -b -r1.115.2.51.2.45 -r1.115.2.51.2.46 --- Biblio.pm 20 Nov 2007 15:02:37 -0000 1.115.2.51.2.45 +++ Biblio.pm 20 Nov 2007 18:31:28 -0000 1.115.2.51.2.46 @@ -2104,20 +2104,20 @@ barcode=?,itemnotes=?,itemcallnumber=?,notforloan=?,location=?,multivolumepart=?,multivolume=?,stack=?,wthdrawn=?,holdingbranch=?,homebranch=?,cutterextra=?, onloan=?, binding=?,price=?,replacementprice=?"; my @bind = ( - $item->{'barcode'}, $item->{'notes'}, + $item->{'barcode'}, $item->{'itemnotes'}, $item->{'itemcallnumber'}, $item->{'notforloan'}, $item->{'location'}, $item->{'multivolumepart'}, $item->{'multivolume'}, $item->{'stack'}, $item->{'wthdrawn'},$item->{'holdingbranch'},$item->{'homebranch'},$cutterextra,$item->{'onloan'},$item->{'binding'},$item->{'price'},$item{'replacementprice'} ); - if ( $item->{'lost'} ne '' ) { - $query = "update items set biblioitemnumber=?,barcode=?,itemnotes=?,homebranch=?, + if ( $item->{'itemlost'} ne '' | '0' ) { + $query = "update items set barcode=?,itemnotes=?,homebranch=?, itemlost=?,wthdrawn=?,itemcallnumber=?,notforloan=?, location=?,multivolumepart=?,multivolume=?,stack=?,wthdrawn=?,holdingbranch=?,cutterextra=?,onloan=?, binding=?,price=?,replacementprice=?"; @bind = ( $item->{'bibitemnum'}, $item->{'barcode'}, - $item->{'notes'}, $item->{'homebranch'}, - $item->{'lost'}, $item->{'wthdrawn'}, + $item->{'itemnotes'}, $item->{'homebranch'}, + $item->{'itemlost'}, $item->{'wthdrawn'}, $item->{'itemcallnumber'}, $item->{'notforloan'}, $item->{'location'}, $item->{'multivolumepart'}, $item->{'multivolume'}, $item->{'stack'}, @@ -3158,8 +3158,17 @@ =cut -# $Id: Biblio.pm,v 1.115.2.51.2.45 2007/11/20 15:02:37 clm Exp $ +# $Id: Biblio.pm,v 1.115.2.51.2.46 2007/11/20 18:31:28 clm Exp $ # $Log: Biblio.pm,v $ +# Revision 1.115.2.51.2.46 2007/11/20 18:31:28 clm +# Fixed sub _koha_modify_item so that changes to itemnotes & itemlost are actually saved. +# Also removed update to biblioitemnumber, since it seemed to be inserting '0' into biblioitemnumber +# on editing an item instead of the actual bibitemnum. I don't think it's necessary to rewrite +# that while we're just modifying item level data anyway. +# +# Should $item->{bibitemnum} really be $item->{biblioitemnumber}? I tried changing that, but +# it didn't seem to fix biblioitemnumber being set to 0, so I left it untouched. +# # Revision 1.115.2.51.2.45 2007/11/20 15:02:37 clm # Changed line 961 to update deletedbiblioitems instead of deleteditems; # it was trying to write to the 'marc' field, which doesn't exist in deleteditems From cmurdock at ccfls.org Wed Nov 21 16:56:49 2007 From: cmurdock at ccfls.org (Cindy Murdock) Date: Wed, 21 Nov 2007 15:56:49 +0000 Subject: [Koha-cvs] koha/C4 Biblio.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Cindy Murdock 07/11/21 15:56:48 Modified files: C4 : Biblio.pm Log message: One further tweak of yesterday's fix. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.115.2.51.2.46&r2=1.115.2.51.2.47 Patches: Index: Biblio.pm =================================================================== RCS file: /sources/koha/koha/C4/Biblio.pm,v retrieving revision 1.115.2.51.2.46 retrieving revision 1.115.2.51.2.47 diff -u -b -r1.115.2.51.2.46 -r1.115.2.51.2.47 --- Biblio.pm 20 Nov 2007 18:31:28 -0000 1.115.2.51.2.46 +++ Biblio.pm 21 Nov 2007 15:56:48 -0000 1.115.2.51.2.47 @@ -2115,7 +2115,7 @@ itemlost=?,wthdrawn=?,itemcallnumber=?,notforloan=?, location=?,multivolumepart=?,multivolume=?,stack=?,wthdrawn=?,holdingbranch=?,cutterextra=?,onloan=?, binding=?,price=?,replacementprice=?"; @bind = ( - $item->{'bibitemnum'}, $item->{'barcode'}, + $item->{'barcode'}, $item->{'itemnotes'}, $item->{'homebranch'}, $item->{'itemlost'}, $item->{'wthdrawn'}, $item->{'itemcallnumber'}, $item->{'notforloan'}, @@ -3158,8 +3158,11 @@ =cut -# $Id: Biblio.pm,v 1.115.2.51.2.46 2007/11/20 18:31:28 clm Exp $ +# $Id: Biblio.pm,v 1.115.2.51.2.47 2007/11/21 15:56:48 clm Exp $ # $Log: Biblio.pm,v $ +# Revision 1.115.2.51.2.47 2007/11/21 15:56:48 clm +# One further tweak of yesterday's fix. +# # Revision 1.115.2.51.2.46 2007/11/20 18:31:28 clm # Fixed sub _koha_modify_item so that changes to itemnotes & itemlost are actually saved. # Also removed update to biblioitemnumber, since it seemed to be inserting '0' into biblioitemnumber From cmurdock at ccfls.org Tue Nov 27 17:53:42 2007 From: cmurdock at ccfls.org (Cindy Murdock) Date: Tue, 27 Nov 2007 16:53:42 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en/members m... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Cindy Murdock 07/11/27 16:53:42 Modified files: koha-tmpl/intranet-tmpl/ccfls/en/members: memberentry.tmpl Log message: Fix typo. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.12&r2=1.1.2.1.2.13 Patches: Index: memberentry.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/memberentry.tmpl,v retrieving revision 1.1.2.1.2.12 retrieving revision 1.1.2.1.2.13 diff -u -b -r1.1.2.1.2.12 -r1.1.2.1.2.13 --- memberentry.tmpl 12 Jun 2007 16:49:40 -0000 1.1.2.1.2.12 +++ memberentry.tmpl 27 Nov 2007 16:53:42 -0000 1.1.2.1.2.13 @@ -409,7 +409,7 @@ - Ciculation Note:

(Appears For Librarians Only)

+ Circulation Note:

(Appears For Librarians Only)

Patron Note:

(Appears for Patron When Logged Into OPAC)