koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha authorities/detail.pl C4/AuthoritiesMarc.p... [hdl_auth]


From: Henri-Damien LAURENT
Subject: [Koha-cvs] koha authorities/detail.pl C4/AuthoritiesMarc.p... [hdl_auth]
Date: Thu, 01 Jun 2006 08:58:20 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         hdl_auth
Changes by:     Henri-Damien LAURENT <address@hidden>   06/06/01 08:58:20

Modified files:
        authorities    : detail.pl 
        C4             : AuthoritiesMarc.pm Context.pm 
        koha-tmpl/intranet-tmpl/default/en/authorities: detail.tmpl 
        updater        : updatedatabase 

Log message:
        Building Authority trees with Unimarc Record.
        One new field :
        authtrees in authheader
        one new syspref : AuthDisplayHierarchy to display trees or not.
        Some new functions in AuthoritiesMARC:
        BuildMarcHierarchies($authid,$force) that Builds trees and save them to 
authtrees.
        BuildMarcHierarchy($record,$classname) which builds the string for HTML 
presentation.  (Maybe SHould just build the loops for Templates).
        AUTHgetheader($authid) gets the header data for an authid
        AUTHsavetrees($authid, $trees) save the trees commaseparated authid. 
Trees are separated by ;
        e.g. : 394,327,330;16965,17374,14584,13410,13287,327,330
        
        A modification has been done on authsearch so that it may search in ANY 
authtypecode.
        
        detail.pl and tmpl has been modified to use these commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/authorities/detail.pl.diff?only_with_tag=hdl_auth&tr1=1.2.2.4&tr2=1.2.2.4.4.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/AuthoritiesMarc.pm.diff?only_with_tag=hdl_auth&tr1=1.9.2.17.4.3&tr2=1.9.2.17.4.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Context.pm.diff?only_with_tag=hdl_auth&tr1=1.18.2.5&tr2=1.18.2.5.4.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl.diff?only_with_tag=hdl_auth&tr1=1.3.2.4&tr2=1.3.2.4.4.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/updater/updatedatabase.diff?only_with_tag=hdl_auth&tr1=1.100.2.43&tr2=1.100.2.43.4.1&r1=text&r2=text

Patches:
Index: koha/C4/AuthoritiesMarc.pm
diff -u koha/C4/AuthoritiesMarc.pm:1.9.2.17.4.3 
koha/C4/AuthoritiesMarc.pm:1.9.2.17.4.4
--- koha/C4/AuthoritiesMarc.pm:1.9.2.17.4.3     Mon May 22 15:45:11 2006
+++ koha/C4/AuthoritiesMarc.pm  Thu Jun  1 08:58:20 2006
@@ -55,6 +55,8 @@
        &BuildSummary
        &BuildUnimarcHierarchies
        &BuildUnimarcHierarchy
