[Koha-cvs] koha label-home.pl C4/Calendar.pm C4/Koha.pm C4... [dev_week]
Mason James
szrj1m at yahoo.com
Mon Jul 9 00:14:24 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Mason James <sushi> 07/07/08 22:14:24
Modified files:
. : label-home.pl
C4 : Calendar.pm Koha.pm Labels.pm
barcodes : 1 create_blank_labels_tables.sql
dump.all.labels.tables.sh label-manager.pl
label-print-pdf.pl
circ : branchtransfers.pl
koha-tmpl/intranet-tmpl/ccfls/en/circ: returns.tmpl
koha-tmpl/intranet-tmpl/katipo/en/bull:
routing-preview-slip.tmpl
koha-tmpl/intranet-tmpl/npl/en/barcodes: barcodes.tmpl
label-home.tmpl
label-manager.tmpl
result.tmpl
koha-tmpl/intranet-tmpl/npl/en/images: more.gif
koha-tmpl/intranet-tmpl/npl/en/includes: holidays-top.inc
members : moremember.pl
misc : bulkauthimport.pl
tools : holidays.pl newHolidays.pl
Removed files:
barcodes : label-home.pl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/label-home.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.3&r2=1.1.2.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Calendar.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.16&r2=1.22.2.4.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Labels.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.3.4.16&r2=1.3.4.17
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/1?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/create_blank_labels_tables.sql?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/dump.all.labels.tables.sh?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-manager.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.6&r2=1.1.2.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print-pdf.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.12&r2=1.1.2.2.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-home.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.4.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.20.4.8.2.1&r2=1.20.4.8.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.8&r2=1.1.2.1.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/bull/routing-preview-slip.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.9&r2=1.1.2.2.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-manager.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.7&r2=1.1.2.3.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.1&r2=1.1.2.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/images/more.gif?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/holidays-top.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.14.2.6&r2=1.5.2.14.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/misc/bulkauthimport.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/tools/holidays.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/tools/newHolidays.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.1&r2=1.3.2.2
Patches:
Index: label-home.pl
===================================================================
RCS file: /sources/koha/koha/Attic/label-home.pl,v
retrieving revision 1.1.2.1.2.3
retrieving revision 1.1.2.1.2.4
diff -u -b -r1.1.2.1.2.3 -r1.1.2.1.2.4
--- label-home.pl 3 Jul 2007 07:52:54 -0000 1.1.2.1.2.3
+++ label-home.pl 8 Jul 2007 22:14:21 -0000 1.1.2.1.2.4
@@ -10,6 +10,7 @@
use HTML::Template;
use Data::Dumper;
+use Smart::Comments;
my $query = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -30,31 +31,32 @@
#warn Dumper @label_templates;
-my @layouts = get_layouts();
+my @printingtypes = get_printingtypes();
+
+#my @layouts = get_layouts();
+my @layouts = get_layout("5");
+
my @barcode_types = get_barcode_types();
+my @batches = get_batches();
-warn Dumper @barcode_types;
+my $text_fields = get_text_fields();
-$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
+### $data
-$data->{'printingtype'} = 'both' if ( !$data->{'printingtype'} );
-$template->param( "printingtype_$data->{'printingtype'}" => 1 );
+$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
$template->param( "papertype_$data->{'papertype'}" => 1 );
-
$template->param( "$data->{'barcodetype'}_checked" => 1 );
-
$template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
$template->param(
- itemtype => $data->{'itemtype'},
active_template => $data->{'active_template'},
label_templates => \@label_templates,
-
barcode_types => \@barcode_types,
- layouts => \@layouts,
-
+ printingtypes => \@printingtypes,
+layout_loop => \@layouts,
+batches => \@batches,
papertype => $data->{'papertype'},
author => $data->{'author'},
barcode => $data->{'barcode'},
@@ -62,6 +64,8 @@
barcodetype => $data->{'barcodetype'},
title => $data->{'title'},
isbn => $data->{'isbn'},
+ issn => $data->{'issn'},
+ itemtype => $data->{'itemtype'},
dewey => $data->{'dewey'},
class => $data->{'class'},
subclass => $data->{'subclass'},
Index: C4/Calendar.pm
===================================================================
RCS file: /sources/koha/koha/C4/Calendar.pm,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- C4/Calendar.pm 19 Apr 2007 01:54:02 -0000 1.3.2.1
+++ C4/Calendar.pm 8 Jul 2007 22:14:21 -0000 1.3.2.2
@@ -406,7 +406,11 @@
$isWeekdayHoliday->finish; # Close the last query
my $isDayMonthHoliday = $dbh->prepare("select id from repeatable_holidays where (branchcode = '$self->{branchcode}') (day = $options{day}) and (month = $options{month})");
+use Data::Dumper;
+warn Dumper $isDayMonthHoliday;
$isDayMonthHoliday->execute;
+
+
if ($isDayMonthHoliday->rows) {
my $id = $isDayMonthHoliday->fetchrow;
$isDayMonthHoliday->finish;
Index: C4/Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.22.2.4.2.16
retrieving revision 1.22.2.4.2.17
diff -u -b -r1.22.2.4.2.16 -r1.22.2.4.2.17
--- C4/Koha.pm 18 May 2007 19:52:02 -0000 1.22.2.4.2.16
+++ C4/Koha.pm 8 Jul 2007 22:14:21 -0000 1.22.2.4.2.17
@@ -84,12 +84,37 @@
&getPreviousItemIssues
&getItemnumberByBarcode
+
+&getitemtypes
+
$DEBUG);
use vars qw();
my $DEBUG = 0;
+
+
+
+sub getitemtypes {
+# returns a reference to a hash of references to branches...
+ my %itemtypes;
+ my $dbh = C4::Context->dbh;
+ my $sth=$dbh->prepare("select * from itemtypes order by description");
+ $sth->execute;
+ while (my $IT=$sth->fetchrow_hashref) {
+ $itemtypes{$IT->{'itemtype'}}=$IT;
+ }
+use Data::Dumper;
+warn Dumper %itemtypes;
+ return (\%itemtypes);
+}
+
+
+
+
+
+
=head2 slashifyDate
$slash_date = &slashifyDate($dash_date);
@@ -325,6 +350,10 @@
=head3 in PERL SCRIPT
+### FIXME different call to getitemtypes now.
+### ($itemtype_count, @itemtypes) = GetItemtypes;
+### needs new example
+
my $itemtypes = GetItemtypes;
my @itemtypesloop;
foreach my $thisitemtype (keys %$itemtypes) {
Index: C4/Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.16
retrieving revision 1.3.4.17
diff -u -b -r1.3.4.16 -r1.3.4.17
--- C4/Labels.pm 8 Jul 2007 17:54:34 -0000 1.3.4.16
+++ C4/Labels.pm 8 Jul 2007 22:14:21 -0000 1.3.4.17
@@ -166,7 +166,7 @@
my @text_fields = ( $a, $b, $c, $d, $e, $f, $g, $h, $i );
### fields need to be sorted here.....
-#y @textfields = sort { my $ii->order cmp my $jj->order } @text_fields ;
+ @textfields = sort { my $ii->{'order'} cmp my $jj->{'order'} } @text_fields ;
### @text_fields;
return @text_fields;
Index: barcodes/1
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/1,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- barcodes/1 2 Oct 2006 22:01:39 -0000 1.1.2.1
+++ barcodes/1 8 Jul 2007 22:14:21 -0000 1.1.2.2
@@ -3,67 +3,71 @@
use strict;
use CGI;
use C4::Auth;
-use C4::Context;
use C4::Output;
use C4::Labels;
use C4::Interface::CGI::Output;
+use C4::Context;
use HTML::Template;
-use POSIX;
use Data::Dumper;
-my $dbh = C4::Context->dbh;
my $query = new CGI;
-my $op = $query->param('op');
-my $tmpl_code = $query->param('tmpl_code');
-
-if (!$op) {
- $op = 'display';
-}
-
-
-my $width = $query->param('width');
-my $height = $query->param('height');
-my $topmargin = $query->param('topmargin');
-my $leftmargin = $query->param('leftmargin');
-my $columns = $query->param('columns');
-my $rows = $query->param('rows');
-my $colgap = $query->param('colgap');
-my $rowgap = $query->param('rowgap');
-
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "barcodes/label-templates.tmpl",
+ template_name => "barcodes/label-home.tmpl",
query => $query,
type => "intranet",
- authnotrequired => 1,
+ authnotrequired => 0,
flagsrequired => { catalogue => 1 },
debug => 1,
}
);
-my @resultsloop;
+my $data = get_label_options();
+
+my $active_template = GetActiveLabelTemplate();
+my @label_templates = GetAllLabelTemplates();
+my @label_layouts = get_labels_layouts();
+
+warn Dumper @label_templates;
+
+my %layouts = get_labels_layouts;
+my %barcode_types = get_barcode_types;
+warn "KKKKKKKKKKKKKKKKKKKKKK";
+
+warn Dumper %barcode_types;
+
+$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
+$data->{'printingtype'} = 'both' if ( !$data->{'printingtype'} );
+$template->param( "printingtype_$data->{'printingtype'}" => 1 );
+$template->param( "papertype_$data->{'papertype'}" => 1 );
+$template->param( "$data->{'barcodetype'}_checked" => 1 );
-if ( $op eq 'display' ) {
- @resultsloop=GetAllLabelTemplates();
-}
+$template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
-elsif ( $op eq 'delete' ) {
- DeleteTemplate($tmpl_code);
- @resultsloop=GetAllLabelTemplates();
-}
-elsif ( $op eq 'save' ) {
-warn "SSSSSSSSSSSSSSSSSSSSSSSSSAVING!!!!!!!!!!!!!!!!!!";
- SaveTemplate($tmpl_code);
- @resultsloop=GetAllLabelTemplates();
-}
$template->param(
- resultsloop => \@resultsloop,
+ itemtype => $data->{'itemtype'},
+ active_template => $data->{'active_template'},
+ label_templates => \@label_templates,
+
+ papertype => $data->{'papertype'},
+ author => $data->{'author'},
+ barcode => $data->{'barcode'},
+ id => $data->{'id'},
+ barcodetype => $data->{'barcodetype'},
+ title => $data->{'title'},
+ isbn => $data->{'isbn'},
+ dewey => $data->{'dewey'},
+ class => $data->{'class'},
+ subclass => $data->{'subclass'},
+ itemcallnumber => $data->{'itemcallnumber'},
+ startlabel => $data->{'startlabel'},
+ fontsize => $active_template->{'fontsize'},
intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
Index: barcodes/create_blank_labels_tables.sql
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/create_blank_labels_tables.sql,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- barcodes/create_blank_labels_tables.sql 18 Jan 2007 04:33:53 -0000 1.1.2.1
+++ barcodes/create_blank_labels_tables.sql 8 Jul 2007 22:14:21 -0000 1.1.2.2
@@ -12,19 +12,22 @@
CREATE TABLE `labels_conf` (
`id` int(4) NOT NULL auto_increment,
`barcodetype` char(100) default '',
- `title` tinyint(1) default '0',
- `isbn` tinyint(1) default '0',
- `itemtype` tinyint(1) default '0',
- `barcode` tinyint(1) default '0',
- `dewey` tinyint(1) default '0',
- `class` tinyint(1) default '0',
- `subclass` tinyint(1) default '0',
- `itemcallnumber` tinyint(1) default '0',
- `author` tinyint(1) default '0',
+ `title` int(1) default '0',
+ `itemtype` int(1) default '0',
+ `barcode` int(1) default '0',
+ `dewey` int(1) default '0',
+ `class` int(1) default '0',
+ `subclass` int(1) default '0',
+ `itemcallnumber` int(1) default '0',
+ `author` int(1) default '0',
+ `issn` int(1) default '0',
+ `isbn` int(1) default '0',
`startlabel` int(2) default NULL,
- `printingtype` char(10) default NULL,
- `guidebox` tinyint(1) default NULL,
+ `printingtype` char(32) default NULL,
+ `guidebox` int(1) default NULL,
+ `active` tinyint(1) default NULL,
`fonttype` char(10) default NULL,
+ `layoutname` varchar(32) default NULL,
PRIMARY KEY (`id`)
) TYPE=MyISAM;
@@ -60,6 +63,7 @@
DROP TABLE IF EXISTS `labels`;
CREATE TABLE `labels` (
`labelid` int(11) NOT NULL auto_increment,
+ `batch_id` varchar(10),
`itemnumber` varchar(100) NOT NULL default '',
`timestamp` timestamp(14) NOT NULL,
PRIMARY KEY (`labelid`)
Index: barcodes/dump.all.labels.tables.sh
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/dump.all.labels.tables.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- barcodes/dump.all.labels.tables.sh 2 Oct 2006 22:01:39 -0000 1.1.2.1
+++ barcodes/dump.all.labels.tables.sh 8 Jul 2007 22:14:21 -0000 1.1.2.2
@@ -1 +1,2 @@
-mysqldump -uhltadmin -pranjit hlt --add-drop-table labels labels_conf labels_templates
+mysqldump -uroot -p3tchNmYsql demo_dev --opt labels labels_conf labels_templates
+
Index: barcodes/label-manager.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-manager.pl,v
retrieving revision 1.1.2.1.2.6
retrieving revision 1.1.2.1.2.7
diff -u -b -r1.1.2.1.2.6 -r1.1.2.1.2.7
--- barcodes/label-manager.pl 5 Jul 2007 20:58:59 -0000 1.1.2.1.2.6
+++ barcodes/label-manager.pl 8 Jul 2007 22:14:22 -0000 1.1.2.1.2.7
@@ -14,6 +14,8 @@
my $dbh = C4::Context->dbh;
my $query = new CGI;
my $op = $query->param('op');
+my $layout_id = $query->param('layout_id');
+my $layoutname = $query->param('layoutname');
my $barcodetype = $query->param('barcodetype');
my $title = $query->param('title');
my $isbn = $query->param('isbn');
@@ -36,6 +38,8 @@
warn Dumper $query;
warn "ID =$tmpl_id";
+### $printingtype;
+### $batch_id;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -53,11 +57,12 @@
$barcodetype, $title, $isbn,
$issn, $itemtype, $bcn, $dcn,
$classif, $subclass, $itemcallnumber, $author,
- $tmpl_id, $printingtype, $guidebox, $startlabel
+ $tmpl_id, $printingtype, $guidebox, $startlabel, $layoutname
);
-
+ print $query->redirect("../label-home.pl");
+ exit;
}
-elsif ( $op eq 'add' ) {
+elsif ( $op eq 'add' ) { # add item
my $query2 = "INSERT INTO labels ( itemnumber, batch_id ) values ( ?,? )";
my $sth2 = $dbh->prepare($query2);
$sth2->execute($itemnumber, $batch_id);
@@ -83,30 +88,24 @@
}
elsif ( $op eq 'add_batch' ) {
-### iiiiiii
- add_batch();
-}
+ $batch_id= add_batch();
+}
+elsif ( $op eq 'set_active_layout' ) {
+ set_active_layout($layout_id);
+ print $query->redirect("../label-home.pl");
+ exit;
+}
# first lets do a read of the labels table , to get the a list of the
# currently entered items to be prinited
my @batches = get_batches();
-
my @resultsloop = get_label_items($batch_id);
-
-# this script can be run from the side nav, and is not passed a value for $startrow
-# so lets get it from the DB
-
-my $dbh = C4::Context->dbh;
-my $query2 = "SELECT * FROM labels_conf LIMIT 1";
-my $sth = $dbh->prepare($query2);
-$sth->execute();
-
-my $data = $sth->fetchrow_hashref;
-$sth->finish;
+my $tmpl =GetActiveLabelTemplate();
+### $tmpl
#calc-ing number of sheets
#my $number_of_results = scalar @resultsloop;
@@ -121,6 +120,7 @@
resultsloop => \@resultsloop,
batches => \@batches,
batch_id => $batch_id,
+tmpl_desc => $tmpl->{'tmpl_desc'},
# startrow => $startrow,
# sheets => $sheets_needed,
Index: barcodes/label-print-pdf.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-print-pdf.pl,v
retrieving revision 1.1.2.2.2.12
retrieving revision 1.1.2.2.2.13
diff -u -b -r1.1.2.2.2.12 -r1.1.2.2.2.13
--- barcodes/label-print-pdf.pl 6 Jul 2007 03:24:41 -0000 1.1.2.2.2.12
+++ barcodes/label-print-pdf.pl 8 Jul 2007 22:14:22 -0000 1.1.2.2.2.13
@@ -23,7 +23,9 @@
# get the printing settings
my $template = GetActiveLabelTemplate();
my $conf_data = get_label_options();
-my @resultsloop = get_label_items();
+
+my $batch_id = $cgi->param('batch_id');
+my @resultsloop = get_label_items($batch_id);
$DB::single = 1;
@@ -46,7 +48,7 @@
my $units = 'POINTS'
=cut
-my $fontsize = 3;
+#my $fontsize = 3;
#warn "UNITS $units";
#warn "fontsize = $fontsize";
@@ -198,6 +200,13 @@
}
+ elsif ( $printingtype eq 'BIB' ) {
+ drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+ DrawSpineText( $y_pos, $label_height, $fontsize, $x_pos,
+ $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+ CalcNextLabelPos();
+ }
+
Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.20.4.8.2.1
retrieving revision 1.20.4.8.2.2
diff -u -b -r1.20.4.8.2.1 -r1.20.4.8.2.2
--- circ/branchtransfers.pl 5 Oct 2006 19:02:44 -0000 1.20.4.8.2.1
+++ circ/branchtransfers.pl 8 Jul 2007 22:14:22 -0000 1.20.4.8.2.2
@@ -316,6 +316,10 @@
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
);
+
+
+use Data::Dumper;
+warn Dumper @branchoptionloop;
output_html_with_http_headers $query, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/ccfls/en/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/returns.tmpl,v
retrieving revision 1.1.2.1.2.8
retrieving revision 1.1.2.1.2.9
diff -u -b -r1.1.2.1.2.8 -r1.1.2.1.2.9
--- koha-tmpl/intranet-tmpl/ccfls/en/circ/returns.tmpl 22 May 2007 11:50:42 -0000 1.1.2.1.2.8
+++ koha-tmpl/intranet-tmpl/ccfls/en/circ/returns.tmpl 8 Jul 2007 22:14:22 -0000 1.1.2.1.2.9
@@ -122,7 +122,7 @@
<h1>Circulation: Returns</h1>
<div class="details">
<form method="post" action="/cgi-bin/koha/circ/returns.pl" name="mainform" id="mainform">
- <label for="barcode">Enter Item Barcode</label>
+ <label for="barcode">Enter Item Barcode!</label>
<input name="barcode" id="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" />
<input type="submit" class="submit" value="Submit" />
<!-- TMPL_LOOP Name="inputloop" -->
@@ -151,6 +151,7 @@
<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
</div>
<!-- /TMPL_IF -->
+Return Branch set to ISSUE-BRANCH
<!-- TMPL_IF Name="returned" -->
<div class="table"><table>
Index: koha-tmpl/intranet-tmpl/katipo/en/bull/routing-preview-slip.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/katipo/en/bull/Attic/routing-preview-slip.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/intranet-tmpl/katipo/en/bull/routing-preview-slip.tmpl 25 Jul 2006 21:14:21 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/katipo/en/bull/routing-preview-slip.tmpl 8 Jul 2007 22:14:22 -0000 1.1.2.2
@@ -2,7 +2,7 @@
<div id="slip-block">
<table cellspacing="0" cellpadding="0" border="0" class="collapse routingslip">
-<tr><td class="cell" colspan="3"><h3>Opus International Consultants - Information Centre</h3></td></tr>
+<tr><td class="cell" colspan="3"><h3><!-- TMPL_VAR NAME="libraryname" --></h3></td></tr>
<tr><td class="cell" colspan="3"><b>Title:</b> <!-- TMPL_VAR NAME="title" --><br />
<!-- TMPL_VAR NAME="issue" --></td></tr>
<tr><td class="cell"><b>Name/Location</b></td>
Index: koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/barcodes.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl 31 Jan 2006 22:29:56 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl 8 Jul 2007 22:14:22 -0000 1.1.2.2.2.1
@@ -72,6 +72,7 @@
<!-- /TMPL_LOOP -->
</table>
+ <input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
<input type="submit" value="Generate Barcodes" class="submit" name="B1" />
<input type="reset" value="Clear Fields" class="cancel" name="B2" />
</form>
Index: koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-home.tmpl,v
retrieving revision 1.1.2.2.2.9
retrieving revision 1.1.2.2.2.10
diff -u -b -r1.1.2.2.2.9 -r1.1.2.2.2.10
--- koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl 6 Jul 2007 13:14:12 -0000 1.1.2.2.2.9
+++ koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl 8 Jul 2007 22:14:22 -0000 1.1.2.2.2.10
@@ -6,17 +6,83 @@
<div id="main">
<form name="input" action="/cgi-bin/koha/barcodes/label-manager.pl" method="get">
+
+<!-- TMPL_IF NAME="layout_loop" -->
+<h2>Select a Current Layout</h2>
+<table>
+<tr>
+ <th>Layout</th>
+ <th>barcode type</th>
+ <th>layout type</th>
+ <th>fieldlist</th>
+ <th>active</th>
+</tr>
+<!-- TMPL_LOOP NAME="layout_loop" -->
+<tr>
+ <td>
+ <!-- TMPL_VAR NAME="id" -->
+ <!-- TMPL_VAR NAME="layoutname" -->
+ </td>
+
+ <td>
+ <!-- TMPL_VAR NAME="barcodetype" -->
+ </td>
+
+ <td>
+ <!-- TMPL_VAR NAME="printingtype" -->
+ </td>
+ <td>
+ <!-- TMPL_VAR NAME="fieldlist" -->
+ <td>
+<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->"
+ <!-- TMPL_IF NAME="active" -->
+ checked
+ <!-- /TMPL_IF -->
+ >
+
+
+ </td>
+
+ </td>
+</tr>
+
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
+ <input type="submit" value="Submit">
+ <input type="hidden" name=op value="set_active_layout">
+</form>
+<p>
+-
+- OR create a new layout
+-
+</P>
+
+
+
+<h3>
+ Layout Name<input type="textbox" name="layoutname" SIZE="20"
+ value="<!-- TMPL_VAR NAME="layoutname" -->">
+</h3>
+
+
<h3>
Choose Fields to Print
</h3>
<table summary="fields to print">
<tr>
<td>
- <input type="checkbox" name="itemtype" value=1
- <!-- TMPL_IF NAME="itemtype"-->
- checked
- <!-- /TMPL_IF --> >
- <label for="itemtype">Item Type</label>
+
+ <label for="Title">Title</label>
+<select name="text_title">
+ <!-- TMPL_LOOP NAME="text_title" -->
+ <option value="<!-- TMPL_VAR NAME="code" -->"
+ <!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
+ ><!-- TMPL_VAR NAME="desc" --></option>
+ <!-- /TMPL_LOOP -->
+</select>
+
+
</td>
<td>
@@ -87,19 +153,10 @@
</table>
<p>
-<h3>Confirm Label Template</h3>
-<select name="tmpl_id">
- <!-- TMPL_LOOP NAME="label_templates" -->
- <option value="<!-- TMPL_VAR NAME="tmpl_id" -->"
- <!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
- ><!-- TMPL_VAR NAME="tmpl_code" --></option>
- <!-- /TMPL_LOOP -->
-</select>
-
<h3>Confirm Barcode Type</h3>
-<select name="barcode_types">
+<select name="barcodetype">
<!-- TMPL_LOOP NAME="barcode_types" -->
<option value="<!-- TMPL_VAR NAME="code" -->"
<!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
@@ -111,27 +168,25 @@
<h3>Confirm Layout Type</h3>
<select name="printingtype">
- <!-- TMPL_LOOP NAME="printingtype" -->
+ <!-- TMPL_LOOP NAME="printingtypes" -->
<option value="<!-- TMPL_VAR NAME="code" -->"
<!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
><!-- TMPL_VAR NAME="desc" --></option>
<!-- /TMPL_LOOP -->
</select>
-
-<h3>Confirm Batch List</h3>
-<select name="batch_id">
- <!-- TMPL_LOOP NAME="batches" -->
- <option value="<!-- TMPL_VAR NAME="batch_id" -->"
+<h3>Confirm Text Field</h3>
+<select name="text_fields">
+ <!-- TMPL_LOOP NAME="text_fields" -->
+ <option value="<!-- TMPL_VAR NAME="code" -->"
<!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
- ><!-- TMPL_VAR NAME="batch_id" --></option>
+ ><!-- TMPL_VAR NAME="desc" --></option>
<!-- /TMPL_LOOP -->
</select>
-
<h3>
Start printing from Label number:<input type="textbox" name="startlabel" SIZE="1"
value="<!-- TMPL_VAR NAME="startlabel" -->">
Index: koha-tmpl/intranet-tmpl/npl/en/barcodes/label-manager.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-manager.tmpl,v
retrieving revision 1.1.2.3.2.7
retrieving revision 1.1.2.3.2.8
diff -u -b -r1.1.2.3.2.7 -r1.1.2.3.2.8
--- koha-tmpl/intranet-tmpl/npl/en/barcodes/label-manager.tmpl 6 Jul 2007 04:40:41 -0000 1.1.2.3.2.7
+++ koha-tmpl/intranet-tmpl/npl/en/barcodes/label-manager.tmpl 8 Jul 2007 22:14:23 -0000 1.1.2.3.2.8
@@ -12,9 +12,12 @@
<!-- TMPL_IF NAME="batch_id" -->
<p>
BATCH <!-- TMPL_VAR NAME="batch_id" --></b><br />
+<!--
Printing will start on <b>row <!-- TMPL_VAR NAME="startrow" --></b><br />
Printing will use <b><!-- TMPL_VAR NAME="sheets"--> sheets</b><br />
- Currently <b><!-- TMPL_VAR NAME="labels_remaining"--> rows</b> spare on <b>sheet <!-- TMPL_VAR NAME="sheets"--></b>
+ Currently <b><!-- TMPL_VAR NAME="labels_remaining"--> rows</b> spare on <b>sheet <!-- TMPL_VAR NAME="sheets"--></b><br>
+-->
+ Using <b><!-- TMPL_VAR NAME="tmpl_desc"--></b> template
</p>
<!-- TMPL_IF NAME="resultsloop" -->
@@ -39,7 +42,7 @@
<td> <!-- TMPL_VAR NAME="itemtype" --> </td>
<td> <!-- TMPL_VAR NAME="batch_id" --> </td>
<td>
- <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Delete</a>
+ <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
</td>
</tr>
<!-- /TMPL_LOOP -->
Index: koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/result.tmpl,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -b -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl 11 Jul 2006 14:03:23 -0000 1.1.2.2.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl 8 Jul 2007 22:14:23 -0000 1.1.2.2.2.2
@@ -56,7 +56,11 @@
<!-- TMPL_VAR NAME="itemtype" -->
</td>
<td>
- <a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&op=add">Add</a>
+ <a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->,<!-- TMPL_VAR NAME="batch_id" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&batch_id=<!-- TMPL_VAR name="batch_id" -->&op=add">Add</a>
+
+
+
+
<!-- /NEW -->
</td>
@@ -86,7 +90,15 @@
<script type="text/javascript">
<!--
-function add_item(itemnumber){
+
+function add_item(itemnumber,batch_id){
+
+ var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"&batch_id="+batch_id+"";
+ window.opener.location.href = myurl;
+}
+
+function add_item3(itemnumber){
+
var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"";
window.opener.location.href = myurl;
}
Index: koha-tmpl/intranet-tmpl/npl/en/images/more.gif
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/images/Attic/more.gif,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvseGDg9k and /tmp/cvssph7F0 differ
Index: koha-tmpl/intranet-tmpl/npl/en/includes/holidays-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/holidays-top.inc,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -b -r1.1.4.3 -r1.1.4.4
--- koha-tmpl/intranet-tmpl/npl/en/includes/holidays-top.inc 20 Apr 2007 00:55:20 -0000 1.1.4.3
+++ koha-tmpl/intranet-tmpl/npl/en/includes/holidays-top.inc 8 Jul 2007 22:14:23 -0000 1.1.4.4
@@ -122,7 +122,7 @@
}
.exception {
- background-color: #CECECE;
+ background-color: #cecece;
color: Black;
border:1px solid #000000;
}
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.5.2.14.2.6
retrieving revision 1.5.2.14.2.7
diff -u -b -r1.5.2.14.2.6 -r1.5.2.14.2.7
--- members/moremember.pl 14 May 2007 16:27:55 -0000 1.5.2.14.2.6
+++ members/moremember.pl 8 Jul 2007 22:14:23 -0000 1.5.2.14.2.7
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.5.2.14.2.6 2007/05/14 16:27:55 kylemhall Exp $
+# $Id: moremember.pl,v 1.5.2.14.2.7 2007/07/08 22:14:23 sushi Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -98,8 +98,8 @@
my $data=borrdata('',$bornum);
## Get the borrowers current clubs & services
-my $enrolledClubsAndServices = GetEnrolledClubsAndServices( $bornum );
-$template->param( enrolledClubsAndServicesLoop => $enrolledClubsAndServices );
+#my $enrolledClubsAndServices = GetEnrolledClubsAndServices( $bornum );
+#$template->param( enrolledClubsAndServicesLoop => $enrolledClubsAndServices );
$template->param($data->{'categorycode'} => 1); # in template <TMPL_IF name="I"> => instutitional (A for Adult & C for children)
Index: misc/bulkauthimport.pl
===================================================================
RCS file: /sources/koha/koha/misc/bulkauthimport.pl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- misc/bulkauthimport.pl 21 Jun 2004 07:51:41 -0000 1.1
+++ misc/bulkauthimport.pl 8 Jul 2007 22:14:23 -0000 1.1.4.1
@@ -12,8 +12,8 @@
use Time::HiRes qw(gettimeofday);
use Getopt::Long;
-my ( $input_marc_file, $number) = ('',0);
-my ($version, $delete, $test_parameter,$char_encoding, $verbose);
+my ( $input_marc_file, $number ) = ( '', 0 );
+my ( $version, $delete, $test_parameter, $char_encoding, $verbose );
GetOptions(
'file:s' => \$input_marc_file,
'n' => \$number,
@@ -24,7 +24,7 @@
'v:s' => \$verbose,
);
-if ($version || ($input_marc_file eq '')) {
+if ( $version || ( $input_marc_file eq '' ) ) {
print <<EOF
small script to import an iso2709 file into Koha.
parameters :
@@ -43,8 +43,8 @@
SAMPLE : ./bulkmarcimport.pl -file /home/paul/koha.dev/local/npl -n 1
EOF
-;#'
-die;
+ ; #'
+ die;
}
my $dbh = C4::Context->dbh;
@@ -65,21 +65,25 @@
my $batch = MARC::Batch->new( 'USMARC', $input_marc_file );
$batch->warnings_off();
$batch->strict_off();
-my $i=0;
+my $i = 0;
while ( my $record = $batch->next() ) {
$i++;
- #now, parse the record, extract the item fields, and store them in somewhere else.
+
+#now, parse the record, extract the item fields, and store them in somewhere else.
## create an empty record object to populate
my $newRecord = MARC::Record->new();
- $newRecord->leader($record->leader);
+ $newRecord->leader( $record->leader );
+
# go through each field in the existing record
foreach my $oldField ( $record->fields() ) {
+
# just reproduce tags < 010 in our new record
if ( $oldField->tag() < 10 ) {
- $newRecord->append_fields( $oldField );
+ $newRecord->append_fields($oldField);
next();
}
+
# store our new subfield data in this list
my @newSubfields = ();
@@ -87,7 +91,8 @@
foreach my $pair ( $oldField->subfields() ) {
$pair->[1] =~ s/\<//g;
$pair->[1] =~ s/\>//g;
- push( @newSubfields, $pair->[0], char_decode($pair->[1],$char_encoding) );
+ push( @newSubfields,
+ $pair->[0], char_decode( $pair->[1], $char_encoding ) );
}
# add the new field to our new record
@@ -97,25 +102,27 @@
$oldField->indicator(2),
@newSubfields
);
- $newRecord->append_fields( $newField );
+ $newRecord->append_fields($newField);
}
- warn "$i ==>".$newRecord->as_formatted() if $verbose eq 2;
- my $authtypecode=substr($newRecord->leader(),9,1);
- $authtypecode="NP" if ($authtypecode eq 'a'); # personnes
- $authtypecode="CO" if ($authtypecode eq 'b'); # collectivités
- $authtypecode="NG" if ($authtypecode eq 'c'); # géographique
- $authtypecode="NM" if ($authtypecode eq 'd'); # marque
- $authtypecode="NF" if ($authtypecode eq 'e'); # famille
- $authtypecode="TI" if ($authtypecode eq 'f'); # Titre uniforme
- $authtypecode="TI" if ($authtypecode eq 'h'); # auteur/titre
- $authtypecode="MM" if ($authtypecode eq 'j'); # mot matière
+ warn "$i ==>" . $newRecord->as_formatted() if $verbose eq 2;
+ my $authtypecode = substr( $newRecord->leader(), 9, 1 );
+ $authtypecode = "NP" if ( $authtypecode eq 'a' ); # personnes
+ $authtypecode = "CO" if ( $authtypecode eq 'b' ); # collectivités
+ $authtypecode = "NG" if ( $authtypecode eq 'c' ); # géographique
+ $authtypecode = "NM" if ( $authtypecode eq 'd' ); # marque
+ $authtypecode = "NF" if ( $authtypecode eq 'e' ); # famille
+ $authtypecode = "TI" if ( $authtypecode eq 'f' ); # Titre uniforme
+ $authtypecode = "TI" if ( $authtypecode eq 'h' ); # auteur/titre
+ $authtypecode = "MM" if ( $authtypecode eq 'j' ); # mot matière
warn "XX => $authtypecode";
+
# now, create biblio and items with NEWnewXX call.
unless ($test_parameter) {
- my ($authid) = AUTHaddauthority($dbh,$newRecord,0,$authtypecode);
+ my ($authid) = AUTHaddauthority( $dbh, $newRecord, 0, $authtypecode );
warn "ADDED authority NB $authid in DB\n" if $verbose;
}
}
+
# $dbh->do("unlock tables");
my $timeneeded = gettimeofday - $starttime;
print "$i MARC record done in $timeneeded seconds";
Index: tools/holidays.pl
===================================================================
RCS file: /sources/koha/koha/tools/holidays.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
--- tools/holidays.pl 19 Apr 2007 01:34:33 -0000 1.4.2.1
+++ tools/holidays.pl 8 Jul 2007 22:14:23 -0000 1.4.2.2
@@ -46,7 +46,7 @@
my %week_day;
%week_day = (KEY => $weekday,
TITLE => $week_days_holidays->{$weekday}{title},
- DESCRIPTION => $week_days_holidays->{$weekday}{description});
+ DESCRIPTION => escape_newlines($week_days_holidays->{$weekday}{description}));
push @week_days, \%week_day;
}
@@ -56,7 +56,7 @@
my %day_month;
%day_month = (KEY => $monthDay,
TITLE => $day_month_holidays->{$monthDay}{title},
- DESCRIPTION => $day_month_holidays->{$monthDay}{description});
+ DESCRIPTION => escape_newlines($day_month_holidays->{$monthDay}{description}));
push @day_month_holidays, \%day_month;
}
@@ -66,7 +66,7 @@
my %exception_holiday;
%exception_holiday = (KEY => $yearMonthDay,
TITLE => $exception_holidays->{$yearMonthDay}{title},
- DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
+ DESCRIPTION => escape_newlines($exception_holidays->{$yearMonthDay}{description}));
push @exception_holidays, \%exception_holiday;
}
@@ -74,9 +74,10 @@
my @holidays;
foreach my $yearMonthDay (keys %$single_holidays) {
my %holiday;
+
%holiday = (KEY => $yearMonthDay,
TITLE => $single_holidays->{$yearMonthDay}{title},
- DESCRIPTION => $single_holidays->{$yearMonthDay}{description});
+ DESCRIPTION => escape_newlines($single_holidays->{$yearMonthDay}{description}));
push @holidays, \%holiday;
}
@@ -101,3 +102,15 @@
# Shows the template with the real values replaced
output_html_with_http_headers $input, $cookie, $template->output;
+
+
+
+
+# addintional sub fixes \n\r newlines in multi-line descriptions.
+sub escape_newlines {
+ my ($string) = @_;
+ $string =~ s/\r/\\r/g;
+ $string =~ s/\n/\\n/g;
+
+return $string;
+}
Index: tools/newHolidays.pl
===================================================================
RCS file: /sources/koha/koha/tools/newHolidays.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- tools/newHolidays.pl 19 Apr 2007 01:34:33 -0000 1.3.2.1
+++ tools/newHolidays.pl 8 Jul 2007 22:14:24 -0000 1.3.2.2
@@ -21,7 +21,10 @@
my $title = $input->param('newTitle');
my $description = $input->param('newDescription');
-my $calendar = C4:Calendar->new(branchcode => $branchcode);
+
+
+
+my $calendar = C4::Calendar->new(branchcode => $branchcode);
$title || ($title = '');
if ($description) {
Index: barcodes/label-home.pl
===================================================================
RCS file: barcodes/label-home.pl
diff -N barcodes/label-home.pl
--- barcodes/label-home.pl 6 Oct 2006 01:58:47 -0000 1.3.4.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Labels;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use HTML::Template;
-
-use Data::Dumper;
-
-my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- {
- template_name => "barcodes/label-home.tmpl",
- query => $query,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { catalogue => 1 },
- debug => 1,
- }
-);
-
-my $data = get_label_options();
-
-my $active_template = GetActiveLabelTemplate();
-my @label_templates = GetAllLabelTemplates();
-
-warn Dumper @label_templates;
-
-$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
-
-$data->{'printingtype'} = 'both' if ( !$data->{'printingtype'} );
-$template->param( "printingtype_$data->{'printingtype'}" => 1 );
-$template->param( "papertype_$data->{'papertype'}" => 1 );
-
-$template->param( "$data->{'barcodetype'}_checked" => 1 );
-
-$template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
-$template->param(
- itemtype => $data->{'itemtype'},
- active_template => $data->{'active_template'},
- label_templates => \@label_templates,
-
- papertype => $data->{'papertype'},
- author => $data->{'author'},
- barcode => $data->{'barcode'},
- id => $data->{'id'},
- barcodetype => $data->{'barcodetype'},
- title => $data->{'title'},
- isbn => $data->{'isbn'},
- dewey => $data->{'dewey'},
- class => $data->{'class'},
- subclass => $data->{'subclass'},
- itemcallnumber => $data->{'itemcallnumber'},
- startlabel => $data->{'startlabel'},
- fontsize => $active_template->{'fontsize'},
-
- intranetcolorstylesheet =>
- C4::Context->preference("intranetcolorstylesheet"),
- intranetstylesheet => C4::Context->preference("intranetstylesheet"),
- IntranetNav => C4::Context->preference("IntranetNav"),
-);
-
-output_html_with_http_headers $query, $cookie, $template->output;
More information about the Koha-cvs
mailing list