X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=cgi-files%2Flib%2Fcompile.lib;h=3b667dd560616d635fdfdbb8c480decc5cfd0ebc;hb=d458266114d02c64d7ad9b3b0d3348c60742aec9;hp=9a9f7874e3aa01c690f65f668a04ec1f2f3a99c4;hpb=aee5e67f9791c7be0f258e1491b2ee8f323bf04b;p=kiriwrite%2F.git

diff --git a/cgi-files/lib/compile.lib b/cgi-files/lib/compile.lib
index 9a9f787..3b667dd 100644
--- a/cgi-files/lib/compile.lib
+++ b/cgi-files/lib/compile.lib
@@ -187,7 +187,8 @@ sub kiriwrite_compile_makepages{
 #										#
 # Usage:									#
 #										#
-# kiriwrite_compile_makepages(type, selectedlist, confirm);			#
+# kiriwrite_compile_makepages(type, selectedlist, override, overridetemplate,	#
+#				confirm);					#
 #										#
 # type			Specifies if single or multiple databases are to be 	#
 #			compiled.						#
@@ -211,8 +212,14 @@ sub kiriwrite_compile_makepages{
 	# is "on" or blank and if it is something else then
 	# return an error.
 
+	if (!$override){
+
+		$override = "off";
+
+	}
+
 	if ($override eq "on"){
-	} elsif (!$override){
+	} elsif (!$override || $override eq "off"){
 	} else {
 
 		# The override value is invalid so return an error.
@@ -461,6 +468,17 @@ sub kiriwrite_compile_makepages{
 
 					%filter_info = $kiriwrite_dbmodule->getfilterinfo({ FilterID => $filter, Reduced => 1 });
 
+					# Check if the filter is enabled and if it isn't then process
+					# the next filter.
+
+					if (!$filter_info{"FilterEnabled"}){
+
+						# The filter is not enabled so process the next filter.
+
+						next;
+
+					}
+
 					# Check if any errors occured while getting the filter information.
 
 					if ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
@@ -1974,6 +1992,8 @@ sub kiriwrite_compile_list{
 
 	if (@permissions_list){
 
+ 		$kiriwrite_presmodule->addlinebreak();
+
  		$kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseinvalidpermissions}, { Style => "smallpageheader" });
  		$kiriwrite_presmodule->addlinebreak();
  		$kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseinvalidpermissionstext});
@@ -1985,14 +2005,15 @@ sub kiriwrite_compile_list{
  			$kiriwrite_presmodule->addtext($database);
  
  		}
- 
- 		$kiriwrite_presmodule->addlinebreak();
- 		$kiriwrite_presmodule->addlinebreak();
 
+ 		$kiriwrite_presmodule->addlinebreak();
+ 
 	}
 
 	if (@error_list){
 
+ 		$kiriwrite_presmodule->addlinebreak();
+
 		$kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseerrors}, { Style => "smallpageheader" });
 		$kiriwrite_presmodule->addlinebreak();
 		$kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseerrorstext});