X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=cgi-files%2FModules%2FDatabase%2FSQLite.pm;h=77366c490bc42136d09ea5c9285da15e7a9fea62;hb=f4287e42a5e96cffe70d84a3c659d5be3eab46d5;hp=28c7cba71febc787a5fea67363125b78b1b1e156;hpb=9379933d4d112578e469053a691dfbb4873384f7;p=kiriwrite%2F.git diff --git a/cgi-files/Modules/Database/SQLite.pm b/cgi-files/Modules/Database/SQLite.pm index 28c7cba..77366c4 100644 --- a/cgi-files/Modules/Database/SQLite.pm +++ b/cgi-files/Modules/Database/SQLite.pm @@ -605,11 +605,11 @@ sub getdblist{ foreach $database (@data_directory){ - $database =~ s/.db.sqlite$//g; + $database =~ s/.db.sqlite$//og; $database_filename_friendly = $database; #$database_filename_length = length($database); - #$database_filename_friendly = substr($database, 0, $database_filename_length - 3); + #$database_filename_friendly = substr($database, 0, $database_filename_length - 10); push(@data_directory_final, $database_filename_friendly); } @@ -1204,6 +1204,12 @@ sub getpageinfo{ my $page_filename = $passedoptions->{"PageFilename"}; my $page_reduced = $passedoptions->{"Reduced"}; + if (!$page_reduced){ + + $page_reduced = 0; + + } + if ($page_reduced eq 1){ $string_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); @@ -1524,6 +1530,8 @@ sub editpage{ # Check if there is a page that already exists with the new # filename. + $page_found = 0; + if ($page_filename ne $page_newfilename){ $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_newfilename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); @@ -2153,11 +2161,11 @@ sub addfilter{ } - # Check if there were any filters in the filters database. + # Check if there were any filters in the filter database. if (!$filter_count && !$new_id){ - # There were no filters in the filters database so set + # There were no filters in the filter database so set # the new filter identification value to 1. $new_id = 1;