[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/updater updatedatabase
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha/updater updatedatabase |
|
Date: |
Mon, 17 Jul 2006 12:28:45 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Antoine Farnault <toins> 06/07/17 12:28:45
Modified files:
updater : updatedatabase
Log message:
sync with rel_2_2
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&r1=1.153&r2=1.154
Patches:
Index: updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- updatedatabase 4 Jul 2006 14:36:52 -0000 1.153
+++ updatedatabase 17 Jul 2006 12:28:45 -0000 1.154
@@ -1,10 +1,6 @@
#!/usr/bin/perl
-<<<<<<< updatedatabase
-# $Id: updatedatabase,v 1.153 2006/07/04 14:36:52 toins Exp $
-=======
-# $Id: updatedatabase,v 1.153 2006/07/04 14:36:52 toins Exp $
->>>>>>> 1.100.2.46
+# $Id: updatedatabase,v 1.154 2006/07/17 12:28:45 toins Exp $
# Database Updater
# This script checks for required updates to the database.
@@ -143,78 +139,10 @@
`city_zipcode` char(20),
PRIMARY KEY (`cityid`)
)",
-<<<<<<< updatedatabase
roadtype => "(`roadtypeid` int auto_increment,
`road_type` char(100) NOT NULL,
PRIMARY KEY (`roadtypeid`)
-=======
- marc_word => "(
- bibid bigint(20) NOT NULL default '0',
- tag char(3) NOT NULL default '',
- tagorder tinyint(4) NOT NULL default '1',
- subfieldid char(1) NOT NULL default '',
- subfieldorder tinyint(4) NOT NULL default '1',
- word varchar(255) NOT NULL default '',
- sndx_word varchar(255) NOT NULL default '',
- KEY bibid (bibid),
- KEY tag (tag),
- KEY tagorder (tagorder),
- KEY subfieldid (subfieldid),
- KEY subfieldorder (subfieldorder),
- KEY word (word),
- KEY sndx_word (sndx_word)
)",
- marc_breeding => "( id bigint(20) NOT NULL auto_increment,
- file varchar(80) NOT NULL default '',
- isbn varchar(10) NOT NULL default '',
- title varchar(128) default NULL,
- author varchar(80) default NULL,
- marc text NOT NULL,
- encoding varchar(40) default NULL,
- PRIMARY KEY (id),
- KEY title (title),
- KEY isbn (isbn)
- )",
- authorised_values => "(id int(11) NOT NULL auto_increment,
- category char(10) NOT NULL default '',
- authorised_value char(80) NOT NULL default '',
- lib char(80) NULL,
- PRIMARY KEY (id),
- KEY name (category)
- )",
- userflags => "( bit int(11) NOT NULL default '0',
- flag char(30), flagdesc char(255),
- defaulton int(11)
- )",
- auth_types => "(
- authtypecode char(10) not NULL,
- authtypetext char(255) not NULL,
- auth_tag_to_report char(3) not NULL,
- summary text not NULL,
- PRIMARY KEY (authtypecode)
- )",
- biblio_framework => "(
- frameworkcode char(4) not NULL,
- frameworktext char(255) not NULL,
- PRIMARY KEY (frameworkcode)
- )",
- auth_subfield_structure => "(
- authtypecode char(10) NOT NULL default
'',
- tagfield char(3) NOT NULL default '',
- tagsubfield char(1) NOT NULL default '',
- liblibrarian char(255) NOT NULL default
'',
- libopac char(255) NOT NULL default '',
- repeatable tinyint(4) NOT NULL default
'0',
- mandatory tinyint(4) NOT NULL default
'0',
- tab tinyint(1) default NULL,
- authorised_value char(10) default NULL,
- value_builder char(80) default NULL,
- seealso char(255) default NULL,
- PRIMARY KEY
(authtypecode,tagfield,tagsubfield),
- KEY tab (authtypecode,tab)
->>>>>>> 1.100.2.46
- )",
-<<<<<<< updatedatabase
labels => "(
labelid int(11) NOT NULL auto_increment,
@@ -251,160 +179,9 @@
borrower2 integer
)",
-=======
- auth_tag_structure => "(
- authtypecode char(10) NOT NULL default
'',
- tagfield char(3) NOT NULL default '',
- liblibrarian char(255) NOT NULL default
'',
- libopac char(255) NOT NULL default '',
- repeatable tinyint(4) NOT NULL default
'0',
- mandatory tinyint(4) NOT NULL default
'0',
- authorised_value char(10) default NULL,
- PRIMARY KEY (authtypecode,tagfield)
- )",
- auth_header => "(
- authid bigint(20) unsigned NOT
NULL auto_increment,
- authtypecode char(10) NOT NULL
default '',
- datecreated date NOT NULL
default '0000-00-00',
- datemodified date default NULL,
- origincode char(20) default
NULL,
- PRIMARY KEY (authid),
- KEY origincode (origincode)
- ) ",
- auth_subfield_table => "(
- subfieldid bigint(20) unsigned
NOT NULL auto_increment,
- authid bigint(20) unsigned NOT
NULL default '0',
- tag char(3) NOT NULL default '',
- tagorder tinyint(4) NOT NULL
default '1',
- tag_indicator char(2) NOT NULL
default '',
- subfieldcode char(1) NOT NULL
default '',
- subfieldorder tinyint(4) NOT
NULL default '1',
- subfieldvalue varchar(255)
default NULL,
- PRIMARY KEY (subfieldid),
- KEY authid (authid),
- KEY tag (tag),
- KEY subfieldcode (subfieldcode),
- KEY subfieldvalue
(subfieldvalue)
- )",
- auth_word => "(
- authid bigint(20) NOT NULL default '0',
- tagsubfield char(4) NOT NULL default '',
- tagorder tinyint(4) NOT NULL default '1',
- subfieldorder tinyint(4) NOT NULL default '1',
- word varchar(255) NOT NULL default '',
- sndx_word varchar(255) NOT NULL default '',
- KEY authid (authid),
- KEY marc_search (tagsubfield,word),
- KEY word (word),
- KEY sndx_word (sndx_word)
- )",
- suggestions => "(
- suggestionid int(8) NOT NULL auto_increment,
- suggestedby int(11) NOT NULL default '0',
- managedby int(11) default NULL ,
- STATUS varchar(10) NOT NULL default '',
- note text,
- author varchar(80) default NULL ,
- title varchar(80) default NULL ,
- copyrightdate smallint(6) default NULL ,
- publishercode varchar(255) default NULL ,
- date timestamp(8) NOT NULL ,
- volumedesc varchar(255) default NULL ,
- publicationyear smallint(6) default '0',
- place varchar(255) default NULL ,
- isbn varchar(10) default NULL ,
- mailoverseeing smallint(1) default '0',
- biblionumber int(11) default NULL ,
- PRIMARY KEY (suggestionid) ,
- KEY suggestedby(suggestedby) ,
- KEY managedby(managedby)
- )",
- aqbasket => "(basketno int(11) NOT NULL auto_increment,
- creationdate date,
- closedate date,
- booksellerid varchar(10),
- authorisedby varchar(10),
- booksellerinvoicenumber text,
- PRIMARY KEY (basketno)
- )",
- serial => "(serialid int(11) NOT NULL auto_increment,
- biblionumber varchar(100) NOT NULL default '',
- subscriptionid varchar(100) NOT NULL default '',
- serialseq varchar(100) NOT NULL default '',
- status tinyint(4) NOT NULL default '0',
- planneddate date NOT NULL default '0000-00-00',
- publishedddate date NOT NULL default
'0000-00-00',
- PRIMARY KEY (serialid)
- )",
- subscription => "(biblionumber int(11) NOT NULL default '0',
- subscriptionid int(11) NOT NULL
auto_increment,
- librarian varchar(100) default
'',
- startdate date default
'0000-00-00',
- aqbooksellerid int(11) default
'0',
- cost int(11) default '0',
- aqbudgetid int(11) default '0',
- weeklength tinyint(4) default
'0',
- monthlength tinyint(4) default
'0',
- numberlength tinyint(4) default
'0',
- periodicity tinyint(4) default
'0',
- dow varchar(100) default '',
- numberingmethod varchar(100)
default '',
- notes text,
- status varchar(100) NOT NULL
default '',
- add1 int(11) default 0,
- every1 int(11) default 0,
- whenmorethan1 int(11) default 0,
- setto1 int(11),
- lastvalue1 int(11),
- add2 int(11) default 0,
- every2 int(11) default 0,
- whenmorethan2 int(11) default 0,
- setto2 int(11),
- lastvalue2 int(11),
- add3 int(11) default 0,
- every3 int(11) default 0,
- innerloop1 int(11) default 0,
- innerloop2 int(11) default 0,
- innerloop3 int(11) default 0,
- whenmorethan3 int(11) default 0,
- setto3 int(11),
- lastvalue3 int(11),
- PRIMARY KEY (subscriptionid)
- )",
- subscriptionhistory => "(biblionumber int(11) NOT NULL default '0',
- subscriptionid int(11)
NOT NULL default '0',
- histstartdate date NOT
NULL default '0000-00-00',
- enddate date default
'0000-00-00',
- missinglist longtext
NOT NULL,
- recievedlist longtext
NOT NULL,
- opacnote varchar(150)
NOT NULL default '',
- librariannote
varchar(150) NOT NULL default '',
- PRIMARY KEY
(subscriptionid),
- KEY biblionumber
(biblionumber)
- )",
- labels => "(labelid int(11) NOT NULL auto_increment,
- 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',
- author tinyint(1) default '0',
- papertype char(100) default '',
- startrow int(2) default NULL,
- PRIMARY KEY (id)
- )",
->>>>>>> 1.100.2.46
);
my %requirefields = (
-<<<<<<< updatedatabase
subscription => { 'letter' => 'char(20) NULL', 'distributedto' => 'text
NULL'},
itemtypes => { 'imageurl' => 'char(200) NULL'},
aqbookfund => { 'branchcode' => 'varchar(4) NULL'},
@@ -413,72 +190,6 @@
auth_subfield_structure =>{ 'hidden' => 'TINYINT(3) NOT NULL UNSIGNED
ZEROFILL', 'kohafield' => 'VARCHAR(45) NOT NULL', 'linkid' => 'TINYINT(1) NOT
NULL UNSIGNED', 'isurl' => 'TINYINT(1) UNSIGNED'},
statistics => { 'associatedborrower' => 'integer'},
# tablename => { 'field' => 'fieldtype' },
-=======
- biblio => { 'abstract' => 'text' },
- deletedbiblio => { 'abstract' => 'text', 'marc' => 'blob' },
- deleteditems =>
- { 'marc' => 'blob', 'paidfor' => 'text', 'location' => 'varchar(80)' },
- biblioitems => {
- 'lccn' => 'char(25)',
- 'url' => 'varchar(255)',
- 'marc' => 'text'
- },
- deletedbiblioitems => {
- 'lccn' => 'char(25)',
- 'url' => 'varchar(255)',
- 'marc' => 'text'
- },
- branchtransfers => { 'datearrived' => 'datetime' },
- statistics => { 'borrowernumber' => 'int(11)' },
- aqbooksellers => {
- 'invoicedisc' => 'float(6,4)',
- 'nocalc' => 'int(11)'
- },
- borrowers => {
- 'userid' => 'char(30)',
- 'password' => 'char(30)',
- 'flags' => 'int(11)',
- 'textmessaging' => 'varchar(30)',
- 'zipcode' => 'varchar(25)',
- 'homezipcode' => 'varchar(25)',
- 'sort1' => 'char(80)',
- 'sort2' => 'char(80)',
- },
- aqorders => {
- 'budgetdate' => 'date',
- 'sort1' => 'char(80)',
- 'sort2' => 'char(80)',
- },
- aqbudget => {
- 'aqbudgetid' => 'tinyint(4) auto_increment primary key',
- 'branchcode' => 'varchar(4)',
- },
- aqbookfund => { 'branchcode' => 'varchar(4)', },
- items => { 'paidfor' => 'text', 'location' => 'char(80)' },
-
- #added so that reference items are not available for reserves...
- itemtypes => { 'notforloan' => 'smallint(6)' },
- systempreferences => {
- 'explanation' => 'char(80)',
- 'type' => 'char(20)',
- 'options' => 'text'
- },
- z3950servers => { 'syntax' => 'char(80)' },
- marc_tag_structure =>
- { 'frameworkcode' => 'char(4) not NULL default \'\'' },
- marc_subfield_structure => {
- 'seealso' => 'char(255)',
- 'frameworkcode' => 'char(4) not NULL default \'\'',
- 'hidden' => 'tinyint(1)',
- 'isurl' => 'tinyint(1)',
- 'link' => 'char(80)',
- },
- bookshelf => {
- 'owner' => 'char(80)',
- 'category' => 'char(1)',
- },
- marc_biblio => { 'frameworkcode' => 'char(4) not NULL default \'\'' },
->>>>>>> 1.100.2.46
);
my %dropable_table = (
@@ -492,21 +203,10 @@
);
my %uselessfields = (
-<<<<<<< updatedatabase
# tablename => "field1,field2",
borrowers =>
"suburb,altstreetaddress,altsuburb,altcity,studentnumber,school,area,preferredcont,altcp",
deletedborrowers=>
"suburb,altstreetaddress,altsuburb,altcity,studentnumber,school,area,preferredcont,altcp",
);
-=======
- aqorders => "requisitionedby,authorisedby,booksellerid,
- deliverydays,followupdays,
- numberfollowupsallowed,numberfollowupssent,
- dateprinted,sourced,quantityreceiveddamaged,
- subscriptionfrom,subscriptionto
- "
-);
-
->>>>>>> 1.100.2.46
# the other hash contains other actions that can't be done elsewhere. they are
done
# either BEFORE of AFTER everything else, depending on "when" entry (default
=> AFTER)
@@ -519,474 +219,39 @@
# values given in the %tabledata hash.
my %tabledata = (
-<<<<<<< updatedatabase
# tablename => [
# { uniquefielrequired => 'fieldname', # the primary key in the
table
# fieldname => fieldvalue,
# fieldname2 => fieldvalue2,
# },
# ],
-=======
- userflags => [
- {
- uniquefieldrequired => 'bit',
- bit => 0,
- flag => 'superlibrarian',
- flagdesc => 'Access to all librarian functions',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 1,
- flag => 'circulate',
- flagdesc => 'Circulate books',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 2,
- flag => 'catalogue',
- flagdesc => 'View Catalogue (Librarian Interface)',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 3,
- flag => 'parameters',
- flagdesc => 'Set Koha system paramters',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 4,
- flag => 'borrowers',
- flagdesc => 'Add or modify borrowers',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 5,
- flag => 'permissions',
- flagdesc => 'Set user permissions',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 6,
- flag => 'reserveforothers',
- flagdesc => 'Reserve books for patrons',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 7,
- flag => 'borrow',
- flagdesc => 'Borrow books',
- defaulton => 1
- },
- {
- uniquefieldrequired => 'bit',
- bit => 8,
- flag => 'reserveforself',
- flagdesc => 'Reserve books for self',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 9,
- flag => 'editcatalogue',
- flagdesc => 'Edit Catalogue (Modify bibliographic/holdings data)',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 10,
- flag => 'updatecharges',
- flagdesc => 'Update borrower charges',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 11,
- flag => 'acquisition',
- flagdesc => 'Acquisition and/or suggestion management',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 12,
- flag => 'management',
- flagdesc => 'Set library management parameters',
- defaulton => 0
- },
- {
- uniquefieldrequired => 'bit',
- bit => 13,
- flag => 'tools',
- flagdesc => 'Use tools (export, import, barcodes)',
- defaulton => 0
- },
- ],
->>>>>>> 1.100.2.46
systempreferences => [
{
uniquefieldrequired => 'variable',
-<<<<<<< updatedatabase
variable => 'Activate_Log',
value => 'On',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Turn Log Actions on DB On an Off',
type => 'YesNo',
-=======
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- variable => 'LibraryName',
- value =>
-'<i><b>Koha<br/>Free Software ILS<br/><br/></b>Koha : a gift, a
contribution<br/> in Maori</i>',
- explanation => 'Library name as shown on main opac page',
- type => ''
-
->>>>>>> 1.100.2.46
},
{
uniquefieldrequired => 'variable',
-<<<<<<< updatedatabase
variable => 'IndependantBranches',
value => 0,
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Turn Branch independancy management On an
Off',
type => 'YesNo',
-=======
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- variable => 'autoMemberNum',
- value => '1',
- explanation => 'Member number is auto-calculated',
- type => 'YesNo'
-
->>>>>>> 1.100.2.46
},
{
uniquefieldrequired => 'variable',
-<<<<<<< updatedatabase
variable => 'ReturnBeforeExpiry',
value => 'Off',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'If Yes, Returndate on issuing can\'t be
after borrower card expiry',
type => 'YesNo',
-=======
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- variable => 'acquisitions',
- value => 'normal',
- explanation =>
-'Normal, budget-based acquisitions, or Simple bibliographic-data acquisitions',
- type => 'Choice',
- options => 'simple|normal'
- },
- {
- uniquefieldrequired => 'variable',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- variable => 'dateformat',
- value => 'metric',
- explanation =>
- 'date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd)',
- type => 'Choice',
- options => 'metric|us|iso'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'template',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'default',
- explanation => 'Preference order for intranet interface templates',
- type => 'Themes'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'autoBarcode',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'yes',
- explanation => 'Barcode is auto-calculated',
- type => 'YesNo'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'insecure',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'no',
- explanation =>
-'If YES, no auth at all is needed. Be careful if you set this to yes!',
- type => 'YesNo'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'authoritysep',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- value => '--',
- explanation =>
- 'the separator used in authority/thesaurus. Usually --',
- type => 'free',
- options => '10'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'opaclanguages',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'en',
- explanation =>
-'Set the preferred order for translations. The top language will be tried
first.',
- type => 'Languages'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'opacthemes',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'css',
- explanation =>
-'Set the preferred order for themes. The top theme will be tried first.',
- type => 'Themes'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'timeout',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '1200',
- explanation =>
- 'Inactivity timeout for cookies authentication (in seconds)',
- type => 'Integer'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'marc',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'yes',
- explanation => 'Turn on MARC support',
- type => 'YesNo'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'sortbynonfiling',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'no',
- explanation => 'Sort search results by MARC nonfiling characters',
- type => 'YesNo'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'marcflavour',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- value => 'MARC21',
- explanation =>
-'your MARC flavor (MARC21 or UNIMARC) used for character encoding',
- type => 'Choice',
- options => 'MARC21|UNIMARC'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'checkdigit',
- value => 'none',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- explanation =>
-'Validity checks on membership number: none or "Katipo" style checks',
- type => 'Choice',
- options => 'none|katipo'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'maxoutstanding',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '5',
- explanation =>
- 'maximum amount withstanding to be able make reserves ',
- type => 'Integer'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'maxreserves',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '5',
- explanation => 'maximum number of reserves a member can make',
- type => 'Integer'
-
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'noissuescharge',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '5',
- explanation =>
- 'maximum amount withstanding to be able to check out an item',
- type => 'Integer'
-
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'KohaAdminEmailAddress',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'address@hidden',
- explanation => 'the email address where borrowers modifs are sent',
- type => 'free'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'gist',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '0.125',
- explanation =>
- 'the gist rate. NOT in %, but in numeric form (0.12 for 12%)',
- type => 'free'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'printcirculationslips',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '0',
- explanation =>
- 'if set to 1, print circulation slips. If set to 0, don\'t',
- type => 'free'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'suggestion',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '0',
- explanation => 'if set to 1, suggestions are activated in OPAC',
- type => 'free'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'ISBD',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => 'Fill with appropriate value...',
- explanation => 'ISBD',
- type => 'free'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'virtualshelves',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '0',
- explanation => 'Set virtual shelves management ON or OFF',
- type => 'YesNo'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'itemcallnumber',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1
- },
- value => '676a',
- explanation =>
-'The MARC field/subfield that is used to calculate the itemcallnumber (in
UNIMARC : 676a for Dewey, 680a for Loc)',
- type => 'free'
- },
- {
- uniquefieldrequired => 'variable',
- variable => 'BiblioDefaultView',
- value => 'normal',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- explanation =>
-'Define the default view of a biblio. Can be either normal, marc or isbd',
- type => 'Choice',
- options => 'normal|marc|isbd'
- },
-
- {
- uniquefieldrequired => 'variable',
- variable => 'LabelMARCView',
- value => 'standard',
- forceupdate => {
- 'explanation' => 1,
- 'type' => 1,
- 'options' => 1
- },
- explanation => 'Define how a MARC record will display',
- type => 'Choice',
- options => 'standard|economical'
->>>>>>> 1.100.2.46
},
{
@@ -1479,7 +744,6 @@
type => 'free',
},
{
-<<<<<<< updatedatabase
uniquefieldrequired => 'variable',
variable => 'borrowerRelationship',
value => 'father|mother,grand-mother',
@@ -1487,14 +751,6 @@
'type' => 1},
explanation => 'The relationships between a guarantor & a
guarantee (separated by | or ,)',
type => 'free',
-=======
- field => 'aqbudgetid',
- type => 'tinyint(4)',
- null => '',
- key => 'PRI',
- default => '',
- extra => 'auto_increment'
->>>>>>> 1.100.2.46
},
{
uniquefieldrequired => 'variable',
@@ -1505,11 +761,6 @@
explanation => 'Maximum delay to pick up a reserved
document',
type => 'free',
},
-<<<<<<< updatedatabase
-=======
- ],
- marc_breeding => [
->>>>>>> 1.100.2.46
{
uniquefieldrequired => 'variable',
variable => 'TransfersMaxDaysWarning',
@@ -1565,7 +816,6 @@
type => 'YesNo',
},
],
-<<<<<<< updatedatabase
);
@@ -1579,9 +829,6 @@
# },
# ],
serial => [
-=======
- serial => [
->>>>>>> 1.100.2.46
{
field => 'notes',
type => 'TEXT',
@@ -1591,7 +838,6 @@
extra => ''
},
],
-<<<<<<< updatedatabase
aqbasket => [
{
field => 'booksellerid',
@@ -1882,18 +1128,6 @@
type => 'PRIMARY',
}
],
-=======
- biblioitems => [
- {
- field => 'dewey',
- type => 'varchar(30)',
- null => 'NULL',
- key => '',
- default => '',
- extra => ''
- },
- ],
->>>>>>> 1.100.2.46
);
my %foreign_keys = (
@@ -2398,49 +1632,7 @@
}
}
}
-<<<<<<< updatedatabase
-
-=======
-unless ( $existingtables{'z3950servers'} ) {
-
- #MJR: added syntax entries to close bug 624
- print "Adding z3950servers table...\n" unless $silent;
- my $sti = $dbh->prepare(
- "create table z3950servers (
-
host char(255),
-
port int,
-
db char(255),
-
userid char(255),
-
password char(255),
-
name text,
-
id int,
-
checked smallint,
-
rank int,
-
syntax char(80))"
- );
- $sti->execute;
- $sti = $dbh->prepare(
- "insert into z3950servers
- values
('z3950.loc.gov',
- 7090,
- 'voyager',
- '', '',
- 'Library of
Congress',
- 1, 1, 1,
'USMARC')"
- );
- $sti->execute;
-}
-unless ( $existingtables{'issuingrules'} ) {
- $dbh->do("alter table categoryitem rename issuingrules");
- $dbh->do("ALTER TABLE issuingrules ADD maxissueqty int(4) default NULL");
- $dbh->do("ALTER TABLE issuingrules ADD issuelength int(4) default NULL");
- $dbh->do(
- "ALTER TABLE issuingrules ADD branchcode varchar(4) NOT NULL default
''"
- );
- print "renaming categoryitem\n" unless $silent;
-}
->>>>>>> 1.100.2.46
#---------------------------------
# Columns
@@ -2465,77 +1657,15 @@
print "Execute: $query\n" if $debug;
my $sti = $dbh->prepare($query);
$sti->execute;
- if ( $sti->err ) {
- print "**Error : $sti->errstr \n";
- $sti->finish;
- } # if error
- } # if column
- } # foreach column
-} # foreach table
-
-foreach $table ( keys %fielddefinitions ) {
-<<<<<<< updatedatabase
- print "Check table $table\n" if $debug;
- $sth = $dbh->prepare("show columns from $table");
- $sth->execute();
- my $definitions;
- while ( ( $column, $type, $null, $key, $default, $extra ) =
$sth->fetchrow )
- {
- $definitions->{$column}->{type} = $type;
- $definitions->{$column}->{null} = $null;
- $definitions->{$column}->{null} = 'NULL' if $null eq 'YES';
- $definitions->{$column}->{key} = $key;
- $definitions->{$column}->{default} = $default;
- $definitions->{$column}->{extra} = $extra;
- } # while
- my $fieldrow = $fielddefinitions{$table};
- foreach my $row (@$fieldrow) {
- my $field = $row->{field};
- my $type = $row->{type};
- my $null = $row->{null};
-# $null = 'YES' if $row->{null} eq 'NULL';
- my $key = $row->{key};
- my $default = $row->{default};
- my $null = $row->{null};
-# $default="''" unless $default;
- my $extra = $row->{extra};
- my $def = $definitions->{$field};
- my $after = ($row->{after}?" after ".$row->{after}:"");
-
- unless ( $type eq $def->{type}
- && $null eq $def->{null}
- && $key eq $def->{key}
- && $extra eq $def->{extra} )
- {
- if ( $null eq '' ) {
- $null = 'NOT NULL';
- }
- if ( $key eq 'PRI' ) {
- $key = 'PRIMARY KEY';
- }
- unless ( $extra eq 'auto_increment' ) {
- $extra = '';
- }
+ if ( $sti->err ) {
+ print "**Error : $sti->errstr \n";
+ $sti->finish;
+ } # if error
+ } # if column
+ } # foreach column
+} # foreach table
- # if it's a new column use "add", if it's an old one,
use "change".
- my $action;
- if ($definitions->{$field}->{type}) {
- $action="change $field"
- } else {
- $action="add";
- }
-# if it's a primary key, drop the previous pk, before altering the table
- my $sth;
- if ($key ne 'PRIMARY KEY') {
- $sth =$dbh->prepare("alter table $table $action
$field $type $null $key $extra default ? $after");
- } else {
- $sth =$dbh->prepare("alter table $table drop
primary key, $action $field $type $null $key $extra default ? $after");
- }
- $sth->execute($default);
- print " alter or create $field in $table\n" unless
$silent;
- }
- }
-=======
+foreach $table ( keys %fielddefinitions ) {
print "Check table $table\n" if $debug;
$sth = $dbh->prepare("show columns from $table");
$sth->execute();
@@ -2553,13 +1683,15 @@
foreach my $row (@$fieldrow) {
my $field = $row->{field};
my $type = $row->{type};
+ my $null = $row->{null};
+# $null = 'YES' if $row->{null} eq 'NULL';
my $key = $row->{key};
my $default = $row->{default};
my $null = $row->{null};
-
- # $default="''" unless $default;
+# $default="''" unless $default;
my $extra = $row->{extra};
my $def = $definitions->{$field};
+ my $after = ($row->{after}?" after ".$row->{after}:"");
unless ( $type eq $def->{type}
&& $null eq $def->{null}
@@ -2578,359 +1710,24 @@
# if it's a new column use "add", if it's an old one, use "change".
my $action;
- if ( $definitions->{$field}->{type} ) {
- $action = "change $field";
- }
- else {
- $action = "add";
+ if ($definitions->{$field}->{type}) {
+ $action="change $field"
+ } else {
+ $action="add";
}
-
- # if it's a primary key, drop the previous pk, before altering the
table
+# if it's a primary key, drop the previous pk, before altering the table
my $sth;
- if ( $key ne 'PRIMARY KEY' ) {
- $sth =
- $dbh->prepare(
-"alter table $table $action $field $type $null $key $extra default ?"
- );
- }
- else {
- $sth =
- $dbh->prepare(
-"alter table $table drop primary key, $action $field $type $null $key $extra
default ?"
- );
+ if ($key ne 'PRIMARY KEY') {
+ $sth =$dbh->prepare("alter table $table $action
$field $type $null $key $extra default ? $after");
+ } else {
+ $sth =$dbh->prepare("alter table $table drop
primary key, $action $field $type $null $key $extra default ? $after");
}
$sth->execute($default);
- print " Alter $field in $table\n" unless $silent;
- }
- }
->>>>>>> 1.100.2.46
-}
-
-<<<<<<< updatedatabase
-=======
-# Get list of columns from borrowers table
-my %itemtypes;
-my %nullenabled;
-$sth = $dbh->prepare("show columns from borrowers");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $itemtypes{$column} = $type;
- $nullenabled{$column} = $null;
-}
-
-unless ( $itemtypes{'cardnumber'} eq 'varchar(20)' ) {
- $itemtypes{'cardnumber'} =~ /varchar\((\d+)\)/;
- my $oldlength = $1;
- if ( $oldlength < 16 ) {
- print
-"Setting maximum cardnumber length to 16 (was $oldlength) and marking
unique.\n"
- unless $silent;
- my $sti =
- $dbh->prepare(
- "alter table borrowers change cardnumber cardnumber varchar(16)");
- $sti->execute;
- $sti->finish;
- $sti = $dbh->prepare("alter table borrowers drop index cardnumber");
- $sti->execute;
- $sti->finish;
- $sti = $dbh->prepare("alter table borrowers add unique(cardnumber)");
- $sti->execute;
- $sti->finish;
- }
-}
-
-#
-# Get list of columns from items table
-$sth = $dbh->prepare("show columns from items");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $itemtypes{$column} = $type;
- $nullenabled{$column} = $null;
-}
-
-unless ( $itemtypes{'barcode'} eq 'varchar(20)' ) {
- $itemtypes{'barcode'} =~ /varchar\((\d+)\)/;
- my $oldlength = $1;
- if ( $oldlength < 20 ) {
- print "Setting maximum barcode length to 20 (was $oldlength).\n"
- unless $silent;
- my $sti =
- $dbh->prepare("alter table items change barcode barcode
varchar(20)");
- $sti->execute;
- }
-}
-
-#
-# dropping unique barcode index & setting barcode to null allowed.
-#
-$sth = $dbh->prepare("show index from items");
-$sth->execute;
-while (
- my (
- $table, $non_unique, $key_name, $Seq_in_index,
- $Column_name, $Collation, $cardinality, $sub_part,
- $Packed, $comment
- )
- = $sth->fetchrow
- )
-{
- if ( $key_name eq 'barcode' && $non_unique eq 0 ) {
- print "dropping BARCODE index to enable empty barcodes\n"
- unless $silent;
- $dbh->do("ALTER TABLE `items` DROP INDEX `barcode`");
- }
-}
-$dbh->do("ALTER TABLE `items` CHANGE `barcode` `barcode` VARCHAR( 20 )")
- unless ( $nullenabled{barcode} eq 'YES' );
-
-#
-# creating fulltext index in bibliothesaurus if needed
-#
-$sth = $dbh->prepare("show index from bibliothesaurus");
-$sth->execute;
-my $exists = 0;
-while (
- my (
- $table, $non_unique, $key_name, $Seq_in_index,
- $Column_name, $Collation, $cardinality, $sub_part,
- $Packed, $comment
- )
- = $sth->fetchrow
- )
-{
- if ( $key_name eq 'category_2' ) {
- $exists = 1;
- }
-}
-print "Creating fulltext index on bibliothesaurus\n" unless $exists or $silent;
-$dbh->do(
- 'create fulltext index category_2 on bibliothesaurus (category,freelib)')
- unless $exists;
-
-#
-# creating index in z3950results if needed
-#
-$sth = $dbh->prepare("show index from z3950results");
-$sth->execute;
-my $exists = 0;
-while (
- my (
- $table, $non_unique, $key_name, $Seq_in_index,
- $Column_name, $Collation, $cardinality, $sub_part,
- $Packed, $comment
- )
- = $sth->fetchrow
- )
-{
- if ( $key_name eq 'query_server' ) {
- $exists = 1;
+ print " alter or create $field in $table\n" unless
$silent;
}
-}
-print "Creating index on z3950results\n" unless $exists or $silent;
-$dbh->do('create unique index query_server on z3950results (queryid,server)')
- unless $exists;
-
-# changing z3950daemon field to NULL in marc_breeding
-$dbh->do(
-"ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"
-);
-
-# making borrowernumber an auto_increment field
-$dbh->do(
-"ALTER TABLE `borrowers` CHANGE `borrowernumber` `borrowernumber` INTEGER
auto_increment"
-);
-
-# changing indexes in marc_*_structure to use frameworkcode
-$dbh->do('alter table marc_subfield_structure drop index tab');
-$dbh->do('create index tab on marc_subfield_structure (frameworkcode,tab)');
-$dbh->do('alter table marc_subfield_structure drop index kohafield');
-$dbh->do(
-'create index kohafield on marc_subfield_structure (frameworkcode,kohafield)'
-);
-
-# extending the timestamp in branchtransfers...
-my %branchtransfers;
-
-$sth = $dbh->prepare("show columns from branchtransfers");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $branchtransfers{$column} = $type;
-}
-
-unless ( $branchtransfers{'datesent'} eq 'datetime' ) {
- print "Setting type of datesent in branchtransfers to datetime.\n"
- unless $silent;
- my $sti =
- $dbh->prepare(
- "alter table branchtransfers change datesent datesent datetime");
- $sti->execute;
-}
-
-unless ( $branchtransfers{'datearrived'} eq 'datetime' ) {
- print "Setting type of datearrived in branchtransfers to datetime.\n"
- unless $silent;
- my $sti =
- $dbh->prepare(
- "alter table branchtransfers change datearrived datearrived datetime");
- $sti->execute;
-}
-
-# changing the branchcategories table around...
-my %branchcategories;
-
-$sth = $dbh->prepare("show columns from branchcategories");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $branchcategories{$column} = $type;
-}
-
-unless ( $branchcategories{'categorycode'} eq 'varchar(4)' ) {
- print
-"Setting type of categorycode in branchcategories to varchar(4),\n and making
the primary key.\n"
- unless $silent;
- my $sti =
- $dbh->prepare(
-"alter table branchcategories change categorycode categorycode varchar(4) not
null"
- );
- $sti->execute;
- $sti =
- $dbh->prepare(
- "alter table branchcategories add primary key (categorycode)");
- $sti->execute;
-}
-
-unless ( $branchcategories{'categoryname'} eq 'text' ) {
- print "Changing branchcode in branchcategories to categoryname text.\n"
- unless $silent;
- my $sth =
- $dbh->prepare(
- "alter table branchcategories change branchcode categoryname text");
- $sth->execute;
-}
-
-unless ( $branchcategories{'codedescription'} eq 'text' ) {
- print
- "Replacing branchholding in branchcategories with codedescription
text.\n"
- unless $silent;
- my $sth =
- $dbh->prepare(
- "alter table branchcategories change branchholding codedescription
text"
- );
- $sth->execute;
-}
-
-# changing the items table around...
-my %items;
-
-$sth = $dbh->prepare("show columns from items");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $items{$column} = $type;
-}
-
-if ( $items{'bulk'} eq "varchar(30)" ) {
- print " Setting callnumber in items table\n" unless $silent;
- my $sti =
- $dbh->prepare(
-"ALTER TABLE `items` CHANGE `bulk` `itemcallnumber` VARCHAR( 30 ) DEFAULT NULL"
- );
- $sti->execute;
- $sti =
- $dbh->prepare(
-"update marc_subfield_structure set kohafield=\"items.itemcallnumber\" where
kohafield=\"items.bulk\""
- );
- $sti->execute;
-}
-
-# changing the marc_subfield_structure table around...
-my %marc_subfield_structure;
-
-$sth = $dbh->prepare("show columns from marc_subfield_structure");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $marc_subfield_structure{$column} = $type;
-}
-
-if ( $marc_subfield_structure{thesaurus_category} ) {
- print " changing thesaurus_category in marc_subfield_structure table\n"
- unless $silent;
- my $sti =
- $dbh->prepare(
-"ALTER TABLE marc_subfield_structure CHANGE `thesaurus_category`
`authtypecode` VARCHAR(10 ) DEFAULT NULL"
- );
- $sti->execute;
-}
-
-#
-# creating index in issuingrules if needed
-#
-$sth = $dbh->prepare("show index from issuingrules");
-$sth->execute;
-my $exists = 0;
-while (
- my (
- $table, $non_unique, $key_name, $Seq_in_index,
- $Column_name, $Collation, $cardinality, $sub_part,
- $Packed, $comment
- )
- = $sth->fetchrow
- )
-{
- if ( $key_name eq 'PRIMARY' ) {
- $exists = 1;
}
}
-print "Creating index on issuing rules\n" unless $exists or $silent;
-$dbh->do(
-'ALTER TABLE issuingrules ADD PRIMARY KEY ( branchcode, categorycode, itemtype
)'
- )
- unless $exists;
-
-$dbh->do('ALTER TABLE marc_tag_structure drop primary key');
-$dbh->do(
- 'ALTER TABLE marc_tag_structure ADD PRIMARY KEY ( frameworkcode, tagfield
)'
-);
-
-$dbh->do('ALTER TABLE marc_subfield_structure drop primary key');
-$dbh->do(
-'ALTER TABLE marc_subfield_structure ADD PRIMARY KEY ( frameworkcode,
tagfield, tagsubfield )'
-);
-
-$dbh->do(
-"alter table marc_subfield_table change tagorder tagorder int not null default
'1'"
-);
-
-# Get list of columns from marc_word table
-my %marc_word;
-my %nullenabled;
-$sth = $dbh->prepare("show columns from marc_word");
-$sth->execute;
-while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
-{
- $marc_word{$column} = $type;
- $nullenabled{$column} = $null;
-}
-if ( $marc_word{subfieldid} ) {
-
- #create field tagsubfield, copy tag+subfieldid, then drop tag and
subfieldid
- print "Modifying marc_word (concat on tag and subfield for better perfs)\n"
- unless $silent;
- $dbh->do(
-"ALTER TABLE `marc_word` ADD `tagsubfield` CHAR( 4 ) NOT NULL AFTER `bibid`"
- );
- $dbh->do("update marc_word set tagsubfield=concat(tag,subfieldid)");
- $dbh->do("alter table marc_word drop tag");
- $dbh->do("alter table marc_word drop subfieldid");
- $dbh->do("create index Search_Marc on marc_word (tagsubfield,word)");
-}
->>>>>>> 1.100.2.46
# Populate tables with required data
# synch table and deletedtable.
@@ -2967,47 +1764,6 @@
}
}
-<<<<<<< updatedatabase
-=======
-# fill aqbasket if it's empty and aqorder is not
-# => it means it has just been created & must be filled
-$sth = $dbh->prepare("select count(*) from aqbasket");
-$sth->execute;
-if ( $sth->fetchrow == 0 ) {
- $sth = $dbh->prepare("select count(*) from aqorders");
- $sth->execute;
- if ( $sth->fetchrow > 0 ) {
- print "Populating new table aqbasket\n";
- print
-"IMPORTANT NOTE: error message \"Duplicate entry 'X' for key 1\" may appear.
it should not be a real trouble\n";
- $sth =
- $dbh->prepare(
-"select distinct
basketno,booksellerid,authorisedby,entrydate,booksellerinvoicenumber from
aqorders"
- );
- $sth->execute;
- my ( $basketno, $booksellerid, $authorisedby, $entrydate,
- $booksellerinvoicenumber );
- my $sth2 =
- $dbh->prepare(
-"insert into aqbasket
(basketno,creationdate,booksellerid,authorisedby,booksellerinvoicenumber)
values (?,?,?,?,?)"
- );
- while (
- (
- $basketno, $booksellerid,
- $authorisedby, $entrydate,
- $booksellerinvoicenumber
- )
- = $sth->fetchrow
- )
- {
- print
-"$basketno,$entrydate,$booksellerid,$authorisedby,$booksellerinvoicenumber\n";
- $sth2->execute( $basketno, $entrydate, $booksellerid,
$authorisedby,
- $booksellerinvoicenumber );
- }
- }
-}
->>>>>>> 1.100.2.46
foreach my $table ( keys %tabledata ) {
print "Checking for data required in table $table...\n" unless $silent;
my $tablerows = $tabledata{$table};
@@ -3020,7 +1776,6 @@
"select $uniquefieldrequired from $table where $uniquefieldrequired=?"
);
$sth->execute($uniquevalue);
-<<<<<<< updatedatabase
if ($sth->rows) {
foreach my $field (keys %$forceupdate) {
if ($forceupdate->{$field}) {
@@ -3195,42 +1950,6 @@
print "\r$totaldone / $totaltodo" unless ($totaldone % 100);
}
print "\rdone\n";
-=======
- if ( $sth->rows ) {
- foreach my $field ( keys %$forceupdate ) {
- if ( $forceupdate->{$field} ) {
- my $sth =
- $dbh->prepare(
-"update systempreferences set $field=? where $uniquefieldrequired=?"
- );
- $sth->execute( $row->{$field}, $uniquevalue );
- }
- }
- }
- else {
- print "Adding row to $table: " unless $silent;
- my @values;
- my $fieldlist;
- my $placeholders;
- foreach my $field ( keys %$row ) {
- next if $field eq 'uniquefieldrequired';
- next if $field eq 'forceupdate';
- my $value = $row->{$field};
- push @values, $value;
- print " $field => $value" unless $silent;
- $fieldlist .= "$field,";
- $placeholders .= "?,";
- }
- print "\n" unless $silent;
- $fieldlist =~ s/,$//;
- $placeholders =~ s/,$//;
- my $sth =
- $dbh->prepare(
- "insert into $table ($fieldlist) values ($placeholders)");
- $sth->execute(@values);
- }
- }
->>>>>>> 1.100.2.46
}
@@ -3258,7 +1977,6 @@
}
} # foreach
-<<<<<<< updatedatabase
# MOVE all tables TO UTF-8 and innoDB
$sth = $dbh->prepare("show table status");
@@ -3277,8 +1995,6 @@
}
}
-=======
->>>>>>> 1.100.2.46
$sth->finish;
#
@@ -3448,10 +2164,12 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.154 2006/07/17 12:28:45 toins
+# sync with rel_2_2
+#
# Revision 1.153 2006/07/04 14:36:52 toins
# Head & rel_2_2 merged
#
-<<<<<<< updatedatabase
# Revision 1.152 2006/06/27 09:26:37 btoumi
# modify (initials,phone ) fields property in borrowers and deletedborrowers
table
#
@@ -3525,141 +2243,6 @@
#
# Revision 1.136 2006/04/17 21:55:33 sushi
# Added 'labels' and 'labels_conf' tables, for spine lable tool.
-=======
-# Revision 1.100.2.46 2006/06/20 18:02:23 oleonard
-# Fixing two minor typos
-#
-# Revision 1.100.2.45 2006/06/13 12:34:15 hdl
-# Adding publication date to issues arrival. So that two dates can be used.
-#
-# Revision 1.100.2.44 2006/06/02 15:21:40 tipaul
-# moving dewey to a varchar
-#
-# Revision 1.100.2.43 2006/04/27 18:07:40 oleonard
-# Adding two new system preferences:
-#
-# 1. opacuserlogin shows/hides login-based features like reserves, private
shelves, and login forms. On by default.
-# 2. opacbookbag shows/hides the book bag (biblio basket). On by default.
-#
-# Revision 1.100.2.42 2006/04/22 13:52:12 oleonard
-# Adding opacheader and IntranetBiblioDefaultView system preferences
-#
-# Revision 1.100.2.41 2006/04/21 08:54:55 hdl
-# Adding two new sysprefs :
-# - z3950NormalizeAuthor of type YesNo. Set this to yes if you want author
field to be filled with authorities fields when importing biblio in z3950
-# - z3950AuthorAuthfields, free text : type in comma-separated list of fields
to search for author names for AuthorNormalization.
-#
-# Adding a feature on a Z3950 import.
-# You can now automatically fill author with person name authority contained
in the biblio if sysprefs are filled.
-#
-# Revision 1.100.2.40 2006/04/18 09:34:15 plg
-# bug fixed: typo fixed in labels and labels_conf tables creation query.
-#
-# Revision 1.100.2.39 2006/04/17 21:19:52 sushi
-# Added labels, and label_conf tables for spine labels tool.
-#
-# Revision 1.100.2.38 2006/04/05 14:58:04 kados
-# adding TemplateEncoding syspref: allows librarian to specify the
-# encoding to use on templates.
-#
-# Revision 1.100.2.37 2006/04/04 13:54:10 tipaul
-# advancedMARCeditor systempref management
-#
-# Revision 1.100.2.36 2006/03/18 22:55:26 kados
-# add syspref for the MARC Organization Code of the library
-#
-# Revision 1.100.2.35 2006/03/08 17:50:55 kados
-# Modifying patronimages: now it can be used to specify the file extension
-# of the images (to avoid hard-codeing in templates).
-#
-# Revision 1.100.2.34 2006/03/08 13:28:23 tipaul
-# changing the size of some new systempref to a bloc (more convenient)
-#
-# Revision 1.100.2.33 2006/03/04 06:05:13 kados
-# New syspref: AnonSuggestions to allow an anonymous patron to make a
-# suggestion (requested by NPL). To enable, set to the borrowernumber
-# of the anonymous patron (must be created).
-#
-# Revision 1.100.2.32 2006/03/03 16:20:23 kados
-# hopefully fixes truncated amazon.com links in syspref
-# ----------------------------------------------------------------------
-#
-# Revision 1.100.2.31 2006/03/01 21:44:16 kados
-# Adds 'opacreadinghistory' syspref for turning this on/off for libraries
-# who are scared of their government (ie, in countries where there a
-# patriot act) :-)
-#
-# Revision 1.100.2.30 2006/03/01 15:52:13 kados
-# Whoops ... should have checked, that name is already used. Changed it to
-# opaclanguagesdisplay.
-#
-# Revision 1.100.2.29 2006/03/01 15:51:28 kados
-# adds opaclanguages syspref, which allows turning on/off the display of
-# the languages pref on OPAC (default is on)
-#
-# Revision 1.100.2.28 2006/03/01 15:38:53 kados
-# Adding patronimages syspref. Adding opaclayoutstylesheet. Some explainations
-# are in order:
-#
-# Right now there are three stylesheet sysprefs:
-#
-# opacstylesheet - an external stylesheet specified by URL (replaces all other
-# stylesheets)
-#
-# opaccolorstylesheet - local stylesheet specified by filename
-# opaclayoutstylesheet - local stylesheet specified by filename
-#
-# Revision 1.100.2.27 2006/02/27 15:40:32 tipaul
-# setting serialadditems systempreference to 0 by default : no behaviour
change when upgrading Koha
-#
-# Revision 1.100.2.26 2006/02/23 03:19:48 kados
-# Adds the 'sortbynonfiling' systempref. With this enabled, Koha will
-# correctly sort title searches according to the nonfiling characters
-# in the MARC records.
-#
-# Revision 1.100.2.25 2006/02/21 20:00:13 kados
-# setting default value for LabelMARCView to 'standard'
-# ----------------------------------------------------------------------
-#
-# Revision 1.100.2.24 2006/02/21 18:40:08 kados
-# Adding LabeledMARCView systempref to choose whether tags are displayed
-# in standard or economical format. Later, this can be used to display
-# 'strict' format with no labels for insane librarians who want that.
-#
-# Revision 1.100.2.23 2006/02/07 15:33:35 hdl
-# Adding a new system preference : serialsadditem
-#
-# Adding two functions in Biblio.pm : getitemlocation and getitemstatus
(helpful to get location list and status list, status is supposed to be in
relation with items.notforloan)
-#
-# Adding a new function in Bull.pm : serialsitemize which take serial id and
item information and creates the item
-# Modifying statecollection to add a new line (used for data input)
-#
-# Revision 1.100.2.22 2006/02/05 21:53:54 kados
-# Adds database support for IntranetNav systempref -- used to add HTML
-# tags to left-hand navigation menu on Intranet.
-# ----------------------------------------------------------------------
-#
-# Revision 1.100.2.21 2006/02/04 18:17:00 kados
-# Adds opaccolorstylesheet, intranetstylesheet, intranetcolorstylesheet
-# to systemprefs.
-#
-# Revision 1.100.2.20 2006/02/04 05:16:40 kados
-# Allows putting credits at bottom of OPAC page
-#
-# Revision 1.100.2.19 2006/02/04 01:44:59 kados
-# Adds Fully Preferences-based Amazon.com feature. See mail to koha-devel
-# for details.
-#
-# Revision 1.100.2.18 2006/02/03 23:12:23 kados
-# Adds system prefs for using Amazon.com content in the OPAC
-#
-# Revision 1.100.2.17 2006/02/03 20:55:16 kados
-# Adding a new system preference: OpacNav. Can be used to add HTML
-# navigation links to the left-hand navbar in the OPAC.
-#
-# Revision 1.100.2.16 2005/12/30 11:13:29 tipaul
-# * tool to synchronise TABLE and deletedTABLE structures in updatedatabase
->>>>>>> 1.100.2.46
#
# Revision 1.135 2006/04/15 02:37:03 tgarip1957
# Marc record should be set to UTF-8 in leader.Force it.
- [Koha-cvs] koha/updater updatedatabase,
Antoine Farnault <=