fix for #422

[koha.git] / loadmodules.pl

diff --git a/loadmodules.pl b/loadmodules.pl
index 93e9115..785b881 100755 (executable)
--- a/loadmodules.pl
+++ b/loadmodules.pl
@@ -22,36 +22,67 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-use C4::Acquisitions;
-use C4::Biblio;
-use C4::Search;
+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 'MARC') {marc(); 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");
+    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("/cgi-bin/koha/acqui/acqui-home.pl"); 
     } else {
-       print $input ->redirect("/acquisitions");
+       print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
     }
 }
 
+sub catalogue_search {
+       my $marc_p = C4::Context->boolean_preference("marc");
+       $marc_p = 1 unless defined $marc_p;
+       my $keyword=$input->param('keyword');
+       my $query = new CGI;
+       my $type = $query->param('type');
+       if ($keyword) {
+               if ($marc_p) {
+                       print $input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$type");
+               } else {
+                       print $input ->redirect("/cgi-bin/koha/search.pl?keyword=$keyword");
+               }
+       } else {
+               if ($marc_p) {
+                       print $input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$type");
+               } else {
+                       print $input ->redirect("/cgi-bin/koha/catalogue-home.pl");
+               }
+       }
+}
+
+sub marc {
+#      my $marc_p = C4::Context->boolean_preference("marc");
+#      $marc_p = 1 unless defined $marc_p;
+#      my $query = new CGI;
+#      my $type = $query->param('type');
+#      if ($marc_p) {
+#              print $input->redirect("/cgi-bin/koha/cataloguing.marc/cataloguing-home.pl");
+#      } else {
+               print $input ->redirect("/cgi-bin/koha/acqui.simple/isbnsearch.pl");
+#      }
+}
 
 sub somethingelse {
 # just an example subroutine