6 # This script checks for required updates to the database.
8 # Part of the Koha Library Software www.koha.org
9 # Licensed under the GPL.
12 # - Would also be a good idea to offer to do a backup at this time...
14 # NOTE: If you do something more than once in here, make it table driven.
22 use C4::Context("/etc/koha.conf.tmp");
24 # FIXME - /etc/koha.conf might not exist, so shouldn't use
27 # FIXME - The user might be installing a new database, so can't rely
28 # on /etc/koha.conf anyway.
35 %existingtables, # tables already in database
39 $type, $null, $key, $default, $extra,
40 $prefitem, # preference item in systempreferences table
43 my $dbh = C4::Context->dbh;
48 # Tables to add if they don't exist
50 shelfcontents => "( shelfnumber int not null,
51 itemnumber int not null,
53 bookshelf => "( shelfnumber int auto_increment primary key,
54 shelfname char(255))",
55 z3950queue => "( id int auto_increment primary key,
64 identifier char(30))",
65 z3950results => "( id int auto_increment primary key,
75 branchrelations => "( branchcode varchar(4),
76 categorycode varchar(4))",
77 websites => "( websitenumber int(11) NOT NULL auto_increment,
78 biblionumber int(11) NOT NULL default '0',
82 PRIMARY KEY (websitenumber) )",
83 marcrecorddone => "( isbn char(40),
86 controlnumber char(40))",
87 uploadedmarc => "( id int(11) NOT NULL auto_increment PRIMARY KEY,
89 hidden smallint(6) default NULL,
90 name varchar(255) default NULL)",
91 ethnicity => "( code varchar(10) NOT NULL default '',
92 name varchar(255) default NULL,
93 PRIMARY KEY (code) )",
94 sessions => "( sessionID varchar(255) NOT NULL default '',
95 userid varchar(255) default NULL,
96 ip varchar(16) default NULL,
98 PRIMARY KEY (sessionID) )",
99 sessionqueries => "( sessionID varchar(255) NOT NULL default '',
100 userid char(100) NOT NULL default '',
101 ip char(18) NOT NULL default '',
102 url text NOT NULL default '' )",
103 bibliothesaurus => "( id bigint(20) NOT NULL auto_increment,
104 freelib char(255) NOT NULL default '',
105 stdlib char(255) NOT NULL default '',
106 category char(10) NOT NULL default '',
107 level tinyint(4) NOT NULL default '1',
108 hierarchy char(80) NOT NULL default '',
109 father bigint(20) NOT NULL default '',
111 KEY freelib (freelib),
113 KEY category (category),
114 KEY hierarchy (hierarchy)
117 bibid bigint(20) unsigned NOT NULL auto_increment,
118 biblionumber int(11) NOT NULL default '0',
119 datecreated date NOT NULL default '0000-00-00',
120 datemodified date default NULL,
121 origincode char(20) default NULL,
123 KEY origincode (origincode),
124 KEY biblionumber (biblionumber)
126 marc_blob_subfield => "(
127 blobidlink bigint(20) NOT NULL auto_increment,
128 subfieldvalue longtext NOT NULL,
129 PRIMARY KEY (blobidlink)
131 marc_subfield_structure => "(
132 tagfield char(3) NOT NULL default '',
133 tagsubfield char(1) NOT NULL default '',
134 liblibrarian char(255) NOT NULL default '',
135 libopac char(255) NOT NULL default '',
136 repeatable tinyint(4) NOT NULL default '0',
137 mandatory tinyint(4) NOT NULL default '0',
138 kohafield char(40) default NULL,
139 tab tinyint(1) default NULL,
140 authorised_value char(10) default NULL,
141 thesaurus_category char(10) default NULL,
142 value_builder char(80) default NULL,
143 PRIMARY KEY (tagfield,tagsubfield),
144 KEY kohafield (kohafield),
147 marc_subfield_table => "(
148 subfieldid bigint(20) unsigned NOT NULL auto_increment,
149 bibid bigint(20) unsigned NOT NULL default '0',
150 tag char(3) NOT NULL default '',
151 tagorder tinyint(4) NOT NULL default '1',
152 tag_indicator char(2) NOT NULL default '',
153 subfieldcode char(1) NOT NULL default '',
154 subfieldorder tinyint(4) NOT NULL default '1',
155 subfieldvalue varchar(255) default NULL,
156 valuebloblink bigint(20) default NULL,
157 PRIMARY KEY (subfieldid),
160 KEY tag_indicator (tag_indicator),
161 KEY subfieldorder (subfieldorder),
162 KEY subfieldcode (subfieldcode),
163 KEY subfieldvalue (subfieldvalue),
164 KEY tagorder (tagorder)
166 marc_tag_structure => "(
167 tagfield char(3) NOT NULL default '',
168 liblibrarian char(255) NOT NULL default '',
169 libopac char(255) NOT NULL default '',
170 repeatable tinyint(4) NOT NULL default '0',
171 mandatory tinyint(4) NOT NULL default '0',
172 authorised_value char(10) default NULL,
173 PRIMARY KEY (tagfield)
176 bibid bigint(20) NOT NULL default '0',
177 tag char(3) NOT NULL default '',
178 tagorder tinyint(4) NOT NULL default '1',
179 subfieldid char(1) NOT NULL default '',
180 subfieldorder tinyint(4) NOT NULL default '1',
181 word varchar(255) NOT NULL default '',
182 sndx_word varchar(255) NOT NULL default '',
185 KEY tagorder (tagorder),
186 KEY subfieldid (subfieldid),
187 KEY subfieldorder (subfieldorder),
189 KEY sndx_word (sndx_word)
191 marc_breeding => "( id bigint(20) NOT NULL auto_increment,
192 file varchar(80) NOT NULL default '',
193 isbn varchar(10) NOT NULL default '',
194 title varchar(128) default NULL,
195 author varchar(80) default NULL,
197 encoding varchar(40) default NULL,
202 authorised_values => "(id int(11) NOT NULL auto_increment,
203 category char(10) NOT NULL default '',
204 authorised_value char(80) NOT NULL default '',
209 userflags => "( bit int(11) NOT NULL default '0',
210 flag char(30), flagdesc char(255),
215 my %requirefields = (
216 biblio => { 'abstract' => 'text' },
217 deletedbiblio => { 'abstract' => 'text' },
219 'lccn' => 'char(25)',
220 'url' => 'varchar(255)',
223 deletedbiblioitems => {
224 'lccn' => 'char(25)',
225 'url' => 'varchar(255)',
228 branchtransfers => { 'datearrived' => 'datetime' },
229 statistics => { 'borrowernumber' => 'int(11)' },
231 'invoicedisc' => 'float(6,4)',
232 'nocalc' => 'int(11)'
235 'userid' => 'char(30)',
236 'password' => 'char(30)',
237 'flags' => 'int(11)',
238 'textmessaging' => 'varchar(30)'
240 aqorders => { 'budgetdate' => 'date' },
242 #added so that reference items are not available for reserves...
243 itemtypes => { 'notforloan' => 'smallint(6)' },
244 systempreferences => { 'explanation' => 'char(80)' },
245 z3950servers => { 'syntax' => 'char(80)' },
248 my %dropable_table = (
249 classification => 'classification',
250 multipart => 'multipart',
251 multivolume => 'multivolume',
252 newitems => 'newitems',
253 procedures => 'procedures',
254 publisher => 'publisher',
255 searchstats => 'searchstats',
256 serialissues => 'serialissues',
259 # The tabledata hash contains data that should be in the tables.
260 # The uniquefieldrequired hash entry is used to determine which (if any) fields
261 # must not exist in the table for this row to be inserted. If the
262 # uniquefieldrequired entry is already in the table, the existing data is not
268 uniquefieldrequired => 'bit',
270 flag => 'superlibrarian',
271 flagdesc => 'Access to all librarian functions',
275 uniquefieldrequired => 'bit',
278 flagdesc => 'Circulate books',
282 uniquefieldrequired => 'bit',
285 flagdesc => 'View Catalogue (Librarian Interface)',
289 uniquefieldrequired => 'bit',
291 flag => 'parameters',
292 flagdesc => 'Set Koha system paramters',
296 uniquefieldrequired => 'bit',
299 flagdesc => 'Add or modify borrowers',
303 uniquefieldrequired => 'bit',
305 flag => 'permissions',
306 flagdesc => 'Set user permissions',
310 uniquefieldrequired => 'bit',
312 flag => 'reserveforothers',
313 flagdesc => 'Reserve books for patrons',
317 uniquefieldrequired => 'bit',
320 flagdesc => 'Borrow books',
324 uniquefieldrequired => 'bit',
326 flag => 'reserveforself',
327 flagdesc => 'Reserve books for self',
331 uniquefieldrequired => 'bit',
333 flag => 'editcatalogue',
334 flagdesc => 'Edit Catalogue (Modify bibliographic/holdings data)',
338 uniquefieldrequired => 'bit',
340 flag => 'updatecharges',
341 flagdesc => 'Update borrower charges',
345 systempreferences => [
347 uniquefieldrequired => 'variable',
348 variable => 'autoMemberNum',
350 explanation => '1 or 0. If 1, Member number is auto-calculated'
353 uniquefieldrequired => 'variable',
354 variable => 'acquisitions',
357 'normal or simple : whether to use "acqui" or "acqui.simple" acquisition system'
360 uniquefieldrequired => 'variable',
361 variable => 'dateformat',
363 explanation => 'metric, us, or iso'
366 uniquefieldrequired => 'variable',
367 variable => 'template',
369 explanation => 'template default name'
372 uniquefieldrequired => 'variable',
373 variable => 'autoBarcode',
375 explanation => '1 or 0. If 1, Barcode is auto-calculated'
378 uniquefieldrequired => 'variable',
379 variable => 'insecure',
382 'if YES, no auth at all is needed. Be careful if you set this to yes !'
385 uniquefieldrequired => 'variable',
386 variable => 'authoritysep',
389 'the separator used in authority/thesaurus. Usually --'
392 uniquefieldrequired => 'variable',
393 variable => 'opaclanguages',
395 explanation => 'languages'
398 uniquefieldrequired => 'variable',
399 variable => 'opacthemes',
401 explanation => 'theme'
404 uniquefieldrequired => 'variable',
405 variable => 'timeout',
407 explanation => 'login timeout'
410 uniquefieldrequired => 'variable',
413 explanation => 'MARC support (ON or OFF)'
416 uniquefieldrequired => 'variable',
417 variable => 'marcflavour',
420 'your MARC flavor (MARC21 or UNIMARC) used for character encoding'
423 uniquefieldrequired => 'variable',
424 variable => 'checkdigit',
427 'none= no check on member cardnumber. katipo= katipo check'
430 uniquefieldrequired => 'variable',
431 variable => 'dateformat',
434 'date format (US mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd) '
437 uniquefieldrequired => 'variable',
438 variable => 'maxoutstanding',
441 'maximum amount withstanding to be able make reserves '
444 uniquefieldrequired => 'variable',
445 variable => 'maxreserves',
448 'maximum number of reserves a member can make '
451 uniquefieldrequired => 'variable',
452 variable => 'KohaAdminEmailAddress',
453 value => 'your.mail@here',
454 explanation => 'the email adress where borrowers modifs are sent'
460 my %fielddefinitions = (
463 field => 'printername',
472 field => 'bookfundid',
486 extra => 'auto_increment'
496 # Get version of MySQL database engine.
497 my $mysqlversion = `mysqld --version`;
498 $mysqlversion =~ /Ver (\S*) /;
500 if ( $mysqlversion ge '3.23' ) {
501 print "Could convert to MyISAM database tables...\n";
504 #---------------------------------
507 # Collect all tables into a list
508 $sth = $dbh->prepare("show tables");
510 while ( my ($table) = $sth->fetchrow ) {
511 $existingtables{$table} = 1;
514 # Now add any missing tables
515 foreach $table ( keys %requiretables ) {
516 print "Checking $table table...\n" if $debug;
517 unless ( $existingtables{$table} ) {
518 print "Adding $table table...\n";
519 my $sth = $dbh->prepare("create table $table $requiretables{$table}");
522 print "Error : $sth->errstr \n";
528 # now drop useless tables
529 foreach $table ( keys %dropable_table ) {
530 print "Dropping unused tables...\n" if $debug;
531 if ( $existingtables{$table} ) {
532 $dbh->do("drop table $table");
534 print "Error : $dbh->errstr \n";
538 unless ( $existingtables{'z3950servers'} ) {
539 print "Adding z3950servers table...\n";
540 my $sti = $dbh->prepare( "create table z3950servers (
552 $sti = $dbh->prepare( "insert into z3950servers
553 values ('z3950.loc.gov',
557 'Library of Congress',
563 #---------------------------------
566 foreach $table ( keys %requirefields ) {
567 print "Check table $table\n" if $debug;
568 $sth = $dbh->prepare("show columns from $table");
571 while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
573 $types{$column} = $type;
575 foreach $column ( keys %{ $requirefields{$table} } ) {
576 print " Check column $column\n" if $debug;
577 if ( !$types{$column} ) {
579 # column doesn't exist
580 print "Adding $column field to $table table...\n";
581 $query = "alter table $table
582 add column $column " . $requirefields{$table}->{$column};
583 print "Execute: $query\n" if $debug;
584 my $sti = $dbh->prepare($query);
587 print "**Error : $sti->errstr \n";
594 foreach $table ( keys %fielddefinitions ) {
595 print "Check table $table\n" if $debug;
596 $sth = $dbh->prepare("show columns from $table");
599 while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
601 $definitions->{$column}->{type} = $type;
602 $definitions->{$column}->{null} = $null;
603 $definitions->{$column}->{key} = $key;
604 $definitions->{$column}->{default} = $default;
605 $definitions->{$column}->{extra} = $extra;
607 my $fieldrow = $fielddefinitions{$table};
608 foreach my $row (@$fieldrow) {
609 my $field = $row->{field};
610 my $type = $row->{type};
611 my $null = $row->{null};
612 my $key = $row->{key};
613 my $default = $row->{default};
614 my $extra = $row->{extra};
615 my $def = $definitions->{$field};
616 unless ( $type eq $def->{type}
617 && $null eq $def->{null}
618 && $key eq $def->{key}
619 && $default eq $def->{default}
620 && $extra eq $def->{extra} )
626 if ( $key eq 'PRI' ) {
627 $key = 'PRIMARY KEY';
629 unless ( $extra eq 'auto_increment' ) {
634 "alter table $table change $field $field $type $null $key $extra default ?"
636 $sth->execute($default);
637 print " Alter $field in $table\n";
642 # Get list of columns from items table
645 $sth = $dbh->prepare("show columns from items");
647 while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
649 $itemtypes{$column} = $type;
652 unless ( $itemtypes{'barcode'} eq 'varchar(20)' ) {
653 $itemtypes{'barcode'} =~ /varchar\((\d+)\)/;
655 if ( $oldlength < 20 ) {
656 print "Setting maximum barcode length to 20 (was $oldlength).\n";
659 "alter table items change barcode barcode varchar(20) not null");
664 # extending the timestamp in branchtransfers...
667 $sth = $dbh->prepare("show columns from branchtransfers");
669 while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
671 $branchtransfers{$column} = $type;
674 unless ( $branchtransfers{'datesent'} eq 'datetime' ) {
675 print "Setting type of datesent in branchtransfers to datetime.\n";
678 "alter table branchtransfers change datesent datesent datetime");
682 unless ( $branchtransfers{'datearrived'} eq 'datetime' ) {
683 print "Setting type of datearrived in branchtransfers to datetime.\n";
686 "alter table branchtransfers change datearrived datearrived datetime");
690 # changing the branchcategories table around...
691 my %branchcategories;
693 $sth = $dbh->prepare("show columns from branchcategories");
695 while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
697 $branchcategories{$column} = $type;
700 unless ( $branchcategories{'categorycode'} eq 'varchar(4)' ) {
702 "Setting type of categorycode in branchcategories to varchar(4),\n and making the primary key.\n";
705 "alter table branchcategories change categorycode categorycode varchar(4) not null"
710 "alter table branchcategories add primary key (categorycode)");
714 unless ( $branchcategories{'categoryname'} eq 'text' ) {
715 print "Changing branchcode in branchcategories to categoryname text.\n";
718 "alter table branchcategories change branchcode categoryname text");
722 unless ( $branchcategories{'codedescription'} eq 'text' ) {
724 "Replacing branchholding in branchcategories with codedescription text.\n";
727 "alter table branchcategories change branchholding codedescription text"
732 # Populate tables with required data
734 foreach my $table ( keys %tabledata ) {
735 print "Checking for data required in table $table...\n";
736 my $tablerows = $tabledata{$table};
737 foreach my $row (@$tablerows) {
738 my $uniquefieldrequired = $row->{uniquefieldrequired};
739 my $uniquevalue = $row->{$uniquefieldrequired};
742 "select $uniquefieldrequired from $table where $uniquefieldrequired=?"
744 $sth->execute($uniquevalue);
745 unless ( $sth->rows ) {
746 print "Adding row to $table: ";
750 foreach my $field ( keys %$row ) {
751 (next) if ( $field eq 'uniquefieldrequired' );
752 my $value = $row->{$field};
753 push @values, $value;
754 print " $field => $value";
755 $fieldlist .= "$field,";
756 $placeholders .= "?,";
759 $fieldlist =~ s/,$//;
760 $placeholders =~ s/,$//;
763 "insert into $table ($fieldlist) values ($placeholders)");
764 $sth->execute(@values);
774 # Revision 1.45 2003/05/08 12:26:16 wolfpac444
777 # Revision 1.44 2003/05/03 05:39:57 rangi
779 # (Wording changes in the explanation fields in system preferences)
781 # Revision 1.43 2003/05/02 23:01:09 rangi
782 # Adding the textmessaging column to the borrowers table.
783 # insertdata.pl is expecting this to exist, and hence modifying/adding
784 # borrowers was broken.
786 # Also ran they script thru perltidy
788 # Revision 1.42 2003/04/29 16:53:25 tipaul
789 # really proud of this commit :-)
790 # z3950 search and import seems to works fine.
791 # Let me explain how :
792 # * a "search z3950" button is added in the addbiblio template.
793 # * when clicked, a popup appears and z3950/search.pl is called
794 # * z3950/search.pl calls addz3950search in the DB
795 # * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table.
796 # * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending.
797 # * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled
800 # * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support.
801 # * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup.
803 # Revision 1.41 2003/04/29 08:09:44 tipaul
804 # z3950 support is coming...
805 # * adding a syntax column in z3950 table = this column will say wether the z3950 must be called with PerferedRecordsyntax => USMARC or PerferedRecordsyntax => UNIMARC. I tried some french UNIMARC z3950 servers, and some only send USMARC, some only UNIMARC, some can answer with both.
806 # Note this is a 1st draft. More to follow (today ? I hope).
808 # Revision 1.40 2003/04/22 10:48:27 wolfpac444
809 # Added "father" column to bibliothesaurus table
811 # Revision 1.39 2003/04/04 08:45:00 tipaul
812 # last commits before 1.9.1
814 # Revision 1.38 2003/03/18 10:58:19 tipaul
815 # adding checkdigit parameter that choose how to check the members cardnumber.
817 # * none = no checking
818 # * katipo = checked as before
820 # Revision 1.37 2003/01/30 01:47:48 acli
821 # Corrected syntax error reported by Benedict
823 # Made the indentation somewhat easier to read; the messiness probably caused
824 # the original syntax error.
826 # Revision 1.36 2003/01/28 15:13:30 tipaul
827 # userflag table now created in upgrade script (bugfix #171)
829 # Revision 1.35 2003/01/27 03:12:49 acli
830 # Reworded the description for "acquisitions" to make it fit on the screen
832 # Added "iso" to dateformat, since dateformat is not yet being used anyway
834 # Revision 1.34 2003/01/23 12:30:02 tipaul
835 # introducint marcflavour in systempref file : used for character decoding
837 # Revision 1.33 2003/01/21 09:03:27 tipaul
838 # bugfix (NOTE : this bugs makes installation of the 1.3.3 a little fuzzy. Please fix your DB if you installed 1.3.3)
840 # Revision 1.32 2003/01/16 10:29:45 tipaul
841 # adding a MARC parameter in systempref ( which is ON or OFF)
842 # the search will be a marc search if MARC=ON
843 # and a standard (v1.2) search if MARC=OFF
845 # Revision 1.31 2003/01/06 13:32:43 tipaul
846 # *** empty log message ***
848 # Revision 1.29 2003/01/06 11:14:11 tipaul
849 # last bugfixes before 1.3.3 : systempref table correctly filled
851 # Revision 1.28 2002/12/10 13:27:47 tipaul
852 # bugfixes (davide mails in koha-dev)
854 # Revision 1.27 2002/11/26 15:04:54 tipaul
855 # road to 1.3.2. Updating db structure during installation
857 # Revision 1.26 2002/11/12 17:42:40 tonnesen
858 # Merged some features over from rel-1-2, including primary key checking.
860 # Revision 1.25 2002/11/12 16:44:38 tipaul
863 # * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance)
865 # Revision 1.24 2002/10/30 14:00:23 arensb
866 # (bug fix): Fixed typo.
868 # Revision 1.23 2002/10/25 10:55:46 tipaul
870 # * bugfixes and improvements
871 # * manage mandatory MARC subfields
872 # * new table : authorised_values. this table contains categories and authorised values for the category. On MARC management, you can map a subfield to a authorised_values category. If you do this, the subfield can only be filled with a authorised_value of the selected category.
873 # this submit contains everything needed :
876 # * "links" management
877 # * creation of a html-list if a subfield is mapped to an authorised value.
879 # Note this is different from authorities support, which will come soon.
880 # The authorised_values is supposed to contains a "small" number of authorised values for a category (less than 50-100). If you enter more authorised values than this, it should be hard to find what you want in a BIG list...
882 # Revision 1.22 2002/10/15 10:08:19 tipaul
883 # fixme corrected, re-indent and adding the marc_breeding table (see commit of marcimport.pl for more explanations about breeding)
885 # Revision 1.21 2002/10/14 11:48:59 tipaul
888 # Revision 1.20 2002/10/10 04:49:41 arensb
889 # Added some FIXME comments.
891 # Revision 1.19 2002/10/05 10:17:17 arensb
892 # Merged with arensb-context branch: use C4::Context->dbh instead of
893 # &C4Connect, and generally prefer C4::Context over C4::Database.
895 # Revision 1.18.2.2 2002/10/05 06:18:43 arensb
896 # Added a whole mess of FIXME comments.
898 # Revision 1.18.2.1 2002/10/04 02:46:00 arensb
899 # Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
902 # Revision 1.18 2002/09/24 13:50:55 tipaul
903 # long WAS the road to 1.3.0...
904 # coming VERY SOON NOW...
905 # modifying installer and buildrelease to update the DB
907 # Revision 1.17 2002/09/24 12:57:35 tipaul
908 # long WAS the road to 1.3.0...
909 # coming VERY SOON NOW...
910 # modifying installer and buildrelease to update the DB
912 # Revision 1.16 2002/07/31 02:34:27 finlayt
914 # added "notforloan" field to the itemtypes table.
916 # Revision 1.15 2002/07/20 22:30:06 rangi
917 # Making sure fix makes it into the main branch as well
920 # Revision 1.14 2002/07/08 16:20:26 tonnesen
921 # Added sessionqueries table and password/userid fields to borrowers table
923 # Revision 1.13 2002/07/04 18:05:36 tonnesen
926 # Revision 1.12 2002/07/04 16:41:06 tonnesen
927 # Merged changes from rel-1-2. Abstracted table structure changes by alan.