fix for bug #163

[koha.git] / loadmodules.pl

diff --git a/loadmodules.pl b/loadmodules.pl
index 8c7d64a..ed51f05 100755 (executable)
--- a/loadmodules.pl
+++ b/loadmodules.pl
@@ -4,35 +4,61 @@
 #written 4/2/00 by chris@katipo.co.nz
 #called as an include by the acquisitions index page
 
-use C4::Acquisitions;
-use C4::Search;
+
+# 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
+
+use C4::Context;
 use CGI;
 my $input=new CGI;
 
 my $module=$input->param('module');
 
 SWITCH: {
-    if ($module eq 'acquisitions') { acquisitions(); last SWITCH; }
-    if ($module eq 'somethingelse') { somethingelse(); last SWITCH; }
+       if ($module eq 'acquisitions') { acquisitions(); last SWITCH; }
+       if ($module eq 'search') { catalogue_search(); last SWITCH; }
+       if ($module eq 'somethingelse') { somethingelse(); last SWITCH; }
 }
 
 
 sub acquisitions {
-    # FIXME
-    # instead of getting a hash, then reading/writing to it at least twice 
-    # and up to four times, maybe this should be a different function -
-    # areAquisitionsSimple() which returns a boolean
-    my %systemprefs=systemprefs();
-    ($systemprefs{'acquisitions'}) || ($systemprefs{'acquisitions'}='normal');
-    if ($systemprefs{'acquisitions'} eq 'simple') {
-       print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
-    } elsif ($systemprefs{'acquisitions'} eq 'normal') {
-       print $input ->redirect("/acquisitions");
-    } else {
-       print $input ->redirect("/acquisitions");
-    }
+       my $aq_type = C4::Context->preference("acquisitions") || "normal";
+               # Get the acquisition preference. This should be:
+               #       "simple" - minimal information required
+               #       "normal" - full information required
+               #       other - Same as "normal"
+
+       if ($aq_type eq 'simple') {
+               print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
+       } elsif ($aq_type eq 'normal') {
+               print $input ->redirect("/acquisitions");
+       } else {
+               print $input ->redirect("/acquisitions");
+       }
 }
 
+sub catalogue_search {
+       my $aq_type = C4::Context->preference("marc") || "ON";
+       if ($aq_type eq 'ON') {
+               print $input->redirect("/cgi-bin/koha/search.marc/search.pl");
+       } else {
+               print $input ->redirect("/cgi-bin/koha/catalogue-home.pl");
+       }
+}
 
 sub somethingelse {
 # just an example subroutine