package C4::Context; # 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$ use strict; use DBI; use ZOOM; use XML::Simple; use C4::Boolean; use vars qw($VERSION $AUTOLOAD), qw($context), qw(@context_stack); $VERSION = do { my @v = '$Revision$' =~ /\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.xml"); $config_value = C4::Context->config("config_variable"); $koha_preference = C4::Context->preference("preference"); $db_handle = C4::Context->dbh; $Zconn = C4::Context->Zconn; $stopwordhash = C4::Context->stopwords; =head1 DESCRIPTION When a Koha script runs, it makes use of a certain number of things: configuration settings in F, a connection to the Koha databases, and so forth. These things make up the I 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. 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.xml). # 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. # Zconn # A connection object for the Zebra server use constant CONFIG_FNAME => "/etc/koha.xml"; # Default config file, if none is specified $context = undef; # Initially, no context is set @context_stack = (); # Initially, no saved contexts =item KOHAVERSION returns the kohaversion stored in kohaversion.pl file =cut sub KOHAVERSION { my $cgidir = C4::Context->intranetdir ."/cgi-bin"; unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) { $cgidir = C4::Context->intranetdir; } do $cgidir."/kohaversion.pl" || die "NO $cgidir/kohaversion.pl"; return kohaversion(); } =item read_config_file =over 4 Reads the specified Koha config file. Returns an object containing the configuration variables. The object's structure is a bit complex to the uninitiated ... take a look at the koha.xml file as well as the XML::Simple documentation for details. Or, here are a few examples that may give you what you need: The simple elements nested within the element: my $pass = $koha->{'config'}->{'pass'}; The elements: my $listen = $koha->{'listen'}->{'biblioserver'}->{'content'}; The elements nested within the element: my $ccl2rpn = $koha->{'server'}->{'biblioserver'}->{'cql2rpn'}; Returns undef in case of error. =back =cut sub read_config_file { my $fname = shift; # Config file to read my $retval = {}; # Return value: ref-to-hash holding the configuration my $koha = XMLin($fname, keyattr => ['id'],forcearray => ['listen', 'server', 'serverinfo']); return $koha; } # 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.xml"); 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. 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; } # Load the desired config file. $self = read_config_file($conf_fname); $self->{"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->{"Zconn"} = undef; # Zebra Connections $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 Cnew> 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}; } sub zebraconfig { my $self = shift; my $var = shift; # The config variable to return return undef if !defined($context->{"server"}); # 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->{"server"}->{$var}; } sub ModZebrations { my $self = shift; my $var = shift; # The config variable to return return undef if !defined($context->{"serverinfo"}); # 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->{"serverinfo"}->{$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 if ($dbh){ my $sth; # Database query handle # Look up systempreferences.variable==$var $retval = $dbh->selectrow_array(<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); } =item Zconn $Zconn = C4::Context->Zconn Returns a connection to the Zebra database for the current context. If no connection has yet been made, this method creates one and connects. C<$self> C<$server> one of the servers defined in the koha.xml file C<$async> whether this is a asynchronous connection C<$auth> whether this connection has rw access (1) or just r access (0 or NULL) =cut sub Zconn { my $self=shift; my $server=shift; my $async=shift; my $auth=shift; my $piggyback=shift; my $syntax=shift; if ( defined($context->{"Zconn"}->{$server}) ) { return $context->{"Zconn"}->{$server}; # No connection object or it died. Create one. }else { $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax); return $context->{"Zconn"}->{$server}; } } =item _new_Zconn $context->{"Zconn"} = &_new_Zconn($server,$async); Internal function. Creates a new database connection from the data given in the current context and returns it. C<$server> one of the servers defined in the koha.xml file C<$async> whether this is a asynchronous connection C<$auth> whether this connection has rw access (1) or just r access (0 or NULL) =cut sub _new_Zconn { my ($server,$async,$auth,$piggyback,$syntax) = @_; my $tried=0; # first attempt my $Zconn; # connection object $server = "biblioserver" unless $server; $syntax = "usmarc" unless $syntax; my $host = $context->{'listen'}->{$server}->{'content'}; my $user = $context->{"serverinfo"}->{$server}->{"user"}; my $servername = $context->{"config"}->{$server}; my $password = $context->{"serverinfo"}->{$server}->{"password"}; retry: eval { # set options my $o = new ZOOM::Options(); $o->option(async => 1) if $async; $o->option(count => $piggyback) if $piggyback; $o->option(cqlfile=> $context->{"server"}->{$server}->{"cql2rpn"}); $o->option(cclfile=> $context->{"serverinfo"}->{$server}->{"ccl2rpn"}); $o->option(preferredRecordSyntax => $syntax); $o->option(elementSetName => "F"); # F for 'full' as opposed to B for 'brief' $o->option(user=>$user) if $auth; $o->option(password=>$password) if $auth; $o->option(databaseName => ($servername?$servername:"biblios")); # create a new connection object $Zconn= create ZOOM::Connection($o); # forge to server $Zconn->connect($host, 0); # check for errors and warn if ($Zconn->errcode() !=0) { warn "something wrong with the connection: ". $Zconn->errmsg(); } }; # if ($@) { # # Koha manages the Zebra server -- this doesn't work currently for me because of permissions issues # # Also, I'm skeptical about whether it's the best approach # warn "problem with Zebra"; # if ( C4::Context->preference("ManageZebra") ) { # if ($@->code==10000 && $tried==0) { ##No connection try restarting Zebra # $tried=1; # warn "trying to restart Zebra"; # my $res=system("zebrasrv -f $ENV{'KOHA_CONF'} >/koha/log/zebra-error.log"); # goto "retry"; # } else { # warn "Error ", $@->code(), ": ", $@->message(), "\n"; # $Zconn="error"; # return $Zconn; # } # } # } return $Zconn; } # _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 { ##correct name for db_schme my $db_driver; if ($context->config("db_scheme")){ $db_driver=db_scheme2dbi($context->config("db_scheme")); }else{ $db_driver="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); # Koha 3.0 is utf-8, so force utf8 communication between mySQL and koha, whatever the mysql default config. # this is better than modifying my.cnf (and forcing all communications to be in utf8) $dbh->do("set NAMES 'utf8'") if ($dbh); $dbh->{'mysql_enable_utf8'}=1; #enable 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 Cdbh> 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 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 Cset_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 Cmarcfromkohafield> 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 Cstopwords> 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 Cuserenv> 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}); # insecure=1 management if ($context->{"dbh"} && $context->preference('insecure')) { my %insecure; $insecure{flags} = '16382'; $insecure{branchname} ='Insecure', $insecure{number} ='0'; $insecure{cardnumber} ='0'; $insecure{id} = 'insecure'; $insecure{branch} = 'INS'; $insecure{emailaddress} = 'test@mode.insecure.com'; return \%insecure; } else { return 0; } } =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 Cuserenv> 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, $branchname, $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" => $branchname, "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 Cuserenv> 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 Specifies the configuration file to read. =back =head1 SEE ALSO =head1 AUTHORS Andrew Arensburger Joshua Ferraro =cut # $Log$ # Revision 1.57 2007/05/22 09:13:55 tipaul # Bugfixes & improvements (various and minor) : # - updating templates to have tmpl_process3.pl running without any errors # - adding a drupal-like css for prog templates (with 3 small images) # - fixing some bugs in circulation & other scripts # - updating french translation # - fixing some typos in templates # # Revision 1.56 2007/04/23 15:21:17 tipaul # renaming currenttransfers to transferstoreceive # # Revision 1.55 2007/04/17 08:48:00 tipaul # circulation cleaning continued: bufixing # # Revision 1.54 2007/03/29 16:45:53 tipaul # Code cleaning of Biblio.pm (continued) # # All subs have be cleaned : # - removed useless # - merged some # - reordering Biblio.pm completly # - using only naming conventions # # Seems to have broken nothing, but it still has to be heavily tested. # Note that Biblio.pm is now much more efficient than previously & probably more reliable as well. # # Revision 1.53 2007/03/29 13:30:31 tipaul # Code cleaning : # == Biblio.pm cleaning (useless) == # * some sub declaration dropped # * removed modbiblio sub # * removed moditem sub # * removed newitems. It was used only in finishrecieve. Replaced by a TransformKohaToMarc+AddItem, that is better. # * removed MARCkoha2marcItem # * removed MARCdelsubfield declaration # * removed MARCkoha2marcBiblio # # == Biblio.pm cleaning (naming conventions) == # * MARCgettagslib renamed to GetMarcStructure # * MARCgetitems renamed to GetMarcItem # * MARCfind_frameworkcode renamed to GetFrameworkCode # * MARCmarc2koha renamed to TransformMarcToKoha # * MARChtml2marc renamed to TransformHtmlToMarc # * MARChtml2xml renamed to TranformeHtmlToXml # * zebraop renamed to ModZebra # # == MARC=OFF == # * removing MARC=OFF related scripts (in cataloguing directory) # * removed checkitems (function related to MARC=off feature, that is completly broken in head. If someone want to reintroduce it, hard work coming...) # * removed getitemsbybiblioitem (used only by MARC=OFF scripts, that is removed as well) # # Revision 1.52 2007/03/16 01:25:08 kados # Using my precrash CVS copy I did the following: # # cvs -z3 -d:ext:kados@cvs.savannah.nongnu.org:/sources/koha co -P koha # find koha.precrash -type d -name "CVS" -exec rm -v {} \; # cp -r koha.precrash/* koha/ # cd koha/ # cvs commit # # This should in theory put us right back where we were before the crash # # Revision 1.52 2007/03/12 21:17:05 rych # add server, serverinfo as arrays from config # # Revision 1.51 2007/03/09 14:31:47 tipaul # rel_3_0 moved to HEAD # # Revision 1.43.2.10 2007/02/09 17:17:56 hdl # Managing a little better database absence. # (preventing from BIG 550) # # Revision 1.43.2.9 2006/12/20 16:50:48 tipaul # improving "insecure" management # # WARNING KADOS : # you told me that you had some libraries with insecure=ON (behind a firewall). # In this commit, I created a "fake" user when insecure=ON. It has a fake branch. You may find better to have the 1st branch in branch table instead of a fake one. # # Revision 1.43.2.8 2006/12/19 16:48:16 alaurin # reident programs, and adding branchcode value in reserves # # Revision 1.43.2.7 2006/12/06 21:55:38 hdl # Adding ModZebrations for servers to get serverinfos in Context.pm # Using this function in rebuild_zebra.pl # # Revision 1.43.2.6 2006/11/24 21:18:31 kados # very minor changes, no functional ones, just comments, etc. # # Revision 1.43.2.5 2006/10/30 13:24:16 toins # fix some minor POD error. # # Revision 1.43.2.4 2006/10/12 21:42:49 hdl # Managing multiple zebra connections # # Revision 1.43.2.3 2006/10/11 14:27:26 tipaul # removing a warning # # Revision 1.43.2.2 2006/10/10 15:28:16 hdl # BUG FIXING : using database name in Zconn if defined and not hard coded value # # Revision 1.43.2.1 2006/10/06 13:47:28 toins # Synch with dev_week. # /!\ WARNING :: Please now use the new version of koha.xml. # # Revision 1.18.2.5.2.14 2006/09/24 15:24:06 kados # remove Zebraauth routine, fold the functionality into Zconn # Zconn can now take several arguments ... this will probably # change soon as I'm not completely happy with the readability # of the current format ... see the POD for details. # # cleaning up Biblio.pm, removing unnecessary routines. # # DeleteBiblio - used to delete a biblio from zebra and koha tables # -- checks to make sure there are no existing issues # -- saves backups of biblio,biblioitems,items in deleted* tables # -- does commit operation # # getRecord - used to retrieve one record from zebra in piggyback mode using biblionumber # brought back z3950_extended_services routine # # Lots of modifications to Context.pm, you can now store user and pass info for # multiple servers (for federated searching) using the element. # I'll commit my koha.xml to demonstrate this or you can refer to the POD in # Context.pm (which I also expanded on). # # Revision 1.18.2.5.2.13 2006/08/10 02:10:21 kados # Turned warnings on, and running a search turned up lots of warnings. # Cleaned up those ... # # removed getitemtypes from Koha.pm (one in Search.pm looks newer) # removed itemcount from Biblio.pm # # made some local subs local with a _ prefix (as they were redefined # elsewhere) # # Add two new search subs to Search.pm the start of a new search API # that's a bit more scalable # # Revision 1.18.2.5.2.10 2006/07/21 17:50:51 kados # moving the *.properties files to intranetdir/etc dir # # Revision 1.18.2.5.2.9 2006/07/17 08:05:20 tipaul # there was a hardcoded link to /koha/etc/ I replaced it with intranetdir config value # # Revision 1.18.2.5.2.8 2006/07/11 12:20:37 kados # adding ccl and cql files ... Tumer, if you want to fit these into the # config file by all means do. # # Revision 1.18.2.5.2.7 2006/06/04 22:50:33 tgarip1957 # We do not hard code cql2rpn conversion file in context.pm our koha.xml configuration file already describes the path for this file. # At cql searching we use method CQL not CQL2RPN as the cql2rpn conversion file is defined at server level # # Revision 1.18.2.5.2.6 2006/06/02 23:11:24 kados # Committing my working dev_week. It's been tested only with # searching, and there's quite a lot of config stuff to set up # beforehand. As things get closer to a release, we'll be making # some scripts to do it for us # # Revision 1.18.2.5.2.5 2006/05/28 18:49:12 tgarip1957 # This is an unusual commit. The main purpose is a working model of Zebra on a modified rel2_2. # Any questions regarding these commits should be asked to Joshua Ferraro unless you are Joshua whom I'll report to # # Revision 1.36 2006/05/09 13:28:08 tipaul # adding the branchname and the librarian name in every page : # - modified userenv to add branchname # - modifier menus.inc to have the librarian name & userenv displayed on every page. they are in a librarian_information div. # # Revision 1.35 2006/04/13 08:40:11 plg # bug fixed: typo on Zconnauth name # # Revision 1.34 2006/04/10 21:40:23 tgarip1957 # A new handler defined for zebra Zconnauth with read/write permission. Zconnauth should only be called in biblio.pm where write operations are. Use of this handler will break things unless koha.conf contains new variables: # zebradb=localhost # zebraport= # zebrauser= # zebrapass= # # The zebra.cfg file should read: # perm.anonymous:r # perm.username:rw # passw.c: # # Password file should be prepared with Apaches htpasswd utility in encrypted mode and should exist in a folder zebra.cfg can read # # Revision 1.33 2006/03/15 11:21:56 plg # bug fixed: utf-8 data where not displayed correctly in screens. Supposing # your data are truely utf-8 encoded in your database, they should be # correctly displayed. "set names 'UTF8'" on mysql connection (C4/Context.pm) # is mandatory and "binmode" to utf8 (C4/Interface/CGI/Output.pm) seemed to # converted data twice, so it was removed. # # Revision 1.32 2006/03/03 17:25:01 hdl # Bug fixing : a line missed a comment sign. # # Revision 1.31 2006/03/03 16:45:36 kados # Remove the search that tests the Zconn -- warning, still no fault # tollerance # # Revision 1.30 2006/02/22 00:56:59 kados # First go at a connection object for Zebra. You can now get a # connection object by doing: # # my $Zconn = C4::Context->Zconn; # # My initial tests indicate that as soon as your funcion ends # (ie, when you're done doing something) the connection will be # closed automatically. There may be some other way to make the # connection more stateful, I'm not sure... # # Local Variables: # tab-width: 4 # End: