[Koha-cvs] koha C4/Labels.pm C4/Record.pm C4/Search.pm acq... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Mon Dec 18 18:44:07 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/18 17:44:07
Modified files:
C4 : Labels.pm Record.pm Search.pm
acqui : addorder.pl finishreceive.pl neworderempty.pl
barcodes : label-item-search.pl label-print-opus-pdf.pl
label-print-pdf.pl label-print.pl
cataloguing : addbiblio.pl
cataloguing/value_builder: unimarc_field_4XX.pl
koha-tmpl/intranet-tmpl/prog/en/includes: menu-serials.inc
menus.inc
koha-tmpl/opac-tmpl/prog/en: opac-sendbasket.tmpl
opac-sendbasketform.tmpl
misc : overduenotices-30.pl
misc/notifys : fines.pl printnote.pl
reports : stats.screen.pl
serials : routing-preview.pl routing.pl serials-edit.pl
serials-recieve.pl subscription-detail.pl
Log message:
removing Data::Dumper
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Labels.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.6.3&r2=1.3.6.4
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Record.pm?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/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.36&r2=1.120.2.37
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/addorder.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.33.2.1&r2=1.33.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/finishreceive.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.20.2.6&r2=1.20.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/neworderempty.pl?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/barcodes/label-item-search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.6&r2=1.4.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print-opus-pdf.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print-pdf.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.3&r2=1.14.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.4&r2=1.4.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.16&r2=1.14.2.17
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.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.4&r2=1.3.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.23&r2=1.6.2.24
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.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-sendbasketform.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/misc/overduenotices-30.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/misc/notifys/fines.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/notifys/printnote.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.8.3&r2=1.1.8.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/stats.screen.pl?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/serials/routing-preview.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/serials/routing.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-edit.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-recieve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.6&r2=1.4.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.7&r2=1.3.2.8
Patches:
Index: C4/Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -b -r1.3.6.3 -r1.3.6.4
--- C4/Labels.pm 20 Nov 2006 15:23:37 -0000 1.3.6.3
+++ C4/Labels.pm 18 Dec 2006 17:44:06 -0000 1.3.6.4
@@ -21,11 +21,11 @@
require Exporter;
use vars qw($VERSION @ISA @EXPORT);
-#use Data::Dumper;
+
use PDF::Reuse;
use Text::Wrap;
-$VERSION = do { my @v = '$Revision: 1.3.6.3 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.3.6.4 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -237,7 +237,6 @@
}
$sth->finish;
- #warn Dumper @resultsloop;
return @resultsloop;
}
@@ -335,9 +334,6 @@
my $vPos = ( $y_pos + ( $label_height - $top_text_margin ) );
my $hPos = ( $x_pos + $left_text_margin );
- # warn Dumper $conf_data;
- #warn Dumper $item;
-
foreach my $field (@fields) {
# if the display option for this field is selected in the DB,
@@ -461,8 +457,6 @@
sub build_circ_barcode {
my ( $x_pos_circ, $y_pos, $value, $barcodetype, $item ) = @_;
-#warn Dumper \$item;
-
#warn "value = $value\n";
#$DB::single = 1;
Index: C4/Record.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Record.pm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- C4/Record.pm 30 Nov 2006 18:23:51 -0000 1.4.2.1
+++ C4/Record.pm 18 Dec 2006 17:44:06 -0000 1.4.2.2
@@ -18,7 +18,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
#
-# $Id: Record.pm,v 1.4.2.1 2006/11/30 18:23:51 toins Exp $
+# $Id: Record.pm,v 1.4.2.2 2006/12/18 17:44:06 toins Exp $
#
use strict; use warnings; #FIXME: turn off warnings before release
@@ -32,7 +32,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.4.2.1 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.4.2.2 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
@ISA = qw(Exporter);
@@ -459,8 +459,6 @@
}
#}
# the last has not been included inside the loop... do it now !
- #use Data::Dumper;
- #warn Dumper($field->{_subfields});
$record->add_fields($field) if (($field) && $field ne "");
#warn "HTML2MARC=".$record->as_formatted;
return $record;
@@ -570,6 +568,6 @@
=head1 MODIFICATIONS
-# $Id: Record.pm,v 1.4.2.1 2006/11/30 18:23:51 toins Exp $
+# $Id: Record.pm,v 1.4.2.2 2006/12/18 17:44:06 toins Exp $
=cut
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.36
retrieving revision 1.120.2.37
diff -u -b -r1.120.2.36 -r1.120.2.37
--- C4/Search.pm 7 Dec 2006 15:42:14 -0000 1.120.2.36
+++ C4/Search.pm 18 Dec 2006 17:44:06 -0000 1.120.2.37
@@ -25,7 +25,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.36 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.37 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -495,11 +495,6 @@
sub buildQuery {
my ( $query, $operators, $operands, $indexes, $limits, $sort_by ) = @_;
- # warn "OPERATORS : " . Data::Dumper::Dumper($operators);
- # warn "OPERANDS : " . Data::Dumper::Dumper($operands);
- # warn "INDEXES : " . Data::Dumper::Dumper($indexes);
- # warn "LIMITS : " . Data::Dumper::Dumper($limits);
- # warn "SORT BY : " . Data::Dumper::Dumper($sort_by);
my @operators = @$operators if $operators;
my @indexes = @$indexes if $indexes;
my @operands = @$operands if $operands;
Index: acqui/addorder.pl
===================================================================
RCS file: /sources/koha/koha/acqui/addorder.pl,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -b -r1.33.2.1 -r1.33.2.2
--- acqui/addorder.pl 18 Dec 2006 16:35:17 -0000 1.33.2.1
+++ acqui/addorder.pl 18 Dec 2006 17:44:06 -0000 1.33.2.2
@@ -124,7 +124,6 @@
use C4::Database;
-#use Data::Dumper;
#use Date::Manip;
my $input = new CGI;
Index: acqui/finishreceive.pl
===================================================================
RCS file: /sources/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -u -b -r1.20.2.6 -r1.20.2.7
--- acqui/finishreceive.pl 18 Dec 2006 16:35:17 -0000 1.20.2.6
+++ acqui/finishreceive.pl 18 Dec 2006 17:44:06 -0000 1.20.2.7
@@ -51,8 +51,6 @@
use C4::Auth;
-#use Data::Dumper;
-
my $input = new CGI;
my $dbh = C4::Context->dbh;
Index: acqui/neworderempty.pl
===================================================================
RCS file: /sources/koha/koha/acqui/neworderempty.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
--- acqui/neworderempty.pl 14 Dec 2006 15:41:54 -0000 1.1.2.2
+++ acqui/neworderempty.pl 18 Dec 2006 17:44:06 -0000 1.1.2.3
@@ -241,7 +241,6 @@
if ( $bibitemscount > 0 ) {
# warn "NEWBIBLIO: bibitems for $biblio exists\n";
- # warn Dumper $bibitemscount, @bibitems;
$bibitemsexists = 1;
my @bibitemloop;
Index: barcodes/label-item-search.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-item-search.pl,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -b -r1.4.2.6 -r1.4.2.7
--- barcodes/label-item-search.pl 18 Dec 2006 16:35:17 -0000 1.4.2.6
+++ barcodes/label-item-search.pl 18 Dec 2006 17:44:06 -0000 1.4.2.7
@@ -146,7 +146,7 @@
for ( $i = 0 ; $i <= ( $total - 1 ) ; $i++ )
{ #total-1 coz the array starts at 0
#warn $i;
- #warn Dumper $results->[$i]{'biblionumber'};
+
my $type = 'intra';
my @item_results =
&GetItemsInfo( $results->[$i]{'biblionumber'}, $type );
Index: barcodes/label-print-opus-pdf.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-print-opus-pdf.pl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- barcodes/label-print-opus-pdf.pl 20 Nov 2006 15:20:41 -0000 1.2.2.2
+++ barcodes/label-print-opus-pdf.pl 18 Dec 2006 17:44:06 -0000 1.2.2.3
@@ -45,9 +45,6 @@
my @resultsloop = get_label_items();
-#warn Dumper @resultsloop;
-warn Dumper $pdf->{'filename'};
-
$pdf->setlabel(0); # Start with label 5 on first page
foreach my $result (@resultsloop) {
Index: barcodes/label-print-pdf.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-print-pdf.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -b -r1.14.2.3 -r1.14.2.4
--- barcodes/label-print-pdf.pl 18 Dec 2006 16:35:17 -0000 1.14.2.3
+++ barcodes/label-print-pdf.pl 18 Dec 2006 17:44:06 -0000 1.14.2.4
@@ -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: label-print-pdf.pl,v 1.14.2.3 2006/12/18 16:35:17 toins Exp $
+# $Id: label-print-pdf.pl,v 1.14.2.4 2006/12/18 17:44:06 toins Exp $
=head1 label-print-pdf.pl
@@ -45,7 +45,6 @@
use C4::Labels;
use Acme::Comment;
-use Data::Dumper;
my $htdocs_path = C4::Context->config('intrahtdocs');
my $cgi = new CGI;
@@ -64,7 +63,6 @@
warn "UNITS $units";
warn "fontsize = $fontsize";
-warn Dumper $template;
my $unitvalue = GetUnitsValue($units);
warn $unitvalue;
Index: barcodes/label-print.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-print.pl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -b -r1.4.2.4 -r1.4.2.5
--- barcodes/label-print.pl 18 Dec 2006 16:35:17 -0000 1.4.2.4
+++ barcodes/label-print.pl 18 Dec 2006 17:44:06 -0000 1.4.2.5
@@ -28,8 +28,6 @@
my $htdocs_path = C4::Context->config('intrahtdocs');
-use Data::Dumper;
-
my $query = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -50,8 +48,6 @@
my $conf_data = $sth->fetchrow_hashref;
-#warn Dumper $conf_data;
-
$sth->finish;
my @data;
@@ -81,8 +77,6 @@
}
$sth->finish;
-#warn Dumper @resultsloop;
-
#------------------------------------------------------
#lets write barcode files to tmp dir for every item in @resultsloop
Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.14.2.16
retrieving revision 1.14.2.17
diff -u -b -r1.14.2.16 -r1.14.2.17
--- cataloguing/addbiblio.pl 18 Dec 2006 16:35:18 -0000 1.14.2.16
+++ cataloguing/addbiblio.pl 18 Dec 2006 17:44:06 -0000 1.14.2.17
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbiblio.pl,v 1.14.2.16 2006/12/18 16:35:18 toins Exp $
+# $Id: addbiblio.pl,v 1.14.2.17 2006/12/18 17:44:06 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -401,8 +401,6 @@
}
# $template->param($tabloop."XX" =>\@loop_data);
}
-# use Data::Dumper;
-# warn "DUMP : ".Dumper(@BIG_LOOP);
$template->param(BIG_LOOP => \@BIG_LOOP);
}
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.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- cataloguing/value_builder/unimarc_field_4XX.pl 14 Dec 2006 15:41:54 -0000 1.1.2.9
+++ cataloguing/value_builder/unimarc_field_4XX.pl 18 Dec 2006 17:44:06 -0000 1.1.2.10
@@ -251,8 +251,6 @@
$rechash->{CN}=$CN;
push @arrayresults,$rechash;
}
-# use Data::Dumper;warn Dumper(@arrayresults);
-
# for(my $i = 0 ; $i <= $#marclist ; $i++)
# {
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -b -r1.3.2.4 -r1.3.2.5
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc 17 Nov 2006 10:53:03 -0000 1.3.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc 18 Dec 2006 17:44:06 -0000 1.3.2.5
@@ -3,6 +3,7 @@
<a href="/cgi-bin/koha/serials/lateissues.pl">Late issue</a>
<a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
<a href="/cgi-bin/koha/serials/subscription-add.pl">Add a subscription</a>
+ <a href="/cgi-bin/koha/serials/checkexpiration.pl">check expiration</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.6.2.23
retrieving revision 1.6.2.24
diff -u -b -r1.6.2.23 -r1.6.2.24
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 18 Dec 2006 13:37:09 -0000 1.6.2.23
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 18 Dec 2006 17:44:06 -0000 1.6.2.24
@@ -5,8 +5,9 @@
<h3><a href="/cgi-bin/koha/mainpage.pl">Koha
intranet</a></h3>
<!-- TMPL_IF NAME="CAN_user_circulate" -->
- <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
+ <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
<ul>
+ <li>
<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
<label for="navfindborrower">Iss<span class="accesskey">u</span>e to:</label>
<input id="navfindborrower" name="findborrower" type="text" size="10" accesskey="u" />
@@ -25,16 +26,17 @@
</li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_borrowers" -->
- <li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+ <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
<ul>
<li><form action="/cgi-bin/koha/members/member.pl" method="post">
<label for="navmember">Sear<span class="accesskey">c</span>h: </label>
<input id="navmember" type="text" size="10" name="member" />
<input type="submit" value="OK" class="submit" />
- </form></li></ul></li>
+ </form>
+ </li>
+ </ul>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_catalogue" -->
- <li>
<a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
<ul>
<li>
@@ -48,9 +50,10 @@
</li>
<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li>
<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">reviews</a></li>
-</ul></li><!-- /TMPL_IF -->
+ </ul>
+ <!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
- <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
+ <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
<ul>
<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
@@ -69,14 +72,19 @@
<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
</ul>
</li>
- <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
+ <li>
+ <a href="/cgi-bin/koha/about.pl">About Koha</a>
+ </li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="loggedinusername" -->
- <br>
- <li> <b> Librarian Informations </b> : </li>
+ <br />
+ <li>
+ <b> Librarian Informations </b> :
+ </li>
+ </ul>
<ul>
- <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b> </li>
- <li> Library : <b><!-- TMPL_VAR NAME="LoginBranchname" --></b> </li>
+ <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></li>
+ <li> Library : <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
<!-- TMPL_IF NAME="AutoLocation" -->
<li>autolocate activated</li>
<!-- TMPL_ELSE -->
@@ -84,7 +92,11 @@
<!-- /TMPL_IF -->
</ul>
- <ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul>
+ <ul>
+ <li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li>
+ </ul>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="IntranetNav" -->
+ <!-- TMPL_VAR NAME="IntranetNav" -->
<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="IntranetNav" --><!-- TMPL_VAR NAME="IntranetNav" --><!-- /TMPL_IF -->
</div>
Index: koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.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-sendbasket.tmpl 3 Mar 2006 20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl 18 Dec 2006 17:44:06 -0000 1.1.2.1
@@ -9,9 +9,20 @@
<MESSAGE>
---------------------------------------------
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="isbn" -->
-Author: <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="additional" -->
-Additional authors: <!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+ <!-- TMPL_VAR NAME="title" -->
+ <!-- TMPL_IF name="subtitle" -->
+ <!-- TMPL_VAR NAME="subtitle" -->
+ <!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="MARCAUTHORS" -->
+<!-- TMPL_LOOP NAME="MARCAUTHORS"-->
+ Authors: <!-- TMPL_VAR NAME="authors" -->
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="publishercode" -->
+
ISBN: <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
Collection: <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="subject" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.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-sendbasketform.tmpl 22 Nov 2006 15:47:30 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl 18 Dec 2006 17:44:06 -0000 1.1.2.2
@@ -5,20 +5,40 @@
<h3>Sending your book bag</h3>
<!-- TMPL_IF NAME="email_add" -->
+
<!-- TMPL_IF NAME="SENT" -->
<p>The book bag was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
- <!-- TMPL_ELSE -->
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="error" -->
<p>Problem sending the book bag...</p>
<!-- /TMPL_IF -->
+
<!-- TMPL_ELSE -->
+
<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-<p> <label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
-<p><input type="submit" value="Send" />
- <input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
+ <p>
+ <label for="email_add">E-mail Address:</label>
+ <input type="text" id="email_add" name="email_add" size="35" />
+ </p>
+ <p>
+ <label for="comment">Comment</label><br />
+ <textarea id="comment" name="comment" rows="5" col="200"></textarea>
+ </p>
+ <p>
+ <input type="submit" value="Send" />
+ <input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
+ </p>
</form>
+
<!-- /TMPL_IF -->
-<p><form action="opac-sendbasket.pl" method="get" /><input type="submit" value="Close Window" onclick="window.close(); return false;" /></form></p>
+<p>
+
+ <form action="opac-sendbasket.pl" method="get" />
+ <input type="submit" value="Close Window" onclick="window.close(); return false;" />
+ </form>
+</p>
+
</div>
-</body>
-</html>
\ No newline at end of file
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: misc/overduenotices-30.pl
===================================================================
RCS file: /sources/koha/koha/misc/overduenotices-30.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
--- misc/overduenotices-30.pl 17 Nov 2006 14:57:22 -0000 1.1.2.1
+++ misc/overduenotices-30.pl 18 Dec 2006 17:44:06 -0000 1.1.2.2
@@ -34,7 +34,6 @@
use C4::Date;
use Mail::Sendmail; # comment out if not doing e-mail notices
use Getopt::Long;
-use Data::Dumper;
my ($confirm, $nomail, $mybranch, $myborcat,$myborcatout, $letter, $MAX, $choice);
GetOptions(
Index: misc/notifys/fines.pl
===================================================================
RCS file: /sources/koha/koha/misc/notifys/fines.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- misc/notifys/fines.pl 18 Dec 2006 16:35:19 -0000 1.3.2.2
+++ misc/notifys/fines.pl 18 Dec 2006 17:44:06 -0000 1.3.2.3
@@ -1,14 +1,25 @@
#!/usr/bin/perl
-# use lib ('/usr/local/koha/intranet/modules');
-
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
use C4::Database;
use C4::Members;
use C4::Circulation::Circ2;
use C4::Circulation::Fines;
use Date::Manip;
-use Data::Dumper;
use Mail::Sendmail;
use Mail::RFC822::Address;
Index: misc/notifys/printnote.pl
===================================================================
RCS file: /sources/koha/koha/misc/notifys/printnote.pl,v
retrieving revision 1.1.8.3
retrieving revision 1.1.8.4
diff -u -b -r1.1.8.3 -r1.1.8.4
--- misc/notifys/printnote.pl 18 Dec 2006 16:35:19 -0000 1.1.8.3
+++ misc/notifys/printnote.pl 18 Dec 2006 17:44:06 -0000 1.1.8.4
@@ -30,8 +30,6 @@
use C4::Circulation::Circ2;
use C4::Circulation::Fines;
-use Data::Dumper;
-
my $input = new CGI;
my $borrowernumber = $input->param('borrowernumber');
my $date= $input->param('date');
Index: reports/stats.screen.pl
===================================================================
RCS file: /sources/koha/koha/reports/stats.screen.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
--- reports/stats.screen.pl 18 Dec 2006 10:59:54 -0000 1.1.2.2
+++ reports/stats.screen.pl 18 Dec 2006 17:44:06 -0000 1.1.2.3
@@ -114,8 +114,6 @@
if ( $payments[$i]{'type'} ne 'writeoff' ) {
- # warn Dumper $payments[$i];
-
@charges = getcharges(
$payments[$i]{'borrowernumber'},
$payments[$i]{'timestamp'},
Index: serials/routing-preview.pl
===================================================================
RCS file: /sources/koha/koha/serials/routing-preview.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
--- serials/routing-preview.pl 21 Nov 2006 10:45:54 -0000 1.1.2.3
+++ serials/routing-preview.pl 18 Dec 2006 17:44:07 -0000 1.1.2.4
@@ -67,7 +67,7 @@
AND cancellationdate is NULL AND (found <> 'F' or found is NULL)");
$sth->execute($biblio,$routinglist[$i]->{'borrowernumber'});
my $data = $sth->fetchrow_hashref;
-# warn Dumper($data);
+
# warn "$routinglist[$i]->{'borrowernumber'} is the same as $data->{'borrowernumber'}";
if($routinglist[$i]->{'borrowernumber'} == $data->{'borrowernumber'}){
UpdateReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch);
Index: serials/routing.pl
===================================================================
RCS file: /sources/koha/koha/serials/routing.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- serials/routing.pl 18 Dec 2006 16:35:19 -0000 1.1.2.5
+++ serials/routing.pl 18 Dec 2006 17:44:07 -0000 1.1.2.6
@@ -123,7 +123,7 @@
push(@results, $data);
}
-# warn Dumper(@results);
+
# for adding routing list
my $new;
if ($op eq 'new') {
Index: serials/serials-edit.pl
===================================================================
RCS file: /sources/koha/koha/serials/Attic/serials-edit.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- serials/serials-edit.pl 5 Dec 2006 11:35:32 -0000 1.1.2.5
+++ serials/serials-edit.pl 18 Dec 2006 17:44:07 -0000 1.1.2.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.1.2.5 2006/12/05 11:35:32 toins Exp $
+# $Id: serials-edit.pl,v 1.1.2.6 2006/12/18 17:44:07 toins Exp $
=head1 NAME
@@ -91,8 +91,7 @@
my $subscriptionid=$query->param('subscriptionid');
my $serstatus=$query->param('serstatus');
my ($count, at tmpser)=GetSerials2($subscriptionid,$serstatus);
-# warn "count : $count";
-# use Data::Dumper;warn Dumper(@tmpser);
+
foreach (@tmpser)
{
push @serialids, $_->{'serialid'};
@@ -128,7 +127,6 @@
$notes[$i]);
}
}
-# use Data::Dumper;
if (C4::Context->preference("serialsadditems")){
my @moditems = $query->param('moditem');
my @tags = $query->param('tag');
Index: serials/serials-recieve.pl
===================================================================
RCS file: /sources/koha/koha/serials/Attic/serials-recieve.pl,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -b -r1.4.2.6 -r1.4.2.7
--- serials/serials-recieve.pl 14 Dec 2006 15:41:55 -0000 1.4.2.6
+++ serials/serials-recieve.pl 18 Dec 2006 17:44:07 -0000 1.4.2.7
@@ -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.6 2006/12/14 15:41:55 toins Exp $
+# $Id: serials-recieve.pl,v 1.4.2.7 2006/12/18 17:44:07 toins Exp $
=head1 NAME
@@ -191,8 +191,6 @@
my $temp = rand(10000000);
$serialslist[$i]->{'barcode'} = "TEMP" . sprintf("%.0f",$temp);
}
-# use Data::Dumper;
-# warn Dumper(@serialslist);
my $sth= C4::Serials::GetSubscriptionHistoryFromSubscriptionId();
Index: serials/subscription-detail.pl
===================================================================
RCS file: /sources/koha/koha/serials/subscription-detail.pl,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -b -r1.3.2.7 -r1.3.2.8
--- serials/subscription-detail.pl 18 Dec 2006 10:59:54 -0000 1.3.2.7
+++ serials/subscription-detail.pl 18 Dec 2006 17:44:07 -0000 1.3.2.8
@@ -152,8 +152,6 @@
$wkno++;
}
chop($weekarrayjs);
-# use Data::Dumper;
-# warn Dumper($subs);
# COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
# $template->param($subs);
More information about the Koha-cvs
mailing list