+    &AUTHsavetrees
+    &AUTHgetheader
  );
 
 sub authoritysearch {
@@ -69,8 +71,14 @@
        # the authtypecode. Then, search on $a of this tag_to_report
        # also store main entry MARC tag, to extract it at end of search
        my $mainentrytag;
-       my $sth = $dbh->prepare("select auth_tag_to_report from auth_types 
where authtypecode=?");
-       $sth->execute($authtypecode);
+       my $sth;
+    if ($authtypecode){
+      $sth= $dbh->prepare('select auth_tag_to_report from auth_types where 
authtypecode=?');
+      $sth->execute($authtypecode);
+    }else{
+      $sth= $dbh->prepare('select auth_tag_to_report from auth_types');
+      $sth->execute;
+    }
        my ($tag_to_report) = $sth->fetchrow;
        $mainentrytag = $tag_to_report;
        for (my $i=0;$i<$#{$tags};$i++) {
@@ -126,14 +134,25 @@
 
        my $sth;
 
-       if ($sql_where2) {
-               $sth = $dbh->prepare("select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and 
auth_header.authtypecode=? and $sql_where2 and ($sql_where1)");
-               warn "Q2 : select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and 
auth_header.authtypecode=? and $sql_where2 and ($sql_where1)";
-       } else {
-               $sth = $dbh->prepare("select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and 
auth_header.authtypecode=? and $sql_where1");
-               warn "Q : select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and 
auth_header.authtypecode=? and $sql_where1";
-       }
-       $sth->execute("$authtypecode");
+       if ($authtypecode){
+      if ($sql_where2) {
+          $sth = $dbh->prepare("select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and 
auth_header.authtypecode=? and $sql_where2 and ($sql_where1)");
+          warn "Q2 : select distinct m1.authid from auth_header,$sql_tables 
where  m1.authid=auth_header.authid and auth_header.authtypecode=? and 
$sql_where2 and ($sql_where1)";
+      } else {
+          $sth = $dbh->prepare("select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and 
auth_header.authtypecode=? and $sql_where1");
+          warn "Q : select distinct m1.authid from auth_header,$sql_tables 
where  m1.authid=auth_header.authid and auth_header.authtypecode=? and 
$sql_where1";
+      }
+      $sth->execute("$authtypecode");
+    } else {
+      if ($sql_where2) {
+          $sth = $dbh->prepare("select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and $sql_where2 and 
($sql_where1)");
+          warn "Q2 : select distinct m1.authid from auth_header,$sql_tables 
where  m1.authid=auth_header.authid  and $sql_where2 and ($sql_where1)";
+      } else {
+          $sth = $dbh->prepare("select distinct m1.authid from 
auth_header,$sql_tables where  m1.authid=auth_header.authid and $sql_where1");
+          warn "Q : select distinct m1.authid from auth_header,$sql_tables 
where  m1.authid=auth_header.authid and $sql_where1";
+      }
+      $sth->execute;
+    }
        my @result = ();
        while (my ($authid) = $sth->fetchrow) {
                        push @result,$authid;
@@ -1053,68 +1072,65 @@
        return $summary;
 }
 sub BuildUnimarcHierarchies{
-       my $authid = shift @_;
-       my $hierarchies =shift @_;
-       my @globalresult;
-       my $dbh=C4::Context->dbh;
+  my $authid = shift @_;
+  warn "authid : $authid";
+  my $force = shift @_;
+  my @globalresult;
+  my $dbh=C4::Context->dbh;
+  my $hierarchies;
+  my $data = AUTHgetheader($dbh,$authid);
+  
+  if ($data->{'authtrees'}){
+    $hierarchies.=$data->{'authtrees'};
+  } else {
        my $record = AUTHgetauthority($dbh,$authid);
        my $authtypecode = AUTHfind_authtypecode($dbh,$authid);
-       if (@$hierarchies){
-         foreach (@$hierarchies){
-           $_ = BuildUnimarcHierarchy($record)."\n$_";
-         }
-       } else {
-         push @$hierarchies,BuildUnimarcHierarchy($record);
-       }
-       my 
($result,$total)=authoritysearch($dbh,['5503','5505'],['and','and'],'',['=','='],[$authid,'h'],0,100,$authtypecode);
+    my $found;
+       my 
($result,$total)=authoritysearch($dbh,['5503','5505'],['and','and'],'',['=','='],[$authid,'h'],0,100);
        if ($total){
-        my $found;
-           foreach my $parentauthid (map { $_->{'authid'} } @$result){
-                 print "parentauthid :",$parentauthid,"\n";
-                 my $parentrecord = AUTHgetauthority($dbh,$parentauthid);
-#                print $parentrecord->as_formatted;
-#                foreach my $element (@$hierarchies){
-#              warn "element :".$element;
-#                }
-          #checking results
-          foreach my $field ($parentrecord->fields('550')){
-                   if (($field->subfield('3')) && ($field->subfield('3') eq 
$authid) && ($field->subfield('5')) && ($field->subfield('5') eq 'h')) {
-#                        print $parentauthid;
-#                        print $parentrecord->as_formatted;
-                         my $localresult=$hierarchies;
-                         foreach (@$localresult){
-                               print "element initial:".$_."\n";
-                         }
-                 BuildUnimarcHierarchies($parentauthid,$localresult);
-                         foreach (@$localresult){
-                               print "element final:".$_."\n";
-                         }
-                         @globalresult = (@globalresult,@$localresult);
-                         $found=1;
+         foreach my $parentauthid (map { $_->{'authid'} } @$result){
+               my $parentrecord = AUTHgetauthority($dbh,$parentauthid);
+               #checking results
+               foreach my $field ($parentrecord->field('550')){
+                 if (($field->subfield('3')) && ($field->subfield('3') eq 
$authid) && ($field->subfield('5')) && ($field->subfield('5') eq 'h')) {
+                       my $localresult=$hierarchies;
+                       my $trees;
+                       $trees = BuildUnimarcHierarchies($parentauthid);
+            my @trees;
+            if ($trees=~/;/){
+              @trees = split(/;/,$trees);
+            } else {
+              push @trees, $trees;
+            }
+                       foreach (@trees){
+                         $_.= ",$authid";
                        }
+                       @globalresult = (@globalresult,@trees);
                  }
-           }
+                 $found=1;
+               }
+         }
+      $hierarchies=join(";",@globalresult);
        }
-       address@hidden;
-#      @$hierarchies=[];
-#      foreach (@globalresult) {
-#       push @$hierarchies, $_;
-#      }
-#      return $hierarchies;
+       #Unless there is no ancestor, I am alone.
+       $hierarchies="$authid" unless ($hierarchies);
+  }
+  AUTHsavetrees($authid,$hierarchies) unless ($data->{authtrees} and $force);
+  return $hierarchies;
 }
+
 sub BuildUnimarcHierarchy{
        my $record = shift @_;
+    my $class = shift @_;
        my $authid=$record->subfield('250','3');
        my $parents=""; my $children="";
-       foreach my $field ($record->fields('550')){
+       foreach my $field ($record->field('550')){
                if ($field->subfield('5') && $field->subfield('a')){
                  if ($field->subfield('5') eq 'h'){
-#                        warn "5 eq h \n authid : $authid authid fils : 
".$field->subfield('3')." value:".$field->subfield('a');
-                         $children .= '<div 
id="'.$authid.$field->subfield('3').'c" class="child"> <a 
href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a').'</a></div>
+                         $children .= '<div name="'.$authid.'c" class="child"> 
<a 
href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a').'</a></div>
                          ';
                  }elsif ($field->subfield('5') eq 'g'){
-#                        warn "5 eq g \n authid : $authid authid fils : 
".$field->subfield('3')." value:".$field->subfield('a');
-                         $parents = '<div 
id="'.$authid.$field->subfield('3').'p" class="parent"> <a 
href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a').'</a></div>
+                         $parents = '<div name="'.$authid.'p" class="parent"> 
<a 
href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a').'</a></div>
                          '.$parents;
                  }
                }
@@ -1124,13 +1140,32 @@
          ($parents?
                $parents."<sup><a 
onclick=\"showParents('$authid')\">+</a></sup>":
                "").
-         '<a 
href="detail.pl?auhtid='.$authid.'">'.$record->field('250')->subfield('a').'</a>'.
+         '<a 
href="detail.pl?authid='.$authid.'">'.$record->subfield('250','a').'</a>'.
       ($children?"<sub><a onclick=\"showChildren('$authid')\">+</a></sub><br/>
                        ".$children:"");
-       $hierarchy='<div id="'.$authid.'" class="element">'.$hierarchy.'</div>';
+       $hierarchy='<div id="'.$authid.'" 
class="'.$class.'">'.$hierarchy.'</div>';
        return $hierarchy;
 }
 
+sub AUTHgetheader{
+       my $authid = shift @_;
+       my $sql= "SELECT * from auth_header WHERE authid = ?";
+       my $dbh=C4::Context->dbh;
+       my $rq= $dbh->prepare($sql);
+    $rq->execute($authid);
+       my $data= $rq->fetchrow_hashref;
+       return $data;
+}
+
+sub AUTHsavetrees{
+       my $authid = shift @_;
+       my $trees = shift @_;
+       my $sql= "UPDATE IGNORE auth_header set authtrees=? WHERE authid = ?";
+       my $dbh=C4::Context->dbh;
+       my $rq= $dbh->prepare($sql);
+    $rq->execute($trees,$authid);
+}
+
 END { }       # module clean-up code here (global destructor)
 
 =back
@@ -1143,8 +1178,24 @@
 
 =cut
 
-# $Id: AuthoritiesMarc.pm,v 1.9.2.17.4.3 2006/05/22 15:45:11 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.9.2.17.4.4 2006/06/01 08:58:20 hdl Exp $
 # $Log: AuthoritiesMarc.pm,v $
+# Revision 1.9.2.17.4.4  2006/06/01 08:58:20  hdl
+# Building Authority trees with Unimarc Record.
+# One new field :
+# authtrees in authheader
+# one new syspref : AuthDisplayHierarchy to display trees or not.
+# Some new functions in AuthoritiesMARC:
+# BuildMarcHierarchies($authid,$force) that Builds trees and save them to 
authtrees.
+# BuildMarcHierarchy($record,$classname) which builds the string for HTML 
presentation.  (Maybe SHould just build the loops for Templates).
+# AUTHgetheader($authid) gets the header data for an authid
+# AUTHsavetrees($authid, $trees) save the trees commaseparated authid. Trees 
are separated by ;
+# e.g. : 394,327,330;16965,17374,14584,13410,13287,327,330
+#
+# A modification has been done on authsearch so that it may search in ANY 
authtypecode.
+#
+# detail.pl and tmpl has been modified to use these commands.
+#
 # Revision 1.9.2.17.4.3  2006/05/22 15:45:11  hdl
 # Unstable code.
 # Should be worked upon.
Index: koha/C4/Context.pm
diff -u /dev/null koha/C4/Context.pm:1.18.2.5.4.1
--- /dev/null   Thu Jun  1 08:58:20 2006
+++ koha/C4/Context.pm  Thu Jun  1 08:58:20 2006
@@ -0,0 +1,719 @@
+# Copyright 2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+# $Id: Context.pm,v 1.18.2.5.4.1 2006/06/01 08:58:20 hdl Exp $
+# Revision History:
+# 2004-08-11 A. Tarallo: Added the function db_escheme2dbi, tested my bugfixes,
+# further  details about them in the code.
+# 2004-11-23 A. Tarallo, E. Silva: Bugfixes for running in a mod_perl 
environment.
+# Clean up of previous bugfixes, better documentation of what was done. 
+
+package C4::Context;
+use strict;
+use DBI;
+use C4::Boolean;
+
+use vars qw($VERSION $AUTOLOAD),
+       qw($context),
+       qw(@context_stack);
+
+$VERSION = do { my @v = '$Revision: 1.18.2.5.4.1 $' =~ /\d+/g;
+               shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
+
+=head1 NAME
+
+C4::Context - Maintain and manipulate the context of a Koha script
+
+=head1 SYNOPSIS
+
+  use C4::Context;
+
+  use C4::Context("/path/to/koha.conf");
+
+  $config_value = C4::Context->config("config_variable");
+  $db_handle = C4::Context->dbh;
+  $stopwordhash = C4::Context->stopwords;
+
+=head1 DESCRIPTION
+
+When a Koha script runs, it makes use of a certain number of things:
+configuration settings in F</etc/koha.conf>, a connection to the Koha
+database, and so forth. These things make up the I<context> in which
+the script runs.
+
+This module takes care of setting up the context for a script:
+figuring out which configuration file to load, and loading it, opening
+a connection to the right database, and so forth.
+
+Most scripts will only use one context. They can simply have
+
+  use C4::Context;
+
+at the top.
+
+Other scripts may need to use several contexts. For instance, if a
+library has two databases, one for a certain collection, and the other
+for everything else, it might be necessary for a script to use two
+different contexts to search both databases. Such scripts should use
+the C<&set_context> and C<&restore_context> functions, below.
+
+By default, C4::Context reads the configuration from
+F</etc/koha.conf>. This may be overridden by setting the C<$KOHA_CONF>
+environment variable to the pathname of a configuration file to use.
+
+=head1 METHODS
+
+=over 2
+
+=cut
+#'
+# In addition to what is said in the POD above, a Context object is a
+# reference-to-hash with the following fields:
+#
+# config
+#      A reference-to-hash whose keys and values are the
+#      configuration variables and values specified in the config
+#      file (/etc/koha.conf).
+# dbh
+#      A handle to the appropriate database for this context.
+# dbh_stack
+#      Used by &set_dbh and &restore_dbh to hold other database
+#      handles for this context.
+
+use constant CONFIG_FNAME => "/etc/koha.conf";
+                               # Default config file, if none is specified
+
+$context = undef;              # Initially, no context is set
address@hidden = ();            # Initially, no saved contexts
+
+# read_config_file
+# Reads the specified Koha config file. Returns a reference-to-hash
+# whose keys are the configuration variables, and whose values are the
+# configuration values (duh).
+# Returns undef in case of error.
+#
+# Revision History:
+# 2004-08-10 A. Tarallo: Added code that checks if a variable is already
+# assigned and prints a message, otherwise create a new entry in the hash to
+# be returned. 
+# Also added code that complaints if finds a line that isn't a variable 
+# assignmet and skips the line.
+# Added a quick hack that makes the translation between the db_schema
+# and the DBI driver for that schema.
+#
+sub read_config_file
+{
+       my $fname = shift;      # Config file to read
+       my $retval = {};        # Return value: ref-to-hash holding the
+                               # configuration
+
+       open (CONF, $fname) or return undef;
+
+       while (<CONF>)
+       {
+               my $var;                # Variable name
+               my $value;              # Variable value
+
+               chomp;
+               s/#.*//;                # Strip comments
+               next if /^\s*$/;        # Ignore blank lines
+
+               # Look for a line of the form
+               #       var = value
+               if (!/^\s*(\w+)\s*=\s*(.*?)\s*$/)
+               {
+                       print STDERR 
+                               "$_ isn't a variable assignment, skipping it";
+                       next;
+               }
+
+               # Found a variable assignment
+               if ( exists $retval->{$1} )
+               {
+                       print STDERR "$var was already defined, ignoring\n";
+               }else{
+               # Quick hack for allowing databases name in full text
+                       if ( $1 eq "db_scheme" )
+                       {
+                               $value = db_scheme2dbi($2);
+                       }else {
+                               $value = $2;
+                       }
+                        $retval->{$1} = $value;
+               }
+       }
+       close CONF;
+
+       return $retval;
+}
+
+# db_scheme2dbi
+# Translates the full text name of a database into de appropiate dbi name
+# 
+sub db_scheme2dbi
+{
+       my $name = shift;
+
+       for ($name) {
+# FIXME - Should have other databases. 
+               if (/mysql/i) { return("mysql"); }
+               if (/Postgres|Pg|PostgresSQL/) { return("Pg"); }
+               if (/oracle/i) { return("Oracle"); }
+       }
+       return undef;           # Just in case
+}
+
+sub import
+{
+       my $package = shift;
+       my $conf_fname = shift;         # Config file name
+       my $context;
+
+       # Create a new context from the given config file name, if
+       # any, then set it as the current context.
+       $context = new C4::Context($conf_fname);
+       return undef if !defined($context);
+       $context->set_context;
+}
+
+=item new
+
+  $context = new C4::Context;
+  $context = new C4::Context("/path/to/koha.conf");
+
+Allocates a new context. Initializes the context from the specified
+file, which defaults to either the file given by the C<$KOHA_CONF>
+environment variable, or F</etc/koha.conf>.
+
+C<&new> does not set this context as the new default context; for
+that, use C<&set_context>.
+
+=cut
+#'
+# Revision History:
+# 2004-08-10 A. Tarallo: Added check if the conf file is not empty
+sub new
+{
+       my $class = shift;
+       my $conf_fname = shift;         # Config file to load
+       my $self = {};
+
+       # check that the specified config file exists and is not empty
+       undef $conf_fname unless 
+           (defined $conf_fname && -e $conf_fname && -s $conf_fname);
+       # Figure out a good config file to load if none was specified.
+       if (!defined($conf_fname))
+       {
+               # If the $KOHA_CONF environment variable is set, use
+               # that. Otherwise, use the built-in default.
+               $conf_fname = $ENV{"KOHA_CONF"} || CONFIG_FNAME;
+       }
+       $self->{"config_file"} = $conf_fname;
+
+       # Load the desired config file.
+       $self->{"config"} = &read_config_file($conf_fname);
+       warn "read_config_file($conf_fname) returned undef" if 
!defined($self->{"config"});
+       return undef if !defined($self->{"config"});
+
+       $self->{"dbh"} = undef;         # Database handle
+       $self->{"stopwords"} = undef; # stopwords list
+       $self->{"marcfromkohafield"} = undef; # the hash with relations between 
koha table fields and MARC field/subfield
+       $self->{"userenv"} = undef;             # User env
+       $self->{"activeuser"} = undef;          # current active user
+
+       bless $self, $class;
+       return $self;
+}
+
+=item set_context
+
+  $context = new C4::Context;
+  $context->set_context();
+or
+  set_context C4::Context $context;
+
+  ...
+  restore_context C4::Context;
+
+In some cases, it might be necessary for a script to use multiple
+contexts. C<&set_context> saves the current context on a stack, then
+sets the context to C<$context>, which will be used in future
+operations. To restore the previous context, use C<&restore_context>.
+
+=cut
+#'
+sub set_context
+{
+       my $self = shift;
+       my $new_context;        # The context to set
+
+       # Figure out whether this is a class or instance method call.
+       #
+       # We're going to make the assumption that control got here
+       # through valid means, i.e., that the caller used an instance
+       # or class method call, and that control got here through the
+       # usual inheritance mechanisms. The caller can, of course,
+       # break this assumption by playing silly buggers, but that's
+       # harder to do than doing it properly, and harder to check
+       # for.
+       if (ref($self) eq "")
+       {
+               # Class method. The new context is the next argument.
+               $new_context = shift;
+       } else {
+               # Instance method. The new context is $self.
+               $new_context = $self;
+       }
+
+       # Save the old context, if any, on the stack
+       push @context_stack, $context if defined($context);
+
+       # Set the new context
+       $context = $new_context;
+}
+
+=item restore_context
+
+  &restore_context;
+
+Restores the context set by C<&set_context>.
+
+=cut
+#'
+sub restore_context
+{
+       my $self = shift;
+
+       if ($#context_stack < 0)
+       {
+               # Stack underflow.
+               die "Context stack underflow";
+       }
+
+       # Pop the old context and set it.
+       $context = pop @context_stack;
+
+       # FIXME - Should this return something, like maybe the context
+       # that was current when this was called?
+}
+
+=item config
+
+  $value = C4::Context->config("config_variable");
+
+  $value = C4::Context->config_variable;
+
+Returns the value of a variable specified in the configuration file
+from which the current context was created.
+
+The second form is more compact, but of course may conflict with
+method names. If there is a configuration variable called "new", then
+C<C4::Config-E<gt>new> will not return it.
+
+=cut
+#'
+sub config
+{
+       my $self = shift;
+       my $var = shift;                # The config variable to return
+
+       return undef if !defined($context->{"config"});
+                       # Presumably $self->{config} might be
+                       # undefined if the config file given to &new
+                       # didn't exist, and the caller didn't bother
+                       # to check the return value.
+
+       # Return the value of the requested config variable
+       return $context->{"config"}{$var};
+}
+
+=item preference
+
+  $sys_preference = C4::Context->preference("some_variable");
+
+Looks up the value of the given system preference in the
+systempreferences table of the Koha database, and returns it. If the
+variable is not set, or in case of error, returns the undefined value.
+
+=cut
+#'
+# FIXME - The preferences aren't likely to change over the lifetime of
+# the script (and things might break if they did change), so perhaps
+# this function should cache the results it finds.
+sub preference
+{
+       my $self = shift;
+       my $var = shift;                # The system preference to return
+       my $retval;                     # Return value
+       my $dbh = C4::Context->dbh;     # Database handle
+       my $sth;                        # Database query handle
+
+       # Look up systempreferences.variable==$var
+       $retval = $dbh->selectrow_array(<<EOT);
+               SELECT  value
+               FROM    systempreferences
+               WHERE   variable='$var'
+               LIMIT   1
+EOT
+       return $retval;
+}
+
+sub boolean_preference ($) {
+       my $self = shift;
+       my $var = shift;                # The system preference to return
+       my $it = preference($self, $var);
+       return defined($it)? C4::Boolean::true_p($it): undef;
+}
+
+# AUTOLOAD
+# This implements C4::Config->foo, and simply returns
+# C4::Context->config("foo"), as described in the documentation for
+# &config, above.
+
+# FIXME - Perhaps this should be extended to check &config first, and
+# then &preference if that fails. OTOH, AUTOLOAD could lead to crappy
+# code, so it'd probably be best to delete it altogether so as not to
+# encourage people to use it.
+sub AUTOLOAD
+{
+       my $self = shift;
+
+       $AUTOLOAD =~ s/.*:://;          # Chop off the package name,
+                                       # leaving only the function name.
+       return $self->config($AUTOLOAD);
+}
+
+# _new_dbh
+# Internal helper function (not a method!). This creates a new
+# database connection from the data given in the current context, and
+# returns it.
+sub _new_dbh
+{
+       my $db_driver = $context->{"config"}{"db_scheme"} || "mysql";
+       my $db_name   = $context->{"config"}{"database"};
+       my $db_host   = $context->{"config"}{"hostname"};
+       my $db_user   = $context->{"config"}{"user"};
+       my $db_passwd = $context->{"config"}{"pass"};
+       
+       my $dbh=DBI->connect("DBI:$db_driver:$db_name:$db_host",
+                           $db_user, $db_passwd);
+       $dbh->do("SET NAMES 'utf8'");
+       return $dbh;
+}
+
+=item dbh
+
+  $dbh = C4::Context->dbh;
+
+Returns a database handle connected to the Koha database for the
+current context. If no connection has yet been made, this method
+creates one, and connects to the database.
+
+This database handle is cached for future use: if you call
+C<C4::Context-E<gt>dbh> twice, you will get the same handle both
+times. If you need a second database handle, use C<&new_dbh> and
+possibly C<&set_dbh>.
+
+=cut
+#'
+sub dbh
+{
+       my $self = shift;
+       my $sth;
+
+       if (defined($context->{"dbh"})) {
+           $sth=$context->{"dbh"}->prepare("select 1");
+           return $context->{"dbh"} if (defined($sth->execute));
+       }
+
+       # No database handle or it died . Create one.
+       $context->{"dbh"} = &_new_dbh();
+
+       return $context->{"dbh"};
+}
+
+=item new_dbh
+
+  $dbh = C4::Context->new_dbh;
+
+Creates a new connection to the Koha database for the current context,
+and returns the database handle (a C<DBI::db> object).
+
+The handle is not saved anywhere: this method is strictly a
+convenience function; the point is that it knows which database to
+connect to so that the caller doesn't have to know.
+
+=cut
+#'
+sub new_dbh
+{
+       my $self = shift;
+
+       return &_new_dbh();
+}
+
+=item set_dbh
+
+  $my_dbh = C4::Connect->new_dbh;
+  C4::Connect->set_dbh($my_dbh);
+  ...
+  C4::Connect->restore_dbh;
+
+C<&set_dbh> and C<&restore_dbh> work in a manner analogous to
+C<&set_context> and C<&restore_context>.
+
+C<&set_dbh> saves the current database handle on a stack, then sets
+the current database handle to C<$my_dbh>.
+
+C<$my_dbh> is assumed to be a good database handle.
+
+=cut
+#'
+sub set_dbh
+{
+       my $self = shift;
+       my $new_dbh = shift;
+
+       # Save the current database handle on the handle stack.
+       # We assume that $new_dbh is all good: if the caller wants to
+       # screw himself by passing an invalid handle, that's fine by
+       # us.
+       push @{$context->{"dbh_stack"}}, $context->{"dbh"};
+       $context->{"dbh"} = $new_dbh;
+}
+
+=item restore_dbh
+
+  C4::Context->restore_dbh;
+
+Restores the database handle saved by an earlier call to
+C<C4::Context-E<gt>set_dbh>.
+
+=cut
+#'
+sub restore_dbh
+{
+       my $self = shift;
+
+       if ($#{$context->{"dbh_stack"}} < 0)
+       {
+               # Stack underflow
+               die "DBH stack underflow";
+       }
+
+       # Pop the old database handle and set it.
+       $context->{"dbh"} = pop @{$context->{"dbh_stack"}};
+
+       # FIXME - If it is determined that restore_context should
+       # return something, then this function should, too.
+}
+
+=item marcfromkohafield
+
+  $dbh = C4::Context->marcfromkohafield;
+
+Returns a hash with marcfromkohafield.
+
+This hash is cached for future use: if you call
+C<C4::Context-E<gt>marcfromkohafield> twice, you will get the same hash 
without real DB access
+
+=cut
+#'
+sub marcfromkohafield
+{
+       my $retval = {};
+
+       # If the hash already exists, return it.
+       return $context->{"marcfromkohafield"} if 
defined($context->{"marcfromkohafield"});
+
+       # No hash. Create one.
+       $context->{"marcfromkohafield"} = &_new_marcfromkohafield();
+
+       return $context->{"marcfromkohafield"};
+}
+
+# _new_marcfromkohafield
+# Internal helper function (not a method!). This creates a new
+# hash with stopwords
+sub _new_marcfromkohafield
+{
+       my $dbh = C4::Context->dbh;
+       my $marcfromkohafield;
+       my $sth = $dbh->prepare("select 
frameworkcode,kohafield,tagfield,tagsubfield from marc_subfield_structure where 
kohafield > ''");
+       $sth->execute;
+       while (my ($frameworkcode,$kohafield,$tagfield,$tagsubfield) = 
$sth->fetchrow) {
+               my $retval = {};
+               $marcfromkohafield->{$frameworkcode}->{$kohafield} = 
[$tagfield,$tagsubfield];
+       }
+       return $marcfromkohafield;
+}
+
+=item stopwords
+
+  $dbh = C4::Context->stopwords;
+
+Returns a hash with stopwords.
+
+This hash is cached for future use: if you call
+C<C4::Context-E<gt>stopwords> twice, you will get the same hash without real 
DB access
+
+=cut
+#'
+sub stopwords
+{
+       my $retval = {};
+
+       # If the hash already exists, return it.
+       return $context->{"stopwords"} if defined($context->{"stopwords"});
+
+       # No hash. Create one.
+       $context->{"stopwords"} = &_new_stopwords();
+
+       return $context->{"stopwords"};
+}
+
+# _new_stopwords
+# Internal helper function (not a method!). This creates a new
+# hash with stopwords
+sub _new_stopwords
+{
+       my $dbh = C4::Context->dbh;
+       my $stopwordlist;
+       my $sth = $dbh->prepare("select word from stopwords");
+       $sth->execute;
+       while (my $stopword = $sth->fetchrow_array) {
+               my $retval = {};
+               $stopwordlist->{$stopword} = uc($stopword);
+       }
+       $stopwordlist->{A} = "A" unless $stopwordlist;
+       return $stopwordlist;
+}
+
+=item userenv
+
+  C4::Context->userenv;
+
+Builds a hash for user environment variables.
+
+This hash shall be cached for future use: if you call
+C<C4::Context-E<gt>userenv> twice, you will get the same hash without real DB 
access
+
+set_userenv is called in Auth.pm
+
+=cut
+#'
+sub userenv
+{
+       my $var = $context->{"activeuser"};
+       return $context->{"userenv"}->{$var} if (defined 
$context->{"userenv"}->{$var});
+       return 0;
+       warn "NO CONTEXT for $var";
+}
+
+=item set_userenv
+
+  C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, 
$usersurname, $userbranch, $userflags, $emailaddress);
+
+Informs a hash for user environment variables.
+
+This hash shall be cached for future use: if you call
+C<C4::Context-E<gt>userenv> twice, you will get the same hash without real DB 
access
+
+set_userenv is called in Auth.pm
+
+=cut
+#'
+sub set_userenv{
+       my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, 
$userbranch, $userbranchname, $userflags, $emailaddress)= @_;
+       my $var=$context->{"activeuser"};
+       my $cell = {
+               "number"     => $usernum,
+               "id"         => $userid,
+               "cardnumber" => $usercnum,
+#              "firstname"  => $userfirstname,
+#              "surname"    => $usersurname,
+#possibly a law problem
+               "branch"     => $userbranch,
+               "branchname"     => $userbranchname,
+               "flags"      => $userflags,
+               "emailaddress"  => $emailaddress,
+       };
+       $context->{userenv}->{$var} = $cell;
+       return $cell;
+}
+
+=item _new_userenv
+
+  C4::Context->_new_userenv($session);
+
+Builds a hash for user environment variables.
+
+This hash shall be cached for future use: if you call
+C<C4::Context-E<gt>userenv> twice, you will get the same hash without real DB 
access
+
+_new_userenv is called in Auth.pm
+
+=cut
+#'
+sub _new_userenv
+{
+       shift;
+       my ($sessionID)= @_;
+       $context->{"activeuser"}=$sessionID;
+}
+
+=item _unset_userenv
+
+  C4::Context->_unset_userenv;
+
+Destroys the hash for activeuser user environment variables.
+
+=cut
+#'
+
+sub _unset_userenv
+{
+       my ($sessionID)= @_;
+       undef $context->{"activeuser"} if ($context->{"activeuser"} eq 
$sessionID);
+}
+
+
+
+1;
+__END__
+
+=back
+
+=head1 ENVIRONMENT
+
+=over 4
+
+=item C<KOHA_CONF>
+
+Specifies the configuration file to read.
+
+=back
+
+=head1 SEE ALSO
+
+DBI(3)
+
+=head1 AUTHOR
+
+Andrew Arensburger <arensb at ooblick dot com>
+
+=cut
Index: koha/authorities/detail.pl
diff -u /dev/null koha/authorities/detail.pl:1.2.2.4.4.1
--- /dev/null   Thu Jun  1 08:58:20 2006
+++ koha/authorities/detail.pl  Thu Jun  1 08:58:20 2006
@@ -0,0 +1,184 @@
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+=head1 NAME
+
+etail.pl : script to show an authority in MARC format
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+This script needs an authid
+
+It shows the authority in a (nice) MARC format depending on authority MARC
+parameters tables.
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
+
+use strict;
+require Exporter;
+use C4::AuthoritiesMarc;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Interface::CGI::Output;
+use CGI;
+use C4::Search;
+use MARC::Record;
+use C4::Koha;
+# use C4::Biblio;
+# use C4::Catalogue;
+use HTML::Template;
+
+my $query=new CGI;
+
+my $dbh=C4::Context->dbh;
+
+my $authid = $query->param('authid');
+# open template
+my ($template, $loggedinuser, $cookie)
+               = get_template_and_user({template_name => 
"authorities/detail.tmpl",
+                            query => $query,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {catalogue => 1},
+                            debug => 1,
+                            });
+
+my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
+my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+
+my $record;
+
+if (C4::Context->preference("AuthDisplayHierarchy")){
+  my $trees=BuildUnimarcHierarchies($authid);
+  warn "trees :$trees";
+  my @trees = split /;/,$trees ;
+  push @trees,$trees unless (@trees);
+  my @loophierarchies;
+  foreach my $tree (@trees){
+    warn "tree :$tree";
+
+    my @tree=split /,/,$tree;
+    push @tree,$tree unless (@tree);
+    my $cnt=0;
+    my $hierarchystring;
+    foreach my $element (@tree){
+      warn "tree :$element";
+      my $elementdata = AUTHgetauthority($dbh,$element);
+      $record= $elementdata if ($authid==$element);
+      $hierarchystring.=BuildUnimarcHierarchy($elementdata,"child".$cnt);
+      $cnt++;
+    }
+    push @loophierarchies, { 'string' =>$hierarchystring};
+    $template->param(
+      'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
+      'loophierarchies' =>address@hidden,
+    );
+  }
+} else {
+  $record=AUTHgetauthority($dbh,$authid);
+}
+my $count = AUTHcount_usage($authid);
+
+# find the marc field/subfield used in biblio by this authority
+my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure 
where authtypecode=?");
+$sth->execute($authtypecode);
+my $biblio_fields;
+while (my ($tagfield) = $sth->fetchrow) {
+       $biblio_fields.= $tagfield."9,";
+}
+chop $biblio_fields;
+
+
+# fill arrays
+my @loop_data =();
+my $tag;
+# loop through each tab 0 through 9
+# for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
+# loop through each tag
+my @fields = $record->fields();
+my @loop_data =();
+foreach my $field (@fields) {
+               my @subfields_data;
+       # if tag <10, there's no subfield, use the "@" trick
+       if ($field->tag()<10) {
+               next if ($tagslib->{$field->tag()}->{'@'}->{hidden});
+               my %subfield_data;
+               
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{'@'}->{lib};
+               $subfield_data{marc_value}=$field->data();
+               $subfield_data{marc_subfield}='@';
+               $subfield_data{marc_tag}=$field->tag();
+               push(@subfields_data, \%subfield_data);
+       } else {
+               my @subf=$field->subfields;
+# loop through each subfield
+               for my $i (0..$#subf) {
+                       $subf[$i][0] = "@" unless $subf[$i][0];
+                       next if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
+                       my %subfield_data;
+                       
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
+                       if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) 
{
+                               $subfield_data{marc_value}="<a 
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+                       } else {
+                               $subfield_data{marc_value}=$subf[$i][1];
+                       }
+                       $subfield_data{marc_subfield}=$subf[$i][0];
+                       $subfield_data{marc_tag}=$field->tag();
+                       push(@subfields_data, \%subfield_data);
+               }
+       }
+       if ($#subfields_data>=0) {
+               my %tag_data;
+               $tag_data{tag}=$field->tag().' -'. 
$tagslib->{$field->tag()}->{lib};
+               $tag_data{subfield} = address@hidden;
+               push (@loop_data, \%tag_data);
+       }
+}
+$template->param("0XX" =>address@hidden);
+
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (keys %$authtypes) {
+       my $selected = 1 if $thisauthtype eq $authtypecode;
+       my %row =(value => $thisauthtype,
+                               selected => $selected,
+                               authtypetext => 
$authtypes->{$thisauthtype}{'authtypetext'},
+                       );
+       push @authtypesloop, \%row;
+}
+
+$template->param(authid => $authid,
+               count => $count,
+               biblio_fields => $biblio_fields,
+               authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
+               authtypesloop => address@hidden,
+               intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),
+               intranetstylesheet => 
C4::Context->preference("intranetstylesheet"),
+               IntranetNav => C4::Context->preference("IntranetNav"),
+               );
+output_html_with_http_headers $query, $cookie, $template->output;
+
Index: koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl
diff -u /dev/null 
koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:1.3.2.4.4.1
--- /dev/null   Thu Jun  1 08:58:20 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl     Thu Jun 
 1 08:58:20 2006
@@ -0,0 +1,84 @@
+<!-- TMPL_INCLUDE NAME="auth-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" 
-->/includes/marc-editor.css">
+<!-- TMPL_IF Name="displayhierarchy"-->
+<div class="hierarchies">
+<!--TMPL_LOOP Name="loophierarchies" -->
+  <div class="hierarchy">
+    <!--TMPL_VAR Name="string" -->
+  </div>
+<!--/TMPL_LOOP-->
+</div>
+<script language="JavaScript" type="text/javascript">
+
+function showParents(mynumber) {
+       // show all parents containing mynumber in id
+    for(var i = 0; i < document.getElementsByTagName(mynumber+"p").length; 
i++){
+      my element=document.getElementsByName(mynumber+"p")[i];
+      if (element.style.visibility='hidden') {
+        element.style.visibility='visible'  ;
+      } else {
+        element.style.visibility='hidden';
+      }
+    }
+}
+}
+function showChildren(mynumber) {
+       // show all children containing mynumber in id
+    for(var i = 0; i < document.getElementsByTagName(mynumber+"c").length; 
i++){
+      my element=document.getElementsByName(mynumber+"c")[i];
+      if (element.style.visibility='hidden') {
+        element.style.visibility='visible'  ;
+      } else {
+        element.style.visibility='hidden';
+      }
+    }
+}
+</script>
+
+<!-- /TMPL_IF -->
+<div class="tabbed">
+       <h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- 
TMPL_VAR name="authtypetext" -->)</h1>
+       <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- 
TMPL_VAR NAME="theme" -->/images/fileopen.png">
+       </a>
+       <!-- TMPL_UNLESS name="count" -->
+               <a href="javascript:confirm_deletion()">
+                       <img border="0" src="<!-- TMPL_VAR NAME="interface" 
-->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+               </a>
+       <!-- /TMPL_UNLESS -->
+       <a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR 
NAME="authid" -->')" class="button authority">
+               Print
+       </a>
+       <a 
href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- 
TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR 
NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- 
TMPL_VAR name="count" --> biblios</a>
+</div>
+
+<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+       <!-- TMPL_LOOP NAME="0XX" -->
+                       <p class="MARCtag">
+                               <!-- TMPL_VAR NAME="tag" -->
+                       </p>
+               <!-- TMPL_LOOP NAME="subfield" -->
+                       <p>
+                               <label class="labelsubfield">
+                               <!-- TMPL_VAR NAME="marc_subfield" -->
+                               <!-- TMPL_VAR NAME="marc_lib" --></label>
+                               <!-- TMPL_VAR NAME="marc_value" -->
+                       </p>
+               <!-- /TMPL_LOOP -->
+       <!-- /TMPL_LOOP -->
+</div>
+       
+<script language="JavaScript" type="text/javascript">
+
+function confirm_deletion() {
+       var is_confirmed = confirm('Are you sure you want to delete this 
authority?');
+       if (is_confirmed) {
+               window.location="authorities-home.pl?op=delete&amp;authid=<!-- 
TMPL_VAR NAME="authid" -->";
+       }
+}
+function Dopop(link) {
+       
newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+</script>
+</body>
+</html>
Index: koha/updater/updatedatabase
diff -u /dev/null koha/updater/updatedatabase:1.100.2.43.4.1
--- /dev/null   Thu Jun  1 08:58:20 2006
+++ koha/updater/updatedatabase Thu Jun  1 08:58:20 2006
@@ -0,0 +1,2449 @@
+#!/usr/bin/perl
+
+# $Id: updatedatabase,v 1.100.2.43.4.1 2006/06/01 08:58:20 hdl Exp $
+
+# Database Updater
+# This script checks for required updates to the database.
+
+# Part of the Koha Library Software www.koha.org
+# Licensed under the GPL.
+
+# Bugs/ToDo:
+# - Would also be a good idea to offer to do a backup at this time...
+
+# NOTE:  If you do something more than once in here, make it table driven.
+
+use strict;
+
+# CPAN modules
+use DBI;
+use Getopt::Long;
+
+# Koha modules
+use C4::Context;
+
+# FIXME - The user might be installing a new database, so can't rely
+# on /etc/koha.conf anyway.
+
+my $debug = 0;
+
+my (
+    $sth, $sti,
+    $query,
+    %existingtables,    # tables already in database
+    %types,
+    $table,
+    $column,
+    $type, $null, $key, $default, $extra,
+    $prefitem,          # preference item in systempreferences table
+);
+
+my $silent;
+GetOptions( 's' => \$silent );
+my $dbh = C4::Context->dbh;
+print "connected to your DB. Checking & modifying it\n" unless $silent;
+
+#-------------------
+# Defines
+
+# Tables to add if they don't exist
+my %requiretables = (
+    shelfcontents => "( shelfnumber int not null,
+                                                       itemnumber int not null,
+                                                       flags int)",
+    bookshelf => "( shelfnumber int auto_increment primary key,
+                                               shelfname char(255))",
+    z3950queue => "( id int auto_increment primary key,
+                                               term text,
+                                               type char(10),
+                                               startdate int,
+                                               enddate int,
+                                               done smallint,
+                                               results longblob,
+                                               numrecords int,
+                                               servers text,
+                                               identifier char(30))",
+    z3950results => "( id int auto_increment primary key,
+                                               queryid int,
+                                               server char(255),
+                                               startdate int,
+                                               enddate int,
+                                               results longblob,
+                                               numrecords int,
+                                               numdownloaded int,
+                                               highestseen int,
+                                               active smallint)",
+    branchrelations => "( branchcode varchar(4),
+                                                       categorycode 
varchar(4))",
+    websites => "( websitenumber int(11) NOT NULL auto_increment,
+                                               biblionumber int(11) NOT NULL 
default '0',
+                                               title text,
+                                               description text,
+                                               url varchar(255),
+                                               PRIMARY KEY (websitenumber) )",
+    marcrecorddone => "( isbn char(40),
+                                                               issn char(40),
+                                                               lccn char(40),
+                                                               controlnumber 
char(40))",
+    uploadedmarc => "( id int(11) NOT NULL auto_increment PRIMARY KEY,
+                                                       marc longblob,
+                                                       hidden smallint(6) 
default NULL,
+                                                       name varchar(255) 
default NULL)",
+    ethnicity => "( code varchar(10) NOT NULL default '',
+                                       name varchar(255) default NULL,
+                                       PRIMARY KEY  (code)   )",
+    sessions => "( sessionID varchar(255) NOT NULL default '',
+                                               userid varchar(255) default 
NULL,
+                                               ip varchar(16) default NULL,
+                                               lasttime int,
+                                               PRIMARY KEY (sessionID)   )",
+    sessionqueries => "( sessionID varchar(255) NOT NULL default '',
+                                                               userid 
char(100) NOT NULL default '',
+                                                               ip char(18) NOT 
NULL default '',
+                                                               url text NOT 
NULL default ''  )",
+    bibliothesaurus => "( id bigint(20) NOT NULL auto_increment,
+                                                       freelib char(255) NOT 
NULL default '',
+                                                       stdlib char(255) NOT 
NULL default '',
+                                                       category char(10) NOT 
NULL default '',
+                                                       level tinyint(4) NOT 
NULL default '1',
+                                                       hierarchy char(80) NOT 
NULL default '',
+                                                       father char(80) NOT 
NULL default '',
+                                                       PRIMARY KEY  (id),
+                                                       KEY freelib (freelib),
+                                                       KEY stdlib (stdlib),
+                                                       KEY category (category),
+                                                       KEY hierarchy 
(hierarchy)
+                                                       )",
+    marc_biblio => "(
+                                               bibid bigint(20) unsigned NOT 
NULL auto_increment,
+                                               biblionumber int(11) NOT NULL 
default '0',
+                                               datecreated date NOT NULL 
default '0000-00-00',
+                                               datemodified date default NULL,
+                                               origincode char(20) default 
NULL,
+                                               PRIMARY KEY  (bibid),
+                                               KEY origincode (origincode),
+                                               KEY biblionumber (biblionumber)
+                                               ) ",
+    marc_blob_subfield => "(
+                                       blobidlink bigint(20) NOT NULL 
auto_increment,
+                                       subfieldvalue longtext NOT NULL,
+                                       PRIMARY KEY  (blobidlink)
+                                       ) ",
+    marc_subfield_structure => "(
+                                               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',
+                                               kohafield char(40)  default 
NULL,
+                                               tab tinyint(1) default NULL,
+                                               authorised_value char(10) 
default NULL,
+                                               thesaurus_category char(10) 
default NULL,
+                                               value_builder char(80) default 
NULL,
+                                               PRIMARY KEY  
(tagfield,tagsubfield),
+                                               KEY kohafield (kohafield),
+                                               KEY tab (tab)
+                                               )",
+    marc_subfield_table => "(
+                                               subfieldid bigint(20) unsigned 
NOT NULL auto_increment,
+                                               bibid 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,
+                                               valuebloblink bigint(20) 
default NULL,
+                                               PRIMARY KEY  (subfieldid),
+                                               KEY bibid (bibid),
+                                               KEY tag (tag),
+                                               KEY tag_indicator 
(tag_indicator),
+                                               KEY subfieldorder 
(subfieldorder),
+                                               KEY subfieldcode (subfieldcode),
+                                               KEY subfieldvalue 
(subfieldvalue),
+                                               KEY tagorder (tagorder)
+                                       )",
+    marc_tag_structure => "(
+                                       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  (tagfield)
+                                       )",
+    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)
+                                       )",
+    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',
+                               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)
+                           )",
+);
+
+my %requirefields = (
+    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 \'\'' },
+);
+
+my %dropable_table = (
+    classification => 'classification',
+    multipart      => 'multipart',
+    multivolume    => 'multivolume',
+    newitems       => 'newitems',
+    procedures     => 'procedures',
+    publisher      => 'publisher',
+    searchstats    => 'searchstats',
+    serialissues   => 'serialissues',
+);
+
+my %uselessfields = (
+    aqorders => "requisitionedby,authorisedby,booksellerid,
+                       deliverydays,followupdays,
+                       numberfollowupsallowed,numberfollowupssent,
+                       dateprinted,sourced,quantityreceiveddamaged,
+                       subscriptionfrom,subscriptionto
+                       "
+);
+
+# 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)
+
+# The tabledata hash contains data that should be in the tables.
+# The uniquefieldrequired hash entry is used to determine which (if any) fields
+# must not exist in the table for this row to be inserted.  If the
+# uniquefieldrequired entry is already in the table, the existing data is not
+# modified, unless the forceupdate hash entry is also set.  Fields in the
+# anonymous "forceupdate" hash will be forced to be updated to the default
+# values given in the %tabledata hash.
+
+my %tabledata = (
+    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
+        },
+    ],
+    systempreferences => [
+        {
+            uniquefieldrequired => 'variable',
+            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        => ''
+
+        },
+        {
+            uniquefieldrequired => 'variable',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            variable    => 'autoMemberNum',
+            value       => '1',
+            explanation => 'Member number is auto-calculated',
+            type        => 'YesNo'
+
+        },
+        {
+            uniquefieldrequired => 'variable',
+            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'
+        },
+
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opacstylesheet',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Enter a complete URL to use an alternate layout stylesheet in OPAC',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opaccolorstylesheet',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+              'Enter the name of the color stylesheet to use in the OPAC',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opaclayoutstylesheet',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+              'Enter the name of the layout stylesheet to use in the OPAC',
+            type => 'free',
+        },
+
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opacreadinghistory',
+            value               => '1',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+              'Turn on/off display of Patron Reading History in OPAC',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opaclanguagesdisplay',
+            value               => '1',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+              'Turn on/off display of Change Language feature on OPAC',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'patronimages',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Turn on/off display of patron images in Intranet and specify a file extension 
for images',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'intranetstylesheet',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Enter a complete URL to use an alternate layout stylesheet in Intranet',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'intranetcolorstylesheet',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+              'Enter the name of the color stylesheet to use in Intranet',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opacsmallimage',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Enter a complete URL to an image, will be on top/left instead of the Koha 
logo',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opaclargeimage',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Enter a complete URL to an image, will be on the main page, instead of the 
Koha logo',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'delimiter',
+            value               => ';',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation => 'separator for reports exported to spreadsheet',
+            type        => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'MIME',
+            value               => 'OPENOFFICE.ORG',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1,
+                'options'     => 1
+            },
+            explanation =>
+'Define the default application for report exportations into files',
+            type    => 'Choice',
+            options => 'EXCEL|OPENOFFICE.ORG'
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'Delimiter',
+            value               => ';',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1,
+                'options'     => 1
+            },
+            explanation =>
+'Define the default separator character for report exportations into files',
+            type    => 'Choice',
+            options => ';|tabulation|,|/|\|#'
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'SubscriptionHistory',
+            value               => ';',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1,
+                'options'     => 1
+            },
+            explanation =>
+              'Define the information level for serials history in OPAC',
+            type    => 'Choice',
+            options => 'simplified|full'
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'hidelostitems',
+            value               => 'No',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation => 'show or hide "lost" items in OPAC.',
+            type        => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'IndependantBranches',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation => 'Turn Branch independancy management On an Off',
+            type        => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'ReturnBeforeExpiry',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'If Yes, Returndate on issuing can\'t be after borrower card expiry',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'Disable_Dictionary',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation => 'Disables Dictionary buttons if set to yes',
+            type        => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'hide_marc',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'hide marc specific datas like subfield code & indicators to library',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'NotifyBorrowerDeparture',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+              'Delay before expiry where a notice is sent when issuing',
+            type => 'Integer',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'OpacPasswordChange',
+            value               => '1',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Enable/Disable password change in OPAC (disable it when using LDAP auth)',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'OpacNav',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Use HTML tabs to add navigational links to the left-hand navigational bar in 
OPAC',
+            type    => 'Textarea',
+            options => '70|10'
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'IntranetNav',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1
+            },
+            explanation =>
+'Use HTML tabs to add navigational links to the left-hand navigational bar in 
Intranet',
+            type    => 'Textarea',
+            options => '70|10'
+        },
+
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'AnonSuggestions',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+              'Set to anonymous borrowernumber to enable Anonymous 
suggestions',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'MARCOrgCode',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                        type' => 1
+            },
+            explanation =>
+'Your MARC Organization Code - 
http://www.loc.gov/marc/organizations/orgshome.html',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'AmazonContent',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                       type' => 1
+            },
+            explanation =>
+'Turn On Amazon Content - You MUST set AmazonDevKey and AmazonAssocTag if 
enabled',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'AmazonDevKey',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                       type' => 1
+            },
+            explanation =>
+'see: aws-portal.amazon.com/gp/aws/developer/registration/index.html',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'AmazonAssocTag',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                       type' => 1
+            },
+            explanation =>
+              'see: associates.amazon.com/gp/flex/associates/apply-login.html',
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            forceupdate         => {
+                'explanation' => 1,
+                'type'        => 1,
+                'options'     => 1
+            },
+            variable    => 'TemplateEncoding',
+            value       => 'iso-8859-1',
+            explanation => 'Specify the encoding to use in Templates',
+            type        => 'Choice',
+            options     => 'iso-8859-1|utf-8'
+        },
+
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'opaccredits',
+            value               => '',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+              'Put any HTML Credits at the bottom of the OPAC page',
+            type    => 'Textarea',
+            options => '70|10'
+        },
+               
+{
+            uniquefieldrequired => 'variable',
+            variable            => 'opacheader',
+            value               => '',
+            forceupdate         => { 'explanation' => 1,                       
                                                
+                                                       'type' => 1},
+            explanation         => 'Enter HTML to be included as a custom 
header in the OPAC',
+            type                => 'Textarea',
+                       options                         => '30|10'
+        },
+
+               {
+            uniquefieldrequired => 'variable',
+            variable            => 'IntranetBiblioDefaultView',
+            value               => 'marc',
+            forceupdate         => { 'explanation' => 1,                       
                                      
+                                                               'type' => 1},
+            explanation         => 'Define the default view of a biblio in the 
intranet. Can be either normal, marc, or ISBD',
+            type                => 'Choice',
+                       options                         => 'normal|marc|isbd'
+        },
+               
+                               {
+            uniquefieldrequired => 'variable',
+            variable            => 'opacbookbag',
+            value               => '1',
+            forceupdate         => { 'explanation' => 1,                       
                                      
+                                                               'type' => 1},
+            explanation         => 'Enable or disable display of biblio basket 
(book bag)',
+            type                => 'YesNo'
+        },
+               
+                               {
+            uniquefieldrequired => 'variable',
+            variable            => 'opacuserlogin',
+            value               => '1',
+            forceupdate         => { 'explanation' => 1,                       
                                      
+                                                               'type' => 1},
+            explanation         => 'Enable or disable display of user login 
features',
+            type                => 'YesNo'
+        },
+               
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'serialsadditems',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+'If set, a new item will be automatically added when receiving an issue',
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'advancedMARCeditor',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+"If set, the MARC editor won't show you tag/subfields description",
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'z3950NormalizeAuthor',
+            value               => '0',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+"If set, Personnal Authorities will replace authors in biblio.author",
+            type => 'YesNo',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'z3950AuthorAuthFields',
+            value               => '701,702,700',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+"contains the MARC biblio tags of person authorities to fill biblio.author 
with when importing biblio",
+            type => 'free',
+        },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'AuthDisplayHierarchy',
+            value               => '1',
+            forceupdate         => {
+                'explanation' => 1,
+                '
+                                        type' => 1
+            },
+            explanation =>
+"Display hierarchies in details for Authorities.",
+            type => 'YesNo',
+        },
+    ],
+
+);
+
+my %fielddefinitions = (
+    printers => [
+        {
+            field   => 'printername',
+            type    => 'char(40)',
+            null    => '',
+            key     => 'PRI',
+            default => ''
+        },
+    ],
+    aqbookfund => [
+        {
+            field   => 'bookfundid',
+            type    => 'varchar(5)',
+            null    => '',
+            key     => 'PRI',
+            default => ''
+        },
+    ],
+    aqbudget => [
+        {
+            field   => 'aqbudgetid',
+            type    => 'tinyint(4)',
+            null    => '',
+            key     => 'PRI',
+            default => '',
+            extra   => 'auto_increment'
+        },
+    ],
+    z3950servers => [
+        {
+            field   => 'id',
+            type    => 'int(11)',
+            null    => '',
+            key     => 'PRI',
+            default => '',
+            extra   => 'auto_increment'
+        },
+    ],
+    marc_breeding => [
+        {
+            field   => 'z3950random',
+            type    => 'varchar(40)',
+            null    => 'NULL',
+            key     => '',
+            default => '',
+            extra   => ''
+        },
+        {
+            field   => 'encoding',
+            type    => 'varchar(40)',
+            null    => 'NOT NULL',
+            key     => '',
+            default => '',
+            extra   => ''
+        },
+    ],
+    serial => [
+        {
+            field   => 'notes',
+            type    => 'varchar(255)',
+            null    => 'NULL',
+            key     => '',
+            default => '',
+            extra   => ''
+        },
+    ],
+    auth_header =>[
+        {
+            field => 'authtrees',
+            type  => 'text',
+            null    => 'NULL',
+            key     => '',
+            default => '',
+            extra   => ''
+        },
+     ],
+);
+
+#-------------------
+# Initialize
+
+# Start checking
+
+# Get version of MySQL database engine.
+my $mysqlversion = `mysqld --version`;
+$mysqlversion =~ /Ver (\S*) /;
+$mysqlversion = $1;
+if ( $mysqlversion ge '3.23' ) {
+    print "Could convert to MyISAM database tables...\n" unless $silent;
+}
+
+#---------------------------------
+# Tables
+
+# Collect all tables into a list
+$sth = $dbh->prepare("show tables");
+$sth->execute;
+while ( my ($table) = $sth->fetchrow ) {
+    $existingtables{$table} = 1;
+}
+
+# Now add any missing tables
+foreach $table ( keys %requiretables ) {
+    unless ( $existingtables{$table} ) {
+        print "Adding $table table...\n" unless $silent;
+        my $sth = $dbh->prepare("create table $table $requiretables{$table}");
+        $sth->execute;
+        if ( $sth->err ) {
+            print "Error : $sth->errstr \n";
+            $sth->finish;
+        }    # if error
+    }    # unless exists
+}    # foreach
+
+# now drop useless tables
+foreach $table ( keys %dropable_table ) {
+    if ( $existingtables{$table} ) {
+        print "Dropping unused table $table\n" if $debug and not $silent;
+        $dbh->do("drop table $table");
+        if ( $dbh->err ) {
+            print "Error : $dbh->errstr \n";
+        }
+    }
+}
+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;
+}
+
+#---------------------------------
+# Columns
+
+foreach $table ( keys %requirefields ) {
+    print "Check table $table\n" if $debug and not $silent;
+    $sth = $dbh->prepare("show columns from $table");
+    $sth->execute();
+    undef %types;
+    while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow 
)
+    {
+        $types{$column} = $type;
+    }    # while
+    foreach $column ( keys %{ $requirefields{$table} } ) {
+        print "  Check column $column  [$types{$column}]\n"
+          if $debug and not $silent;
+        if ( !$types{$column} ) {
+
+            # column doesn't exist
+            print "Adding $column field to $table table...\n" unless $silent;
+            $query = "alter table $table
+                       add column $column " . 
$requirefields{$table}->{$column};
+            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 ) {
+    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 $key     = $row->{key};
+        my $default = $row->{default};
+        my $null    = $row->{null};
+
+        #              $default="''" unless $default;
+        my $extra = $row->{extra};
+        my $def   = $definitions->{$field};
+
+        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 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 ?"
+                  );
+            }
+            else {
+                $sth =
+                  $dbh->prepare(
+"alter table $table drop primary key, $action $field $type $null $key $extra 
default ?"
+                  );
+            }
+            $sth->execute($default);
+            print "  Alter $field in $table\n" unless $silent;
+        }
+    }
+}
+
+# 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 "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)");
+}
+
+# Populate tables with required data
+
+# synch table and deletedtable.
+foreach my $table ( ( 'borrowers', 'items', 'biblio', 'biblioitems' ) ) {
+    my %deletedborrowers;
+    print "synch'ing $table\n";
+    $sth = $dbh->prepare("show columns from deleted$table");
+    $sth->execute;
+    while ( my ( $column, $type, $null, $key, $default, $extra ) =
+        $sth->fetchrow )
+    {
+        $deletedborrowers{$column} = 1;
+    }
+    $sth = $dbh->prepare("show columns from $table");
+    $sth->execute;
+    my $previous;
+    while ( my ( $column, $type, $null, $key, $default, $extra ) =
+        $sth->fetchrow )
+    {
+        unless ( $deletedborrowers{$column} ) {
+            my $newcol = "alter table deleted$table add $column $type";
+            if ( $null eq 'YES' ) {
+                $newcol .= " NULL ";
+            }
+            else {
+                $newcol .= " NOT NULL ";
+            }
+            $newcol .= "default $default" if $default;
+            $newcol .= " after $previous" if $previous;
+            $previous = $column;
+            print "creating column $column\n";
+            $dbh->do($newcol);
+        }
+    }
+}
+
+# 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 );
+        }
+    }
+}
+foreach my $table ( keys %tabledata ) {
+    print "Checking for data required in table $table...\n" unless $silent;
+    my $tablerows = $tabledata{$table};
+    foreach my $row (@$tablerows) {
+        my $uniquefieldrequired = $row->{uniquefieldrequired};
+        my $uniquevalue         = $row->{$uniquefieldrequired};
+        my $forceupdate         = $row->{forceupdate};
+        my $sth                 =
+          $dbh->prepare(
+"select $uniquefieldrequired from $table where $uniquefieldrequired=?"
+          );
+        $sth->execute($uniquevalue);
+        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);
+        }
+    }
+}
+
+# at last, remove useless fields
+foreach $table ( keys %uselessfields ) {
+    my @fields = split /,/, $uselessfields{$table};
+    my $fields;
+    my $exists;
+    foreach my $fieldtodrop (@fields) {
+        $fieldtodrop =~ s/\t//g;
+        $fieldtodrop =~ s/\n//g;
+        $exists = 0;
+        $sth    = $dbh->prepare("show columns from $table");
+        $sth->execute;
+        while ( my ( $column, $type, $null, $key, $default, $extra ) =
+            $sth->fetchrow )
+        {
+            $exists = 1 if ( $column eq $fieldtodrop );
+        }
+        if ($exists) {
+            print "deleting $fieldtodrop field in $table...\n" unless $silent;
+            my $sth = $dbh->prepare("alter table $table drop $fieldtodrop");
+            $sth->execute;
+        }
+    }
+}    # foreach
+
+$sth->finish;
+
+exit;
+
+# $Log: updatedatabase,v $
+# Revision 1.100.2.43.4.1  2006/06/01 08:58:20  hdl
+# Building Authority trees with Unimarc Record.
+# One new field :
+# authtrees in authheader
+# one new syspref : AuthDisplayHierarchy to display trees or not.
+# Some new functions in AuthoritiesMARC:
+# BuildMarcHierarchies($authid,$force) that Builds trees and save them to 
authtrees.
+# BuildMarcHierarchy($record,$classname) which builds the string for HTML 
presentation.  (Maybe SHould just build the loops for Templates).
+# AUTHgetheader($authid) gets the header data for an authid
+# AUTHsavetrees($authid, $trees) save the trees commaseparated authid. Trees 
are separated by ;
+# e.g. : 394,327,330;16965,17374,14584,13410,13287,327,330
+#
+# A modification has been done on authsearch so that it may search in ANY 
authtypecode.
+#
+# detail.pl and tmpl has been modified to use these commands.
+#
+# 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
+#
+# Revision 1.100.2.15  2005/12/05 09:50:35  tipaul
+# New systempreference : OpacPasswordChange if set to Yes (default) the user 
can change it's password. If set to No, he can't. Useful for libraries with 
LDAP auth, where the password is checked in LDAP, not in Koha, thus Koha can't 
change it
+#
+# Revision 1.100.2.14  2005/12/05 09:41:35  tipaul
+# typo fix : NofifyBorrowerDeparture instead of NotifiyBorrowerDeparture
+#
+# Revision 1.100.2.13  2005/11/29 14:50:30  hdl
+# Adding a notice before departure of a borrower
+#
+# Revision 1.100.2.12  2005/10/25 12:36:21  tipaul
+# * adding a feature to enable reordering of subfields in MARC editor (can be 
considered as a bug ? at least one of my libraries think that yes !)
+# * as the MARC editor begins to be really heavy, i've also added a marc_hide 
systempref. It hides all marc features not requested by libraries that want 
MARC but not too much. It hides MARC tag & subfield code, reordering buttons as 
well as indicators. by default, hide_marc is off
+#
+# Revision 1.100.2.11  2005/10/06 12:16:46  tipaul
+# removing a useless systempreference
+#
+# Revision 1.100.2.10  2005/09/30 13:56:57  hdl
+# Two new system preferences:
+# SortItemsby and Disable_Dictionary
+#
+# Revision 1.100.2.9  2005/09/23 11:08:27  tipaul
+# some code cleaning, should not change anything otherwise
+#
+# Revision 1.100.2.8  2005/09/09 08:19:57  hdl
+# Undoing Logs
+#
+# Revision 1.100.2.7  2005/08/26 12:28:57  hdl
+# Adding a test on a temporary value before processing it in Biblio.pm
+# Adding branchcode fields to aqbookfund and aqbasket.
+#
+# Revision 1.100.2.6  2005/08/24 09:02:25  hdl
+# Adding a notes field into serial table.
+# Manage a note for a serial number...
+# Will allow a librarian to say "contact with supplier for this serial : Will 
be received on date...  " or anything else.
+#
+# Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+# adding a systempref to choose either to show or hide "lost" items. Note that 
"lost items" can be related to an authorised value list, so does not necessary 
mean "item definetly lost". Even here, some libraries want to see lost items, 
and some don't want. This parameter will make everybody happy !
+#
+# Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+# adding 2 systemparameters to define an alternate image as logo in opac (the 
image on main page & on each top-left page)
+#
+# Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+# adding variable SubscriptionHistory
+#
+# Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
+# * new permissions : management & tools. You now have 2 new permissions :
+#      - management : means the user can manage library parameters, but NOT 
system parameters.
+#      - parameters : means the user can manage all parameters (including 
system parameters : marc structure, authorised values, system preferences. Was 
the only flag previously existing)
+#      - tools : means the user can import/export datas & edit barcodes.
+# note that for compatibility reasons, a user having "parameters" can access 
everything.
+# * new permission scheme. In every template new variables are available. They 
are written CAN_user_permission, with permission being one of the permission 
flag. templates can now show or hidde menu entries depending on user 
permissions. For example, a user with just circ permissions should have only 
the "circulation" button on home page. Templates are NOT updated in this 
version (except for system parameters, as proof of concept), they will be in 
the next ones. But the scheme is ready.
+#
+# Revision 1.100.2.1  2005/03/17 17:15:18  tipaul
+# defaulting opacstylesheet to '' instead of 'normal' (that is stupid)
+#
+# Revision 1.100  2004/12/10 16:11:32  tipaul
+# Improvement : adding a systempref to define default view in OPAC (either 
normal, MARC or ISBD). Created automatically during install or update. Check 
that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, 
Variable type : Choice, Variable options : normal|marc|isbd
+#
+# Revision 1.99  2004/12/02 17:17:00  tipaul
+# adding acquisition permission
+#
+# Revision 1.98  2004/11/26 20:26:49  tipaul
+# bugfix for auth_header creation
+#
+# Revision 1.97  2004/11/23 09:11:08  tipaul
+# adding itemcallnumber entry
+#
+# Revision 1.96  2004/11/16 13:03:45  tipaul
+# removing ldap systempref, it's now in C4/Auth_with_ldap.pm separate package
+#
+# Revision 1.95  2004/11/08 19:57:32  tipaul
+# bugfix
+#
+# Revision 1.94  2004/09/06 10:00:29  tipaul
+# adding a "location" field to the library.
+# This field is useful when the callnumber contains no information on the room 
where the item is stored.
+# With this field, we now have 3 levels of informations to find a book :
+# * the branch.
+# * the location.
+# * the callnumber.
+#
+# This should be versatile enough to solve any storing method.
+# This hack is quite simple, due to the nice Biblio.pm API. The MARC => koha 
db link is automatically managed. Just add the link in the parameters section.
+#
+# Revision 1.93  2004/08/12 14:50:50  tipaul
+# bugfixes
+#
+# Revision 1.92  2004/08/06 16:38:42  tipaul
+# changing DB structure to calculate next issue number.
+# Seems to work fine.
+#
+# Still misses the date calculation & the test of end of subscription (maybe 
for monday ?)
+#
+# Revision 1.91  2004/07/15 09:52:28  tipaul
+# Acquisition & Suggestion :
+# * acquisition rewritte : create a aqbasket table to deal with "bookseller 
order header".
+# * add "close basket" feature : a closed basket can't be modified
+# * suggestion feature : manage suggestions in acquisition (after suggestion 
filled in OPAC)
+#
+# Revision 1.90  2004/07/06 08:24:18  tipaul
+# adding 2 free fields that can be used for sorting purposes
+#
+# Revision 1.89  2004/07/02 15:55:08  tipaul
+# Adding 2 new fields, called "sort1" and "sort2"
+# They can be used for sorting & statistics reasons by the library.
+#
+# Revision 1.88  2004/06/26 23:34:26  rangi
+# Fixing typo
+#
+# Revision 1.87  2004/06/23 13:03:09  tipaul
+# fixes in DB structure
+#
+# Revision 1.86  2004/06/22 11:30:57  tipaul
+# adding -s (silent) flag, to have a silent install.
+# only updater will be verbose
+#
+# Revision 1.85  2004/06/17 15:19:44  tipaul
+# missing Marc_Search index on marc_word
+#
+# Revision 1.84  2004/06/17 08:25:21  tipaul
+# DB modifs : merging tag & subfield in marc_word table
+#
+# Revision 1.83  2004/06/10 08:32:02  tipaul
+# MARC authority management (continued)
+#
+# Revision 1.82  2004/06/03 12:46:58  tipaul
+# * frameworks and itemtypes are independant
+#
+# WARNING : will work only if applied to a 2.0 base. some modifs have been 
done since last commit that will NOT be applied if you run updatedatabase again.
+#
+# Revision 1.81  2004/05/28 09:56:21  tipaul
+# bugfix
+#
+# Revision 1.80  2004/05/28 08:32:00  tipaul
+# adding :
+# * MARC authority file
+# * seealso & hidden in MARC biblio structure.
+#
+# Revision 1.79  2004/05/18 09:50:07  tipaul
+# *** empty log message ***
+#
+# Revision 1.78  2004/05/10 09:29:33  tipaul
+# css is now the default theme for OPAC.
+# It will be the theme used for improvements and new things in OPAC.
+#
+# Revision 1.77  2004/05/06 14:56:51  tipaul
+# adding table issuingrules (previously called categoryitem
+#
+# Revision 1.76  2004/05/03 09:32:25  tipaul
+# adding printcirculationsplit parameter (already existed, but was not in 
systempref by defaul)
+#
+# Revision 1.75  2004/04/14 19:49:00  tipaul
+# seealso field set to 255 chars
+#
+# Revision 1.74  2004/03/11 16:10:16  tipaul
+# *** empty log message ***
+#
+# Revision 1.73  2004/03/06 20:26:13  tipaul
+# adding seealso feature in MARC searches
+#




reply via email to

[Prev in Thread] Current Thread [Next in Thread]