misc labels fixes

* Corrected sample label data
* Commented out debug warns and smart comments
* Correct location of a template

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/installer/data/fr/2-Optionel/sample_labels.sql b/installer/data/fr/2-Optionel/sample_labels.sql
index 65ac509..befb293 100644 (file)
--- a/installer/data/fr/2-Optionel/sample_labels.sql
+++ b/installer/data/fr/2-Optionel/sample_labels.sql
@@ -10,6 +10,8 @@ INSERT INTO `labels_templates` VALUES
 UNLOCK TABLES; 
 LOCK TABLES `labels_conf` WRITE;
 /*!40000 ALTER TABLE `labels_conf` DISABLE KEYS */;
-INSERT INTO `labels_conf` VALUES (5,'CODE39',2,3,0,0,0,0,4,1,0,0,1,'BIBBAR','biblio and barcode',1,NULL,NULL,0),(6,'CODE39',2,0,0,0,3,4,0,1,0,3,1,'BAR','alternating',1,1,NULL,0);
+INSERT INTO `labels_conf` VALUES 
+(5,'CODE39',2,0,3,0,0,0,0,4,1,0,0,1,'BIBBAR','biblio and barcode',1,1,NULL,NULL,NULL,NULL),
+(6,'CODE39',2,0,0,0,0,3,4,0,1,0,3,1,'BAR','alternating',1,1,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `labels_conf` ENABLE KEYS */;
 UNLOCK TABLES;

diff --git a/labels/label-create-template.pl b/labels/label-create-template.pl
index 9ac01ec..fa7262f 100755 (executable)
--- a/labels/label-create-template.pl
+++ b/labels/label-create-template.pl
@@ -10,7 +10,7 @@ use HTML::Template;
 use POSIX;
 
 #use Data::Dumper;
-use Smart::Comments;
+#use Smart::Comments;
 
 my $dbh   = C4::Context->dbh;
 my $query = new CGI;

diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl
index 537afb8..31951b5 100755 (executable)
--- a/labels/label-edit-layout.pl
+++ b/labels/label-edit-layout.pl
@@ -20,7 +20,7 @@ my $layout_id = $query->param('layout_id');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "barcodes/label-edit-layout.tmpl",
+        template_name   => "labels/label-edit-layout.tmpl",
         query           => $query,
         type            => "intranet",
         authnotrequired => 1,

diff --git a/labels/label-print-pdf.pl b/labels/label-print-pdf.pl
index 18769fe..26bd0d7 100755 (executable)
--- a/labels/label-print-pdf.pl
+++ b/labels/label-print-pdf.pl
@@ -19,7 +19,7 @@ print $cgi->header( -type => 'application/pdf', -attachment => 'barcode.pdf' );
 
 my $spine_text = "";
 
-warn "label-print-pdf ***";
+#warn "label-print-pdf ***";
 
 # get the printing settings
 my $template    = GetActiveLabelTemplate();
@@ -142,7 +142,7 @@ else {
 
 }
 
-warn "ROW COL $rowcount, $colcount";
+#warn "ROW COL $rowcount, $colcount";
 
 #my $barcodetype; # = 'Code39';