X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=loadmodules.pl;h=d87da097f0a5d109a466faf62a543949055024d9;hb=246170e5ceab5f0868e7eed20e2c44d1274cbc81;hp=d70560b2c66c9dd0026475bf6f1affdf617d092b;hpb=2ec783b0efe1917a5613c9a8bccfb704b461a38f;p=koha.git

diff --git a/loadmodules.pl b/loadmodules.pl
index d70560b2c6..d87da097f0 100755
--- a/loadmodules.pl
+++ b/loadmodules.pl
@@ -29,27 +29,59 @@ 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 '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"
-
-    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 = $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");
+	} else {
+		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 $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 ($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 somethingelse {
 # just an example subroutine