missing Marc_Search index on marc_word

[koha.git] / loadmodules.pl

diff --git a/loadmodules.pl b/loadmodules.pl
index 3503093..d87da09 100755 (executable)
--- a/loadmodules.pl
+++ b/loadmodules.pl
@@ -31,34 +31,55 @@ my $module=$input->param('module');
 SWITCH: {
        if ($module eq 'acquisitions') { acquisitions(); last SWITCH; }
        if ($module eq 'search') { catalogue_search(); last SWITCH; }
+       if ($module eq 'addbiblio') {addbiblio(); 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"
+       my $aq_type = $input->param('acquisitions');
+       $aq_type = C4::Context->preference("acquisitions") || "normal" unless $aq_type;
+       my $marc_bool =$input->param('MARC');
+       $marc_bool = C4::Context->boolean_preference('marc') || 0 unless $marc_bool;
+       # 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");
+                       print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
        } else {
-               print $input ->redirect("/acquisitions");
+               print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
        }
 }
 
+sub addbiblio {
+       my $marc_bool = C4::Context->boolean_preference("MARC") || 0;
+               if ($marc_bool eq "1") {
+                       print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
+               } else {
+                       print $input->redirect("/cgi-bin/koha/acqui.simple/addbiblio-nomarc.pl");
+               }
+}
+
 sub catalogue_search {
-       my $aq_type = C4::Context->preference("marc") || "ON";
+       my $marc_p = $input->param('marc');
+       $marc_p = C4::Context->boolean_preference('marc') unless defined $marc_p;
+       $marc_p = 'ON' unless defined $marc_p;
+       my $keyword=$input->param('keyword');
        my $query = new CGI;
        my $type = $query->param('type');
-       if ($aq_type eq 'ON') {
-               print $input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$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");
+               }
        }
 }