[Koha-cvs] koha/updater updatedatabase [rel_2_2]

[Mason James]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Mason James <sushi>     07/07/11 10:55:00

Modified files:
        updater        : updatedatabase 

Log message:
        updating 3 labels* tables for new barcodes work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_2_2&r1=1.100.2.62&r2=1.100.2.63

Patches:
Index: updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.62
retrieving revision 1.100.2.63
diff -u -b -r1.100.2.62 -r1.100.2.63
--- updatedatabase      31 May 2007 18:32:13 -0000      1.100.2.62
+++ updatedatabase      11 Jul 2007 10:54:59 -0000      1.100.2.63
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.100.2.62 2007/05/31 18:32:13 kados Exp $
+# $Id: updatedatabase,v 1.100.2.63 2007/07/11 10:54:59 sushi Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -388,23 +388,57 @@
                             timestamp timestamp(14) NOT NULL,
                             PRIMARY KEY  (labelid)
                             )",
-    labels_conf => "(id int(4) NOT NULL auto_increment,
+    labels => "(`
+    labelid` int(11) NOT NULL auto_increment,
+  batch_id varchar(10) NOT NULL default '1',
+  itemnumber varchar(100) NOT NULL default '',
+  timestamp timestamp(14) NOT NULL,
+  PRIMARY KEY  (`labelid`)
+                )",
+
+    labels_conf => "(
+  id int(4) NOT NULL auto_increment,
                            barcodetype char(100) default '',
-                           title tinyint(1) default '0',
-                           isbn tinyint(1) default '0',
-                           itemtype tinyint(1) default '0',
-                           barcode tinyint(1) default '0',
-                           dewey tinyint(1) default '0',
-                           class tinyint(1) default '0',
-                          subclass tinyint(1) default '0',
-                          itemcallnumber tinyint(1) default '0',
-                           author tinyint(1) default '0',
-                           papertype char(100) default '',
-                          printingtype char(10) default NULL,
-                           startrow int(2) default NULL,
-                          guidebox tinyint(1) default NULL,
+  title int(1) default '0',
+  itemtype int(1) default '0',
+  barcode int(1) default '0',
+  dewey int(1) default '0',
+  class int(1) default '0',
+  subclass int(1) default '0',
+  itemcallnumber int(1) default '0',
+  author int(1) default '0',
+  issn int(1) default '0',
+  isbn int(1) default '0',
+  startlabel int(2) NOT NULL default '1',
+  printingtype char(32)   default 'BAR',
+  layoutname char(20)   NOT NULL default 'TEST',
+  guidebox int(1) default '0',
+  active tinyint(1) default '1',
+  fonttype char(10)   default NULL,
                            PRIMARY KEY  (id)
-                           )",
+)",
+
+label_templates =>"(
+ labels_templates (
+  tmpl_id int(4) NOT NULL auto_increment,
+  tmpl_code char(100)   default '',
+  tmpl_desc char(100)   default '',
+  page_width float default '0',
+  page_height float default '0',
+  label_width float default '0',
+  label_height float default '0',
+  topmargin float default '0',
+  leftmargin float default '0',
+  cols int(2) default '0',
+  rows int(2) default '0',
+  colgap float default '0',
+  rowgap float default '0',
+  active int(1) default NULL,
+  units char(20)   default 'PX',
+  fontsize int(4) NOT NULL default '3',
+  PRIMARY KEY  (tmpl_id)
+)",
+
     repeatable_holidays => "(id int(11) NOT NULL auto_increment,
        branchcode varchar(4) NOT NULL default '',
        weekday smallint(6) default NULL,
@@ -2324,6 +2358,9 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.100.2.63  2007/07/11 10:54:59  sushi
+# updating 3 labels* tables for new barcodes work.
+#
 # Revision 1.100.2.62  2007/05/31 18:32:13  kados
 # some mysql 5.0 fixes - thanks slef
 #