Version 0.3.0

[kiriwrite/.git] / cgi-files / lib / compile.lib

diff --git a/cgi-files/lib/compile.lib b/cgi-files/lib/compile.lib
index 9a9f787..3b667dd 100644 (file)
--- 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});