[Koha-cvs] koha/barcodes label-manager.pl [dev_week]

[Mason James]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Mason James <sushi>     07/07/22 22:02:34

Modified files:
        barcodes       : label-manager.pl 

Log message:
        now uses 'subtitle' too 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-manager.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.12&r2=1.1.2.1.2.13

Patches:
Index: label-manager.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-manager.pl,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
--- label-manager.pl    16 Jul 2007 01:32:29 -0000      1.1.2.1.2.12
+++ label-manager.pl    22 Jul 2007 22:02:33 -0000      1.1.2.1.2.13
@@ -19,11 +19,11 @@
 my $layoutname =    $query->param('layoutname');
 my $barcodetype    = $query->param('barcodetype');
 
-
 my $bcn          = $query->param('tx_barcode');
 my $author          = $query->param('tx_author');
 
 my $title          = $query->param('tx_title');
+my $subtitle       = $query->param('tx_subtitle');
 my $isbn           = $query->param('tx_isbn');
 my $issn           = $query->param('tx_issn');
 my $itemtype       = $query->param('tx_itemtype');
@@ -40,7 +40,6 @@
 my $fontsize       = $query->param('fontsize');
 my @itemnumber     = $query->param('itemnumber');
 
-
 # little block for displaying active layout/template/batch in templates
 # ----------
 my $batch_id     = $query->param('batch_id');
@@ -48,13 +47,14 @@
 my $active_template = GetActiveLabelTemplate();
 my $active_layout_name = $active_layout->{'layoutname'};
 my $active_template_name = $active_template->{'tmpl_code'};
+
 # ----------
 
 #if (!$batch_id ) {
 #    $batch_id  = get_highest_batch();
 #}
 
-my ($itemnumber) = @itemnumber if (scalar(@itemnumber) == 1);
+my ($itemnumber) = @itemnumber if ( scalar(@itemnumber) == 1 );
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -67,26 +67,26 @@
     }
 );
 
-if ( $op eq 'save_conf' ) {    # this early sub is depreciated, use 
save_layout()
+if ( $op eq 'add_layout' ) {
    
-   SaveConf(
-        $barcodetype,    $title,  $isbn, 
+    add_layout(
+        $barcodetype, $title,        $subtitle,       $isbn,
         $issn,    $itemtype,         $bcn,            $dcn, 
        $classif, $subclass,         $itemcallnumber,      $author, 
-        $tmpl_id, $printingtype,   $guidebox,       $startlabel, $layoutname
+        $tmpl_id,     $printingtype, $guidebox,       $startlabel,
+        $layoutname
     );
      print $query->redirect("../label-home.pl");
     exit;
 }
 
-
-elsif  ( $op eq 'save_layout' ) {
+if ( $op eq 'save_layout' ) {
     save_layout(
-        $barcodetype,    $title,  $isbn, 
+        $barcodetype, $title,        $subtitle,       $isbn,
         $issn,    $itemtype,         $bcn,            $dcn, 
        $classif, $subclass,         $itemcallnumber,      $author, 
-        $tmpl_id, $printingtype,   $guidebox,       $startlabel, $layoutname,
-        $layout_id
+        $tmpl_id,     $printingtype, $guidebox,       $startlabel,
+        $layoutname,  $layout_id
     );
 
 ### $layoutname
@@ -95,15 +95,11 @@
     exit;
 }
 
-
-
-
-
 elsif ( $op eq 'add' ) {   # add item
     my $query2 = "INSERT INTO labels ( itemnumber, batch_id ) values ( ?,? )";
     my $sth2   = $dbh->prepare($query2);
     for my $inum (@itemnumber) {
-               $sth2->execute($inum, $batch_id);
+        $sth2->execute( $inum, $batch_id );
     }
        $sth2->finish;
 }
@@ -120,7 +116,6 @@
     $sth2->finish;
 }
 
-
 elsif ( $op eq 'delete_batch' ) {
     delete_batch($batch_id);
      print $query->redirect("label-manager.pl?batch_id=");
@@ -128,7 +123,7 @@
 }
 
 elsif ( $op eq 'add_batch' ) {
-    $batch_id= add_batch();
+    $batch_id = add_batch();
 
 }
 
@@ -138,13 +133,12 @@
     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);
-my $tmpl =GetActiveLabelTemplate();
+my $tmpl        = GetActiveLabelTemplate();
 ### $tmpl
 #calc-ing number of sheets
 #my $number_of_results = scalar @resultsloop;