X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=loadmodules.pl;h=59e873109fe3efff2189e4377de804c3c8badb77;hb=bc78a821031584da763574fc3655ae757335aa39;hp=52918453e47e47d5a801da34e444ce7ff9779fd9;hpb=850a3e41f6997a32f3077d78c263a324c5da163d;p=koha.git

diff --git a/loadmodules.pl b/loadmodules.pl
index 52918453e4..59e873109f 100755
--- a/loadmodules.pl
+++ b/loadmodules.pl
@@ -31,35 +31,60 @@ 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->preference("MARC") ||"OFF" 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");
+		if ($marc_bool eq "ON") {
+			print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
+		} else {
+			print $input->redirect("/cgi-bin/koha/acqui.simple/addbiblio-nomarc.pl");
+		}
 	} else {
-		print $input ->redirect("/acquisitions");
+		print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
 	}
 }
 
+sub addbiblio {
+	my $marc_bool = C4::Context->preference("MARC") ||"OFF";
+		if ($marc_bool eq "ON") {
+			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 = C4::Context->boolean_preference("marc");
-	$marc_p = 1 unless defined $aq_type;
+	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 ($marc_p) {
-		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");
+		}
 	}
 }