fix for #422

[koha.git] / loadmodules.pl

diff --git a/loadmodules.pl b/loadmodules.pl
index ed51f05..785b881 100755 (executable)
--- a/loadmodules.pl
+++ b/loadmodules.pl
@@ -31,35 +31,59 @@ my $module=$input->param('module');
 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 {
-       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");
-       }
+    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("/cgi-bin/koha/acqui/acqui-home.pl");
+    }
 }
 
 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");
+       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 {
-               print $input ->redirect("/cgi-bin/koha/catalogue-home.pl");
+               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
 }