From 9b9b966cb164d0e23c7cd84fae4daac12c1d57d9 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Mon, 26 Oct 2015 12:01:51 -0300 Subject: [PATCH] Bug 15053: Fix fr-FR, ru-RU and uk-UK sample creator data Fixes other sample creators data To test: 1 ) Apply the patch 2) Remove sample creator date delete from creator_layouts; delete from creator_templates; delete from printers_profile 3) Load fr-FR/2-Optionel/sample_labels.sql or ru-RU/optional/print_labels.sql or uk-UA/optional/print_labels.sql Without the patch this files can't be loaded Test all of them In case of ru and uk I removed a patron card layout Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../mysql/fr-FR/2-Optionel/sample_labels.sql | 32 +++++++-------- .../mysql/ru-RU/optional/print_labels.sql | 38 ++++++++--------- .../mysql/uk-UA/optional/print_labels.sql | 41 ++++++++----------- 3 files changed, 51 insertions(+), 60 deletions(-) diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql index 80b3645704..15bf16b1d2 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql @@ -1,20 +1,20 @@ -- Label Templates set NAMES 'utf8'; -LOCK TABLES `labels_templates` WRITE; -INSERT INTO `labels_templates` VALUES -(1,0,'Avery 5160 | 1 x 2-5/8', '3 colonnes, 10 lignes d''étiquette', 8.5, 11, 2.63, 1, 0.139, 0, 0.35, 0.23, 3, 10, 0.13, 0, 'INCH'), -(2,0,'Gaylord 8511 Spine Label','Imprime uniquement dans la colnne de gauche d''une planche Gaylord 8511.', 8.5, 11, 1, 1.25, 0.6, 0.5, 0, 0, 1, 8, 0, 0, 'INCH'), -(3,0,'Avery 5460 vertical', '', 3.625, 5.625, 1.5, 0.75, 0.38, 0.35, 2, 7, 2, 1, 0.25, 0, 'INCH'), -(4,0,'Avery 5460 spine labels', '', 5.625, 3.625, 0.75, 1.5, 0.35, 0.31, 7, 2, 1, 0, 0.25, 0, 'INCH'), -(5,0,'Avery 8163', '2colonnes x 5 colonnes', 8.5, 11, 4, 2, 0, 0, 0.5, 0.17, 2, 5, 0.2, 0.01, 'INCH'), -(6,0,'cards', 'Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\" [3x10] : equivalent: Gaylord JD-ML3000', 8.5, 11, 2.75, 1.05, 0, 0, 0.25, 0, 3, 10, 0.2, 0.01, 'INCH'), -(7,0,'Demco WS14942260', '1\" X 1.5\" Etiquettes de cotes', 8.5, 11, 1.5, 1, 0.236, 0, 0.4, 0.25, 5, 10, 0.0625, 0, 'INCH'); +LOCK TABLES `creator_templates` WRITE; +INSERT INTO `creator_templates` VALUES +(1,0,'Avery 5160 | 1 x 2-5/8', '3 colonnes, 10 lignes d''étiquette', 8.5, 11, 2.63, 1, 0.139, 0, 0.35, 0.23, 3, 10, 0.13, 0, 'INCH', 'Labels'), +(2,0,'Gaylord 8511 Spine Label','Imprime uniquement dans la colnne de gauche d''une planche Gaylord 8511.', 8.5, 11, 1, 1.25, 0.6, 0.5, 0, 0, 1, 8, 0, 0, 'INCH', 'Labels'), +(3,0,'Avery 5460 vertical', '', 3.625, 5.625, 1.5, 0.75, 0.38, 0.35, 2, 7, 2, 1, 0.25, 0, 'INCH', 'Labels'), +(4,0,'Avery 5460 spine labels', '', 5.625, 3.625, 0.75, 1.5, 0.35, 0.31, 7, 2, 1, 0, 0.25, 0, 'INCH', 'Labels'), +(5,0,'Avery 8163', '2colonnes x 5 colonnes', 8.5, 11, 4, 2, 0, 0, 0.5, 0.17, 2, 5, 0.2, 0.01, 'INCH', 'Labels'), +(6,0,'cards', 'Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\" [3x10] : equivalent: Gaylord JD-ML3000', 8.5, 11, 2.75, 1.05, 0, 0, 0.25, 0, 3, 10, 0.2, 0.01, 'INCH', 'Labels'), +(7,0,'Demco WS14942260', '1\" X 1.5\" Etiquettes de cotes', 8.5, 11, 1.5, 1, 0.236, 0, 0.4, 0.25, 5, 10, 0.0625, 0, 'INCH', 'Labels'); UNLOCK TABLES; -LOCK TABLES `labels_layouts` WRITE; -/*!40000 ALTER TABLE `labels_layouts` DISABLE KEYS */; -INSERT INTO `labels_layouts` VALUES -(1,'CODE39','BIBBAR','biblio and barcode',0,'TR',7,0,'L','title, author, itemcallnumber'), -(2,'CODE39','BIB','spine',0,'TR',3,1,'L','itemcallnumber'), -(3,'CODE39','BARBIB','barcode and biblio',0,'TR',3,1,'L','title, author, itemcallnumber'); -/*!40000 ALTER TABLE `labels_layouts` ENABLE KEYS */; +LOCK TABLES `creator_layouts` WRITE; +/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; +INSERT INTO `creator_layouts` VALUES +(1,'CODE39',1,'BIBBAR','biblio and barcode',0,1,'TR',7,'POINT',0,'L','title, author, itemcallnumber', '', 'Labels'), +(2,'CODE39',1,'BIB','spine',0,1,'TR',3,'POINT',1,'L','itemcallnumber', '', 'Labels'), +(3,'CODE39',1,'BARBIB','barcode and biblio',0,1,'TR',3,'POINT',1,'L','title, author, itemcallnumber', '', 'Labels'); +/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */; UNLOCK TABLES; diff --git a/installer/data/mysql/ru-RU/optional/print_labels.sql b/installer/data/mysql/ru-RU/optional/print_labels.sql index ba5742cfc0..2cb1b27510 100644 --- a/installer/data/mysql/ru-RU/optional/print_labels.sql +++ b/installer/data/mysql/ru-RU/optional/print_labels.sql @@ -1,28 +1,24 @@ -- Label Templates -LOCK TABLES `labels_templates` WRITE; -INSERT INTO `labels_templates` -(tmpl_id,tmpl_code,tmpl_desc,page_width,page_height,label_width,label_height,topmargin,leftmargin,cols,`rows`,colgap,rowgap, -active,units,fontsize,font) +LOCK TABLES `creator_templates` WRITE; +INSERT INTO `creator_templates` +(template_id,template_code,template_desc,page_width,page_height,label_width,label_height,top_margin,left_margin,cols,rows,col_gap,row_gap, +units) VALUES -(1,'Avery 5160 | 1 x 2-5/8','3 колонки, 10 рядов наклеек',8.5,11,2.625,1,0.5,0.1875,3,10,0.125,0,1,'INCH',7,'TR'), -(2,'Gaylord 8511 боковая наклейка','Печать только левой колонки Gaylord 8511.',8.5,11,1,1.25,0.6,0.5,1,8,0,0,NULL,'INCH',10,'TR'), -(3,'Avery 5460 вертикальная','',3.625,5.625,1.5,0.75,0.38,0.35,2,7,0.25,0,NULL,'INCH',8,'TR'), -(4,'Avery 5460 боковые наклейки','',5.625,3.625,0.75,1.5,0.35,0.31,7,2,0,0.25,NULL,'INCH',8,'TR'), -(5,'Avery 8163','2 ряда x 5 рядов',8.5,11,4,2,0.5,0.17,2,5,0.2,0.01,NULL,'INCH',11,'TR'), -(6,'cards','Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\" [3x10] : эквивалент: Gaylord JD-ML3000',8.5,11,2.75,1.05,0.25,0,3,10,0.2,0.01,NULL,'INCH',8,'TR'), -(7,'HB-PC0001','Шаблон для карточек посетителей домашнего изготовления',8.5,11,3.125,1.875,0.375,0.5625,2,5,1.125,0.1875,NULL,'INCH',16,'TR'); +(1,'Avery 5160 | 1 x 2-5/8','3 колонки, 10 рядов наклеек',8.5,11,2.625,1,0.5,0.1875,3,10,0.125,0,'INCH'), +(2,'Gaylord 8511 боковая наклейка','Печать только левой колонки Gaylord 8511.',8.5,11,1,1.25,0.6,0.5,1,8,0,0,'INCH'), +(3,'Avery 5460 вертикальная','',3.625,5.625,1.5,0.75,0.38,0.35,2,7,0.25,0,'INCH'), +(4,'Avery 5460 боковые наклейки','',5.625,3.625,0.75,1.5,0.35,0.31,7,2,0,0.25,'INCH'), +(5,'Avery 8163','2 ряда x 5 рядов',8.5,11,4,2,0.5,0.17,2,5,0.2,0.01,'INCH'), +(6,'cards','Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\" [3x10] : эквивалент: Gaylord JD-ML3000',8.5,11,2.75,1.05,0.25,0,3,10,0.2,0.01,'INCH'), +(7,'HB-PC0001','Шаблон для карточек посетителей домашнего изготовления',8.5,11,3.125,1.875,0.375,0.5625,2,5,1.125,0.1875,'INCH'); UNLOCK TABLES; -LOCK TABLES `labels_conf` WRITE; -/*!40000 ALTER TABLE `labels_conf` DISABLE KEYS */; -INSERT INTO `labels_conf` -(id,barcodetype,title,subtitle,itemtype,barcode,dewey,classification,subclass,itemcallnumber,author,issn,isbn,startlabel, -printingtype,formatstring,layoutname,guidebox,active,fonttype,ccode,callnum_split) -VALUES -(5,'CODE39',2,0,3,0,0,0,0,4,1,0,0,1,'BIBBAR','библио-запись и штрих-код',1,1,NULL,NULL,NULL,NULL), -(6,'CODE39',2,0,0,0,0,3,4,0,1,0,3,1,'BAR','переменный',1,1,NULL,NULL,NULL,NULL), -(7,'CODE39',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,1,'PATCRD','Карточки идентификации посетителей',1,NULL,NULL,NULL,NULL,NULL); -/*!40000 ALTER TABLE `labels_conf` ENABLE KEYS */; +LOCK TABLES `creator_layouts` WRITE; +/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; +INSERT INTO `creator_layouts` VALUES +(1,'CODE39',1,'BIBBAR','библио-запись и штрих-код',0,1,'TR',7,'POINT',0,'L','title, author, itemcallnumber', '', 'Labels'), +(2,'CODE39',1,'BAR','переменный',0,1,'TR',3,'POINT',0,'L','','','Labels'); +/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */; UNLOCK TABLES; diff --git a/installer/data/mysql/uk-UA/optional/print_labels.sql b/installer/data/mysql/uk-UA/optional/print_labels.sql index 456029b298..8465bec003 100644 --- a/installer/data/mysql/uk-UA/optional/print_labels.sql +++ b/installer/data/mysql/uk-UA/optional/print_labels.sql @@ -1,31 +1,26 @@ -truncate labels_templates; -truncate labels_conf; +truncate creator_templates; +truncate creator_layouts; -- Label Templates -LOCK TABLES `labels_templates` WRITE; -INSERT INTO `labels_templates` -(tmpl_id,tmpl_code,tmpl_desc,page_width,page_height,label_width,label_height,topmargin,leftmargin,cols,`rows`,colgap,rowgap, -active,units,fontsize,font) +LOCK TABLES `creator_templates` WRITE; +INSERT INTO `creator_templates` (template_id,template_code,template_desc,page_width,page_height,label_width,label_height,top_margin,left_margin,cols,rows,col_gap,row_gap, +units) VALUES -(1,'Avery 5160 | 1 x 2-5/8','3 стовпчики, 10 рядів наклейок',8.5,11,2.625,1,0.5,0.1875,3,10,0.125,0,1,'INCH',7,'TR'), -(2,'Gaylord 8511 бічна наклейка','Друк лише лівого стовпчика Gaylord 8511.',8.5,11,1,1.25,0.6,0.5,1,8,0,0,NULL,'INCH',10,'TR'), -(3,'Avery 5460 вертикальна','',3.625,5.625,1.5,0.75,0.38,0.35,2,7,0.25,0,NULL,'INCH',8,'TR'), -(4,'Avery 5460 бічні наклейки','',5.625,3.625,0.75,1.5,0.35,0.31,7,2,0,0.25,NULL,'INCH',8,'TR'), -(5,'Avery 8163','2 ряди x 5 рядів',8.5,11,4,2,0.5,0.17,2,5,0.2,0.01,NULL,'INCH',11,'TR'), -(6,'cards','Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\" [3x10] : еквівалент: Gaylord JD-ML3000',8.5,11,2.75,1.05,0.25,0,3,10,0.2,0.01,NULL,'INCH',8,'TR'), -(7,'HB-PC0001','Шаблон для карток відвідувачів домашнього виготовлення',8.5,11,3.125,1.875,0.375,0.5625,2,5,1.125,0.1875,NULL,'INCH',16,'TR'); +(1,'Avery 5160 | 1 x 2-5/8','3 стовпчики, 10 рядів наклейок',8.5,11,2.625,1,0.5,0.1875,3,10,0.125,0,'INCH'), +(2,'Gaylord 8511 боковая наклейка','ПДрук лише лівого стовпчика Gaylord 8511',8.5,11,1,1.25,0.6,0.5,1,8,0,0,'INCH'), +(3,'Avery 5460 вертикальна','',3.625,5.625,1.5,0.75,0.38,0.35,2,7,0.25,0,'INCH'), +(4,'Avery 5460 бічні наклейки','',5.625,3.625,0.75,1.5,0.35,0.31,7,2,0,0.25,'INCH'), +(5,'Avery 8163','2 ряди x 5 рядів',8.5,11,4,2,0.5,0.17,2,5,0.2,0.01,'INCH'), +(6,'cards','Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\" [3x10] : еквівалент: Gaylord JD-ML3000',8.5,11,2.75,1.05,0.25,0,3,10,0.2,0.01,'INCH'), +(7,'HB-PC0001','Шаблон для карток відвідувачів домашнього виготовлення',8.5,11,3.125,1.875,0.375,0.5625,2,5,1.125,0.1875,'INCH'); UNLOCK TABLES; -LOCK TABLES `labels_conf` WRITE; -/*!40000 ALTER TABLE `labels_conf` DISABLE KEYS */; -INSERT INTO `labels_conf` -(id,barcodetype,title,subtitle,itemtype,barcode,dewey,classification,subclass,itemcallnumber,author,issn,isbn,startlabel, -printingtype,formatstring,layoutname,guidebox,active,fonttype,ccode,callnum_split) -VALUES -(5,'CODE39',2,0,3,0,0,0,0,4,1,0,0,1,'BIBBAR','бібліо-запис та штрих-код',1,1,NULL,NULL,NULL,NULL), -(6,'CODE39',2,0,0,0,0,3,4,0,1,0,3,1,'BAR','змінний',1,1,NULL,NULL,NULL,NULL), -(7,'CODE39',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,1,'PATCRD','Картки ідентифікації відвідувачів',1,NULL,NULL,NULL,NULL,NULL); -/*!40000 ALTER TABLE `labels_conf` ENABLE KEYS */; +LOCK TABLES `creator_layouts` WRITE; +/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; +INSERT INTO `creator_layouts` VALUES +(1,'CODE39',1,'BIBBAR','бібліо-запис та штрих-код',0,1,'TR',7,'POINT',0,'L','title, author, itemcallnumber', '', 'Labels'), +(2,'CODE39',1,'BAR','змінний',0,1,'TR',3,'POINT',0,'L','','','Labels'); +/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */; UNLOCK TABLES;