[Koha-cvs] koha/barcodes label-edit-template.pl label-item... [dev_week]

[Mason James]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Mason James <sushi>     07/07/16 01:32:29

Modified files:
        barcodes       : label-edit-template.pl label-item-search.pl 
                         label-manager.pl label-templates.pl 

Log message:
            updating devweek with newer commits from rel22.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-edit-template.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5&r2=1.1.2.6
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.9&r2=1.1.2.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-manager.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.11&r2=1.1.2.1.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-templates.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.7&r2=1.1.2.8

Patches:
Index: label-edit-template.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-edit-template.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
--- label-edit-template.pl      16 Jul 2007 01:06:17 -0000      1.1.2.5
+++ label-edit-template.pl      16 Jul 2007 01:32:29 -0000      1.1.2.6
@@ -10,16 +10,12 @@
 use HTML::Template;
 use POSIX;
 
-use Data::Dumper;
-use Smart::Comments;
-
+# use Data::Dumper;
 
 my $dbh       = C4::Context->dbh;
 my $query     = new CGI;
 
 my $tmpl_id = $query->param('tmpl_id');
-### moo
-### $tmpl_id
 
 my $width      = $query->param('width');
 my $height     = $query->param('height');
@@ -41,10 +37,8 @@
     }
 );
 
-
 my $tmpl = GetSingleLabelTemplate($tmpl_id);
-### $tmpl
-###  $tmpl->{'tmpl_id'}
+
 my @units = (
     { unit => 'INCH',  desc => 'Inches' },
     { unit => 'CM',    desc => 'Centimeters' },
@@ -58,10 +52,6 @@
     }
 }
 
-###  $tmpl->{'tmpl_id'}
-
-
-
 $template->param(
 
     units => address@hidden,

Index: label-item-search.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-item-search.pl,v
retrieving revision 1.1.2.1.2.9
retrieving revision 1.1.2.1.2.10
diff -u -b -r1.1.2.1.2.9 -r1.1.2.1.2.10
--- label-item-search.pl        16 Jul 2007 01:06:18 -0000      1.1.2.1.2.9
+++ label-item-search.pl        16 Jul 2007 01:32:29 -0000      1.1.2.1.2.10
@@ -34,7 +34,7 @@
 use C4::SearchMarc;
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 
-use Smart::Comments;
+#use Smart::Comments;
 #use Data::Dumper;
 
 # Creates a scrolling list with the associated default value.
@@ -70,9 +70,6 @@
     # builds tag and subfield arrays
     my @tags;
 
-### marclist
-
-
     foreach my $marc (@marclist) {
         if ($marc) {
             my ( $tag, $subfield ) =
@@ -88,8 +85,6 @@
             push @tags, "";
         }
     }
-
-
     my ( $results, $total ) =
       catalogsearch( $dbh, address@hidden, address@hidden, address@hidden, 
address@hidden, address@hidden,
         $startfrom * $resultsperpage,

Index: label-manager.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-manager.pl,v
retrieving revision 1.1.2.1.2.11
retrieving revision 1.1.2.1.2.12
diff -u -b -r1.1.2.1.2.11 -r1.1.2.1.2.12
--- label-manager.pl    10 Jul 2007 06:33:46 -0000      1.1.2.1.2.11
+++ label-manager.pl    16 Jul 2007 01:32:29 -0000      1.1.2.1.2.12
@@ -29,7 +29,7 @@
 my $itemtype       = $query->param('tx_itemtype');
 my $dcn            = $query->param('tx_dewey');
 my $classif        = $query->param('tx_classif');
-my $itemcallnumber = $query->param('itemcallnumber');
+my $itemcallnumber = $query->param('tx_itemcallnumber');
 my $subclass       = $query->param('tx_subclass');
 my $author         = $query->param('tx_author');
 my $tmpl_id        = $query->param('tmpl_id');
@@ -50,12 +50,11 @@
 my $active_template_name = $active_template->{'tmpl_code'};
 # ----------
 
-if (!$batch_id ) {
-    $batch_id  = get_highest_batch();
-}
+#if (!$batch_id ) {
+#    $batch_id  = get_highest_batch();
+#}
 
 my ($itemnumber) = @itemnumber if (scalar(@itemnumber) == 1);
-### $batch_id;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -69,6 +68,7 @@
 );
 
 if ( $op eq 'save_conf' ) {    # this early sub is depreciated, use 
save_layout()
+   
     SaveConf(
         $barcodetype,    $title,  $isbn, 
         $issn,    $itemtype,         $bcn,            $dcn, 
@@ -123,6 +123,8 @@
 
 elsif ( $op eq 'delete_batch' ) {
     delete_batch($batch_id);
+     print $query->redirect("label-manager.pl?batch_id=");
+        exit;
 }
 
 elsif ( $op eq 'add_batch' ) {
@@ -144,7 +146,6 @@
 my @resultsloop = get_label_items($batch_id);
 my $tmpl =GetActiveLabelTemplate();
 ### $tmpl
-
 #calc-ing number of sheets
 #my $number_of_results = scalar @resultsloop;
 #my $sheets_needed = ( ( --$number_of_results + $startrow ) / 8 );
@@ -156,13 +157,13 @@
 
 $template->param(
     batch_id => $batch_id,
+       batch_count => scalar @resultsloop,
     active_layout_name => $active_layout_name,
     active_template_name => $active_template_name,
 
     resultsloop => address@hidden,
     batches => address@hidden,
-batch_id => $batch_id,
-tmpl_desc => $tmpl->{'tmpl_desc'},
+       tmpl_desc => $tmpl->{'tmpl_desc'},
 
     #  startrow         => $startrow,
     #  sheets           => $sheets_needed,

Index: label-templates.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-templates.pl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- label-templates.pl  16 Jul 2007 01:06:18 -0000      1.1.2.7
+++ label-templates.pl  16 Jul 2007 01:32:29 -0000      1.1.2.8
@@ -11,7 +11,6 @@
 use POSIX;
 
 #use Data::Dumper;
-use Smart::Comments;
 
 my $dbh       = C4::Context->dbh;
 my $query     = new CGI;
@@ -62,14 +61,7 @@
 # ----------
 my $batch_id     = $query->param('batch_id');
 my $active_layout = get_active_layout();
-
-
-
-### $active_layout
-
 my $active_template = GetActiveLabelTemplate();
-### $active_template
-
 my $active_layout_name = $active_layout->{'layoutname'};
 my $active_template_name = $active_template->{'tmpl_code'};
 # ----------