From 29b4d2d534e1db9bfd64b1f12a446d22c17befbd Mon Sep 17 00:00:00 2001 From: tonnesen Date: Thu, 20 Jun 2002 17:57:11 +0000 Subject: [PATCH] merges from rel-1-2. Starting to get a little longer now. Being very careful. --- C4/Database.pm | 21 +++++++++++++++++++-- Hints | 17 +++++++++++++---- modbibitem.pl | 4 ++-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/C4/Database.pm b/C4/Database.pm index 34ebeb5735..da25d4a8ac 100755 --- a/C4/Database.pm +++ b/C4/Database.pm @@ -10,7 +10,9 @@ use vars qw($VERSION @ISA @EXPORT); $VERSION = 0.01; @ISA = qw(Exporter); -@EXPORT = qw(&C4Connect); +@EXPORT = qw( + &C4Connect &requireDBI +); sub C4Connect { @@ -38,7 +40,22 @@ sub C4Connect { my $dbh=DBI->connect("DBI:mysql:$database:$hostname",$user,$pass); return $dbh; -} +} # sub C4Connect + +#------------------ +# Helper subroutine to make sure database handle was passed properly +sub requireDBI { + my ( + $dbh, + $subrname, # name of calling subroutine + )=@_; + + unless ( ref($dbh) =~ /DBI::db/ ) { + print "
\nERROR: Subroutine $subrname called without proper DBI handle.\n" .
+		"Please contact system administrator.\n
\n"; + die "ERROR: Subroutine $subrname called without proper DBI handle.\n"; + } +} # sub requireDBI END { } diff --git a/Hints b/Hints index e20fb3ad1e..e697ce7314 100644 --- a/Hints +++ b/Hints @@ -1,11 +1,14 @@ Example /etc/koha.conf file entries - + database=Koha hostname=localhost user=Koha pass=xxxxxx includes=/usr/local/www/koha/htdocs/includes -Please note the final line (includes=path) - The path entry can be used as an alternative to manually editing the path in Output.pm file (see INSTALL manual). + +Please note the final line (includes=path) - The path entry can be +used as an alternative to manually editing the path in Output.pm file +(see INSTALL manual). -------------------------------------------------------------------------------- @@ -14,7 +17,9 @@ Koha makes extensive use of Server Side Includes (SSI): http://httpd.apache.org/docs/mod/mod_include.html -If your page headers and footers do not show, then you may need to re-configure your web server. + +If your page headers and footers do not show, then you may need to +re-configure your web server. Here is an example of entries suitable for Apache httpd.conf: @@ -87,4 +92,8 @@ Here is an example of entries suitable for Apache httpd.conf: -Read your web server docs for more information about how Server Side Includes work. +Read your web server docs for more information about how Server Side +Includes work. + + + diff --git a/modbibitem.pl b/modbibitem.pl index d9555b002d..e0ca8e238f 100755 --- a/modbibitem.pl +++ b/modbibitem.pl @@ -29,7 +29,7 @@ print $input->header; #my ($analytictitle)=analytic($biblionumber,'t'); #my ($analyticauthor)=analytic($biblionumber,'a'); print startpage(); -print startmenu(); +print startmenu('catalogue'); my %inputs; #hash is set up with input name being the key then @@ -72,7 +72,7 @@ print < {'biblionumber'}&type=intra>$data->{'title'} ($data->{'author'})
Modify Group - $data->{'description'}

-
+ -- 2.39.5