[Koha-cvs] koha/barcodes label-item-search.pl label-manage... [dev_week]

[Mason James]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Mason James <sushi>     07/07/09 18:08:42

Modified files:
        barcodes       : label-item-search.pl label-manager.pl 

Log message:
        ryan's item search mods, and misc gui tweaks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-item-search.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-manager.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.7&r2=1.1.2.1.2.8

Patches:
Index: label-item-search.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-item-search.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
--- label-item-search.pl        5 Jul 2007 01:12:28 -0000       1.1.2.1.2.6
+++ label-item-search.pl        9 Jul 2007 18:08:42 -0000       1.1.2.1.2.7
@@ -210,11 +210,9 @@
 
     my $itemtypes = getitemtypes;
     my @itemtypeloop;
-    my ($thisitemtype, $thisbranch, $branch);
+    my ($thisitemtype );
     foreach my $thisitemtype (keys %$itemtypes) {
-           my $selected = 1 if  $thisbranch eq $branch;
             my %row =(value => $thisitemtype,
-                                   selected => $selected,
                                     description => 
$itemtypes->{$thisitemtype}->{'description'},
                             );  
             push @itemtypeloop, \%row;

Index: label-manager.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-manager.pl,v
retrieving revision 1.1.2.1.2.7
retrieving revision 1.1.2.1.2.8
diff -u -b -r1.1.2.1.2.7 -r1.1.2.1.2.8
--- label-manager.pl    8 Jul 2007 22:14:22 -0000       1.1.2.1.2.7
+++ label-manager.pl    9 Jul 2007 18:08:42 -0000       1.1.2.1.2.8
@@ -17,25 +17,32 @@
 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');
-my $issn           = $query->param('issn');
-my $itemtype       = $query->param('itemtype');
-my $bcn            = $query->param('bcn');
-my $dcn            = $query->param('dcn');
-my $classif        = $query->param('classif');
+
+
+my $bcn          = $query->param('tx_barcode');
+my $author          = $query->param('tx_author');
+
+my $title          = $query->param('tx_title');
+my $isbn           = $query->param('tx_isbn');
+my $issn           = $query->param('tx_issn');
+my $itemtype       = $query->param('tx_itemtype');
+my $dcn            = $query->param('tx_dewey');
+my $classif        = $query->param('tx_classif');
 my $itemcallnumber = $query->param('itemcallnumber');
-my $subclass       = $query->param('subclass');
-my $author         = $query->param('author');
+my $subclass       = $query->param('tx_subclass');
+my $author         = $query->param('tx_author');
 my $tmpl_id        = $query->param('tmpl_id');
-my $itemnumber     = $query->param('itemnumber');
 my $summary        = $query->param('summary');
 my $startlabel     = $query->param('startlabel');
 my $printingtype   = $query->param('printingtype');
 my $guidebox       = $query->param('guidebox');
 my $fontsize       = $query->param('fontsize');
 my $batch_id   =     $query->param('batch_id');
+my @itemnumber     = $query->param('itemnumber');
 
+$batch_id = 1 if !$batch_id;
+
+my ($itemnumber) = @itemnumber if (scalar(@itemnumber) == 1);
 warn Dumper $query;
 warn "ID =$tmpl_id";
 ### $printingtype;
@@ -52,7 +59,7 @@
     }
 );
 
-if ( $op eq 'save_conf' ) {
+if ( $op eq 'save_conf' ) {    # this early sub is depreciated, use 
save_layout()
     SaveConf(
         $barcodetype,    $title,  $isbn, 
         $issn,    $itemtype,         $bcn,            $dcn, 
@@ -62,10 +69,33 @@
      print $query->redirect("../label-home.pl");
     exit;
 }
+
+
+elsif  ( $op eq 'save_layout' ) {
+    save_layout(
+        $barcodetype,    $title,  $isbn, 
+        $issn,    $itemtype,         $bcn,            $dcn, 
+       $classif, $subclass,         $itemcallnumber,      $author, 
+        $tmpl_id, $printingtype,   $guidebox,       $startlabel, $layoutname,
+        $layout_id
+    );
+
+### $layoutname
+
+     print $query->redirect("../label-home.pl");
+    exit;
+}
+
+
+
+
+
 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);
+    for my $inum (@itemnumber) {
+               $sth2->execute($inum, $batch_id);
+    }
     $sth2->finish;
 }
 elsif ( $op eq 'deleteall' ) {