[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/barcodes label-create-template.pl label-ed... [dev_week]
|
From: |
Mason James |
|
Subject: |
[Koha-cvs] koha/barcodes label-create-template.pl label-ed... [dev_week] |
|
Date: |
Mon, 16 Jul 2007 01:06:18 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Mason James <sushi> 07/07/16 01:06:18
Modified files:
barcodes : label-create-template.pl label-edit-template.pl
label-item-search.pl label-save-template.pl
label-templates.pl
Log message:
updating devweek with newer commits from rel22.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-create-template.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-edit-template.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.5
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.8&r2=1.1.2.1.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-save-template.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-templates.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6&r2=1.1.2.7
Patches:
Index: label-create-template.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-create-template.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- label-create-template.pl 10 Jul 2007 05:47:05 -0000 1.1.2.4
+++ label-create-template.pl 16 Jul 2007 01:06:17 -0000 1.1.2.5
@@ -11,9 +11,11 @@
use POSIX;
#use Data::Dumper;
+use Smart::Comments;
my $dbh = C4::Context->dbh;
my $query = new CGI;
+### $query
my $tmpl_code = $query->param('tmpl_code');
my $tmpl_desc = $query->param('tmpl_desc');
@@ -69,37 +71,16 @@
}
elsif ( $op eq 'create' ) {
-
- ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- {
- template_name => "barcodes/label-templates.tmpl",
- query => $query,
- type => "intranet",
- authnotrequired => 1,
- flagsrequired => { catalogue => 1 },
- debug => 1,
- }
- );
-
CreateTemplate(
$tmpl_code, $tmpl_desc, $page_width,
$page_height, $label_width, $label_height, $topmargin,
$leftmargin, $cols, $rows, $colgap,
- $rowgap, $fontsize, $units
+ $rowgap, $fontsize, $units );
- );
-
- @resultsloop = GetAllLabelTemplates();
-
- $template->param(
- resultsloop => address@hidden,
-
- intranetcolorstylesheet =>
- C4::Context->preference("intranetcolorstylesheet"),
- intranetstylesheet => C4::Context->preference("intranetstylesheet"),
- IntranetNav => C4::Context->preference("IntranetNav"),
- );
+ print $query->redirect("./label-templates.pl");
+exit;
}
+
output_html_with_http_headers $query, $cookie, $template->output;
Index: label-edit-template.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-edit-template.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- label-edit-template.pl 10 Jul 2007 05:47:05 -0000 1.1.2.4
+++ label-edit-template.pl 16 Jul 2007 01:06:17 -0000 1.1.2.5
@@ -10,12 +10,16 @@
use HTML::Template;
use POSIX;
-# use Data::Dumper;
+use Data::Dumper;
+use Smart::Comments;
+
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');
@@ -37,8 +41,10 @@
}
);
-my $tmpl = GetSingleLabelTemplate($tmpl_id);
+my $tmpl = GetSingleLabelTemplate($tmpl_id);
+### $tmpl
+### $tmpl->{'tmpl_id'}
my @units = (
{ unit => 'INCH', desc => 'Inches' },
{ unit => 'CM', desc => 'Centimeters' },
@@ -52,6 +58,10 @@
}
}
+### $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.8
retrieving revision 1.1.2.1.2.9
diff -u -b -r1.1.2.1.2.8 -r1.1.2.1.2.9
--- label-item-search.pl 10 Jul 2007 05:47:05 -0000 1.1.2.1.2.8
+++ label-item-search.pl 16 Jul 2007 01:06:18 -0000 1.1.2.1.2.9
@@ -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,6 +70,9 @@
# builds tag and subfield arrays
my @tags;
+### marclist
+
+
foreach my $marc (@marclist) {
if ($marc) {
my ( $tag, $subfield ) =
@@ -85,6 +88,8 @@
push @tags, "";
}
}
+
+
my ( $results, $total ) =
catalogsearch( $dbh, address@hidden, address@hidden, address@hidden,
address@hidden, address@hidden,
$startfrom * $resultsperpage,
Index: label-save-template.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-save-template.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- label-save-template.pl 10 Jul 2007 05:47:05 -0000 1.1.2.3
+++ label-save-template.pl 16 Jul 2007 01:06:18 -0000 1.1.2.4
@@ -11,6 +11,8 @@
use POSIX;
#use Data::Dumper;
+#use Smart::Comments;
+
my $dbh = C4::Context->dbh;
my $query = new CGI;
@@ -32,38 +34,17 @@
my $units = $query->param('units');
my $active = $query->param('active');
-$active = 1 if ( $active == 'on' );
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- {
- template_name => "barcodes/label-templates.tmpl",
- query => $query,
- type => "intranet",
- authnotrequired => 1,
- flagsrequired => { catalogue => 1 },
- debug => 1,
- }
-);
-
-my @resultsloop;
SaveTemplate(
$tmpl_id, $tmpl_code, $tmpl_desc, $page_width,
$page_height, $label_width, $label_height, $topmargin,
$leftmargin, $cols, $rows, $colgap,
- $rowgap, $active, $fontsize, $units
+ $rowgap, $fontsize, $units
);
address@hidden = GetAllLabelTemplates();
-$template->param(
- resultsloop => address@hidden,
- intranetcolorstylesheet =>
- C4::Context->preference("intranetcolorstylesheet"),
- intranetstylesheet => C4::Context->preference("intranetstylesheet"),
- IntranetNav => C4::Context->preference("IntranetNav"),
-);
+ print $query->redirect("./label-templates.pl");
+
-output_html_with_http_headers $query, $cookie, $template->output;
Index: label-templates.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-templates.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- label-templates.pl 10 Jul 2007 12:12:28 -0000 1.1.2.6
+++ label-templates.pl 16 Jul 2007 01:06:18 -0000 1.1.2.7
@@ -11,6 +11,7 @@
use POSIX;
#use Data::Dumper;
+use Smart::Comments;
my $dbh = C4::Context->dbh;
my $query = new CGI;
@@ -61,7 +62,14 @@
# ----------
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'};
# ----------