[Koha-cvs] koha/C4 Labels.pm [dev_week]

[Mason James]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	07/07/10 00:54:32

Modified files:
	C4             : Labels.pm 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Labels.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.3.4.21&r2=1.3.4.22

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.21
retrieving revision 1.3.4.22
diff -u -b -r1.3.4.21 -r1.3.4.22
--- Labels.pm	9 Jul 2007 18:04:49 -0000	1.3.4.21
+++ Labels.pm	10 Jul 2007 00:54:32 -0000	1.3.4.22
@@ -58,7 +58,7 @@
   &add_batch &SetFontSize &printText
   &GetItemFields
   &get_text_fields
-  &get_layout &save_layout
+  get_layout &save_layout
   &set_active_layout &by_order
   &build_text_dropbox
   &delete_layout
@@ -106,11 +106,8 @@
 }
 
 sub get_layout {
-
-## FIXME: this if/else could be compacted...
     my ($layout_id) = @_;
     my $dbh = C4::Context->dbh;
-
     # get the actual items to be printed.
     my $query = " Select * from labels_conf where id = ?";
     my $sth   = $dbh->prepare($query);
@@ -142,8 +139,7 @@
     push( @printtypes, { code => 'ALT',    desc => "alternating labels" } );
 
     my $conf             = get_layout($layout_id);
-    my $active_printtype = $conf->{'printtype'};
-
+    my $active_printtype = $conf->{'printingtype'};
     # lop thru layout, insert selected to hash
 
     foreach my $printtype (@printtypes) {
@@ -645,8 +641,6 @@
 
         # testing hack
 
-        $$item->{"$field"} = $field . ": " . $$item->{"$field"};
-
         warn $$item->{"$field"};
 
         # if the display option for this field is selected in the DB,