X-Git-Url: http://Server1/repobrowser/?p=kiriwrite%2F.git;a=blobdiff_plain;f=cgi-files%2FModules%2FDatabase%2FSQLite.pm;h=6fc34b4e21ad3d8f5ae6288f84a16fcf59b25672;hp=72ae6a5b192340da096250d802fc02f709f18353;hb=807fbc25c35ea3cdf16adcb2106fbb63b3511a68;hpb=c72938e207f71a44f0661a1e0c335123f3f404e4 diff --git a/cgi-files/Modules/Database/SQLite.pm b/cgi-files/Modules/Database/SQLite.pm index 72ae6a5..6fc34b4 100644 --- a/cgi-files/Modules/Database/SQLite.pm +++ b/cgi-files/Modules/Database/SQLite.pm @@ -21,10 +21,11 @@ # Define the package (perl module) name. -package Kiriwrite::Database::SQLite; +package Modules::Database::SQLite; # Enable strict and use warnings. +use Modules::System::Common; use strict; use warnings; @@ -34,23 +35,23 @@ use DBI qw(:sql_types); # Set the following values. -our $VERSION = "0.1.0"; +our $VERSION = "0.5.0"; my ($options, %options); my $database_handle; -my $string_handle; +my $statement_handle; my $error = ""; my $errorext = ""; my $database_filename; my $second_database_filename; my $second_database_handle; -my $second_string_handle; +my $second_statement_handle; my $templatedb_loaded = 0; my $templatedb_exists = 1; -my $template_string_handle; +my $template_statement_handle; my $template_database_handle; my $filterdb_loaded = 0; my $filterdb_exists = 1; -my $filterdb_string_handle; +my $filterdb_statement_handle; my $filterdb_database_handle; @@ -638,12 +639,12 @@ sub getdatabaseinfo{ $error = ""; $errorext = ""; - $string_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or ( + $statement_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); - @sqldata = $string_handle->fetchrow_array(); + @sqldata = $statement_handle->fetchrow_array(); # Process the database information into a hash. @@ -657,8 +658,8 @@ sub getdatabaseinfo{ "Revision" => $sqldata[6] ); - $string_handle->finish(); - undef $string_handle; + $statement_handle->finish(); + undef $statement_handle; return %databaseinfo; @@ -683,12 +684,12 @@ sub getseconddatabaseinfo{ $error = ""; $errorext = ""; - $second_string_handle = $second_database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or ( + $second_statement_handle = $second_database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $second_database_handle->errstr, return ); - $second_string_handle->execute(); + $second_statement_handle->execute(); - @sqldata = $second_string_handle->fetchrow_array(); + @sqldata = $second_statement_handle->fetchrow_array(); # Process the database information into a hash. @@ -702,8 +703,8 @@ sub getseconddatabaseinfo{ "Revision" => $sqldata[6] ); - $second_string_handle->finish(); - undef $second_string_handle; + $second_statement_handle->finish(); + undef $second_statement_handle; return %databaseinfo; @@ -763,7 +764,7 @@ sub adddatabase{ $database_handle = DBI->connect("dbi:SQLite:dbname=" . $options{"Directory"} . '/' . $dbfilename . ".db.sqlite"); $database_handle->{unicode} = 1; - $string_handle = $database_handle->prepare('CREATE TABLE kiriwrite_database_info( + $statement_handle = $database_handle->prepare('CREATE TABLE kiriwrite_database_info( name varchar(256) primary key, description varchar(512), notes text, @@ -772,9 +773,9 @@ sub adddatabase{ kiriwrite_version_minor int(4), kiriwrite_version_revision int(4) )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); - $string_handle = $database_handle->prepare('CREATE TABLE kiriwrite_database_pages( + $statement_handle = $database_handle->prepare('CREATE TABLE kiriwrite_database_pages( filename varchar(256) primary key, pagename varchar(512), pagedescription varchar(512), @@ -784,12 +785,12 @@ sub adddatabase{ pagesettings int(1), lastmodified datetime )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); # Convert the values into SQL query formatted values and add an entry # to the kiriwrite_database_info table. - $string_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_info (name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision) VALUES( + $statement_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_info (name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision) VALUES( \'' . $class->convert($dbname) . '\', \'' . $class->convert($dbdescription) . '\', \'' . $class->convert($dbnotes) . '\', @@ -798,7 +799,7 @@ sub adddatabase{ \'' . $class->convert($dbminorver) . '\', \'' . $class->convert($dbrevisionver) . '\' )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); } @@ -929,22 +930,22 @@ sub editdatabase{ # Get the current database information. - $string_handle = $database_handle->prepare('SELECT name FROM kiriwrite_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('SELECT name FROM kiriwrite_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); - my @database_oldinfo = $string_handle->fetchrow_array(); + my @database_oldinfo = $statement_handle->fetchrow_array(); my $dboldname = $database_oldinfo[0]; # Update the database information. - $string_handle = $database_handle->prepare('UPDATE kiriwrite_database_info SET name = \'' . $class->convert($dbname) . '\', + $statement_handle = $database_handle->prepare('UPDATE kiriwrite_database_info SET name = \'' . $class->convert($dbname) . '\', description = \'' . $class->convert($dbdescription) . '\', notes = \'' . $class->convert($dbnotes) . '\', categories = \'' . $class->convert($dbcategories) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); - undef $string_handle; + undef $statement_handle; return; } @@ -1144,23 +1145,47 @@ sub getpagelist{ # # # Usage: # # # -# $dbmodule->getpagelist(); # +# $dbmodule->getpagelist(options); # +# # +# options Specifies the following options in any order. # +# # +# StartFrom Start from the specified page in the database. # +# Limit Get the amount of pages given. # ################################################################################# $error = ""; $errorext = ""; - my $class = shift; - - $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + my $class = shift; + my ($passedoptions) = shift; + + my $start_from = $passedoptions->{"StartFrom"}; + my $limit = $passedoptions->{"Limit"}; + + if (defined($start_from)){ + + if (!$limit){ + + $limit = 0; + + } + + $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages LIMIT ' . $start_from . ',' . $limit) or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); + + } else { + + $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); + + } my @database_pagefilenames; my @database_pagefilenames_final; # Process the collected pages. - while (@database_pagefilenames = $string_handle->fetchrow_array){ + while (@database_pagefilenames = $statement_handle->fetchrow_array){ # Add each page to the list of pages in the database. @@ -1168,11 +1193,34 @@ sub getpagelist{ } - undef $string_handle; + undef $statement_handle; return @database_pagefilenames_final; } +sub getpagecount{ +################################################################################# +# getpagecount: Get the count of pages that are in the database. # +# # +# Usage: # +# # +# $dbmodule->getpagecount(); # +################################################################################# + + $error = ""; + $errorext = ""; + + my $class = shift; + + $statement_handle = $database_handle->prepare('SELECT COUNT(*) FROM kiriwrite_database_pages') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return); + $statement_handle->execute(); + + my $count = $statement_handle->fetchrow_array(); + + return $count; + +} + sub getpageinfo{ ################################################################################# # getpageinfo: Gets the page information from the filename passed. # @@ -1212,13 +1260,13 @@ sub getpageinfo{ 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 ); + $statement_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 ); - $string_handle->execute(); + $statement_handle->execute(); # Check if the page exists in the database. - while (@data_page = $string_handle->fetchrow_array()){ + while (@data_page = $statement_handle->fetchrow_array()){ # Get the values from the array. @@ -1243,13 +1291,13 @@ sub getpageinfo{ } else { - $string_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); # Check if the page exists in the database. - while (@data_page = $string_handle->fetchrow_array()){ + while (@data_page = $statement_handle->fetchrow_array()){ # Get the values from the array. @@ -1265,14 +1313,14 @@ sub getpageinfo{ # Put the values into the page hash. %database_page = ( - "PageFilename" => $pagefilename, - "PageName" => $pagename, - "PageDescription" => $pagedescription, - "PageSection" => $pagesection, - "PageTemplate" => $pagetemplate, - "PageContent" => $pagedata, - "PageSettings" => $pagesettings, - "PageLastModified" => $class->dateconvert($pagelastmodified), + "PageFilename" => $pagefilename, + "PageName" => $pagename, + "PageDescription" => $pagedescription, + "PageSection" => $pagesection, + "PageTemplate" => $pagetemplate, + "PageContent" => $pagedata, + "PageSettings" => $pagesettings, + "PageLastModified" => $class->dateconvert($pagelastmodified) ); $page_found = 1; @@ -1290,7 +1338,7 @@ sub getpageinfo{ } - undef $string_handle; + undef $statement_handle; return %database_page; } @@ -1338,13 +1386,13 @@ sub addpage{ # Check to see if the filename given already exists # in the page database. - $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); # Check if a page with the filename given really does # exist. - while (@database_page = $string_handle->fetchrow_array()){ + while (@database_page = $statement_handle->fetchrow_array()){ # A page does exist so increment the count to 1. @@ -1392,7 +1440,7 @@ sub addpage{ # Add the page to the selected database. - $string_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES ( + $statement_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES ( \'' . $class->convert($page_filename) . '\', \'' . $class->convert($page_name) . '\', \'' . $class->convert($page_description) . '\', @@ -1402,9 +1450,9 @@ sub addpage{ \'' . $class->convert($page_settings) . '\', \'' . $class->convert($page_date) . '\' )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle->execute(); - undef $string_handle; + undef $statement_handle; } @@ -1437,10 +1485,10 @@ sub deletepage{ # Check if the page exists before deleting it. - $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); - while (@page_info = $string_handle->fetchrow_array()){ + while (@page_info = $statement_handle->fetchrow_array()){ $page_found = 1; @@ -1457,8 +1505,8 @@ sub deletepage{ # Delete the page. - $string_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); } @@ -1505,12 +1553,12 @@ sub editpage{ # Check if the page with the filename given exists. - $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); # Check if the page really does exist. - while (@page_info = $string_handle->fetchrow_array()){ + while (@page_info = $statement_handle->fetchrow_array()){ # The page information is found. @@ -1534,12 +1582,12 @@ sub editpage{ 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 ); - $string_handle->execute(); + $statement_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 ); + $statement_handle->execute(); # Check if a page really is using the new filename. - while (@page_info = $string_handle->fetchrow_array()){ + while (@page_info = $statement_handle->fetchrow_array()){ # The page information is found. @@ -1563,8 +1611,8 @@ sub editpage{ # Edit the selected page. - $string_handle = $database_handle->prepare('UPDATE kiriwrite_database_pages SET filename = \'' . $class->convert($page_newfilename) . '\', pagename = \'' . $class->convert($page_newname) . '\', pagedescription = \'' . $class->convert($page_newdescription) . '\', pagesection = \'' . $class->convert($page_newsection) . '\', pagetemplate = \'' . $class->convert($page_newtemplate) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagesettings = \'' . $class->convert($page_newsettings) . '\', lastmodified = \'' . $page_date . '\' WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('UPDATE kiriwrite_database_pages SET filename = \'' . $class->convert($page_newfilename) . '\', pagename = \'' . $class->convert($page_newname) . '\', pagedescription = \'' . $class->convert($page_newdescription) . '\', pagesection = \'' . $class->convert($page_newsection) . '\', pagetemplate = \'' . $class->convert($page_newtemplate) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagesettings = \'' . $class->convert($page_newsettings) . '\', lastmodified = \'' . $page_date . '\' WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); } @@ -1600,12 +1648,12 @@ sub movepage{ # Check if the page with the filename given exists. - $string_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); # Check if the page really does exist. - while (@page_info = $string_handle->fetchrow_array()){ + while (@page_info = $statement_handle->fetchrow_array()){ # Get the values from the array. @@ -1652,10 +1700,10 @@ sub movepage{ $page_found = 0; @page_info = (); - $second_string_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return ); - $second_string_handle->execute(); + $second_statement_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return ); + $second_statement_handle->execute(); - while (@page_info = $second_string_handle->fetchrow_array()){ + while (@page_info = $second_statement_handle->fetchrow_array()){ $page_found = 1; @@ -1672,7 +1720,7 @@ sub movepage{ # Add the page to the new database. - $second_string_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES ( + $second_statement_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES ( \'' . $class->convert($database_page{"PageFilename"}) . '\', \'' . $class->convert($database_page{"PageName"}) . '\', \'' . $class->convert($database_page{"PageDescription"}) . '\', @@ -1682,12 +1730,12 @@ sub movepage{ \'' . $class->convert($database_page{"PageSettings"}) . '\', \'' . $class->convert($database_page{"PageLastModified"}) . '\' )') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return ); - $second_string_handle->execute(); + $second_statement_handle->execute(); # Delete the page from the old database. - $string_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($database_page{"PageFilename"}) . '\'') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($database_page{"PageFilename"}) . '\'') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); } @@ -1723,12 +1771,12 @@ sub copypage{ # Check if the page with the filename given exists. - $string_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return ); - $string_handle->execute(); + $statement_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return ); + $statement_handle->execute(); # Check if the page really does exist. - while (@page_info = $string_handle->fetchrow_array()){ + while (@page_info = $statement_handle->fetchrow_array()){ # Get the values from the array. @@ -1775,10 +1823,10 @@ sub copypage{ $page_found = 0; @page_info = (); - $second_string_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return ); - $second_string_handle->execute(); + $second_statement_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return ); + $second_statement_handle->execute(); - while (@page_info = $second_string_handle->fetchrow_array()){ + while (@page_info = $second_statement_handle->fetchrow_array()){ $page_found = 1; @@ -1795,7 +1843,7 @@ sub copypage{ # Add the page to the new database. - $second_string_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES ( + $second_statement_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES ( \'' . $class->convert($database_page{"PageFilename"}) . '\', \'' . $class->convert($database_page{"PageName"}) . '\', \'' . $class->convert($database_page{"PageDescription"}) . '\', @@ -1805,7 +1853,7 @@ sub copypage{ \'' . $class->convert($database_page{"PageSettings"}) . '\', \'' . $class->convert($database_page{"PageLastModified"}) . '\' )') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return ); - $second_string_handle->execute(); + $second_statement_handle->execute(); } @@ -1832,7 +1880,7 @@ sub connectfilter{ # Check if the template database exists. - my $filterdatabase_exists = main::kiriwrite_fileexists("filters.db.sqlite"); + my $filterdatabase_exists = kiriwrite_fileexists("filters.db.sqlite"); if ($filterdatabase_exists eq 1){ @@ -1849,7 +1897,7 @@ sub connectfilter{ # Check if the permission settings for the template database are valid. - my $filterdb_permissions = main::kiriwrite_filepermissions("filters.db.sqlite", 1, 0); + my $filterdb_permissions = kiriwrite_filepermissions("filters.db.sqlite", 1, 0); if ($filterdb_permissions eq 1){ @@ -1886,34 +1934,81 @@ sub disconnectfilter{ if ($filterdb_loaded eq 1){ - undef $filterdb_string_handle; + undef $filterdb_statement_handle; $filterdb_database_handle->disconnect(); } } +sub getfiltercount{ +################################################################################# +# getfiltercount: Gets the count of filters in the filters database. # +# # +# Usage: # +# # +# $dbmodule->getfiltercount(); # +################################################################################# + + $error = ""; + $errorext = ""; + + my $class = shift; + + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT COUNT(*) FROM kiriwrite_filters') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return); + $filterdb_statement_handle->execute(); + + my $count = $filterdb_statement_handle->fetchrow_array(); + + return $count; + +} + sub getfilterlist{ ################################################################################# # getfilterlist: Gets the list of filters in the filter database. # # # # Usage: # # # -# $dbmodule->getfilterlist(); # +# $dbmodule->getfilterlist(options); # +# # +# StartFrom Specifies where the list of filters should start from. # +# Limit Specifies the amount of the filters to get. # ################################################################################# $error = ""; $errorext = ""; + my $class = shift; + my ($passedoptions) = shift; + my @filter_list; my @filter_data; - # Get the list of filters available. + my $start_from = $passedoptions->{"StartFrom"}; + my $limit = $passedoptions->{"Limit"}; + + if (defined($start_from)){ + + if (!$limit){ + + $limit = 0; - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY priority ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + } + + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY priority ASC LIMIT ' . $start_from . ',' . $limit) or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); + + } else { - while (@filter_data = $filterdb_string_handle->fetchrow_array()){ + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY priority ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); + + } + + # Get the list of filters available. + + while (@filter_data = $filterdb_statement_handle->fetchrow_array()){ # Add the filter to the list of available filters. @@ -1921,7 +2016,7 @@ sub getfilterlist{ } - undef $filterdb_string_handle; + undef $filterdb_statement_handle; return @filter_list; } @@ -1937,6 +2032,8 @@ sub getfilterinfo{ # options Specifies the following options in any order. # # # # FilterID Specifies the filter ID number to get information from. # +# Reduced Specifies if the reduced version of the filter information # +# should be retrieved. # ################################################################################# $error = ""; @@ -1954,19 +2051,30 @@ sub getfilterinfo{ # Get the values that are in the hash. my $filter_id = $passedoptions->{"FilterID"}; + my $reduced = $passedoptions->{"Reduced"}; + + if ($reduced && $reduced eq 1){ - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, notes FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, enabled FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); + + } else { + + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, enabled, notes FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); + + } # Get the filter information. - while (@filter_data = $filterdb_string_handle->fetchrow_array()){ + while (@filter_data = $filterdb_statement_handle->fetchrow_array()){ $filter_info{"FilterID"} = $filter_data[0]; $filter_info{"FilterPriority"} = $filter_data[1]; $filter_info{"FilterFind"} = $filter_data[2]; $filter_info{"FilterReplace"} = $filter_data[3]; - $filter_info{"FilterNotes"} = $filter_data[4]; + $filter_info{"FilterEnabled"} = $filter_data[4]; + $filter_info{"FilterNotes"} = $filter_data[5]; $filter_exists = 1; @@ -1986,7 +2094,7 @@ sub getfilterinfo{ # Return the filter information. - undef $filterdb_string_handle; + undef $filterdb_statement_handle; return %filter_info; } @@ -2031,12 +2139,13 @@ sub addfilter{ my $filter_find = $passedoptions->{"FindFilter"}; my $filter_replace = $passedoptions->{"ReplaceFilter"}; my $filter_priority = $passedoptions->{"Priority"}; + my $filter_enabled = $passedoptions->{"Enabled"}; my $filter_notes = $passedoptions->{"Notes"}; # Check if the filter database permissions are valid. - my $filterdb_exists = main::kiriwrite_fileexists("filters.db.sqlite", 1, 1); - my $filterdb_permissions = main::kiriwrite_filepermissions("filters.db.sqlite", 1, 1); + my $filterdb_exists = kiriwrite_fileexists("filters.db.sqlite", 1, 1); + my $filterdb_permissions = kiriwrite_filepermissions("filters.db.sqlite", 1, 1); if ($filterdb_permissions eq 1){ @@ -2074,7 +2183,13 @@ sub addfilter{ } - my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0); + if (!$filter_enabled){ + + $filter_enabled = ""; + + } + + my $directory_permissions = kiriwrite_filepermissions(".", 1, 1, 0); if ($directory_permissions eq 1 && $filterdb_exists){ @@ -2088,7 +2203,7 @@ sub addfilter{ # Check if the filter table exists. - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $nofiltertable = 1 ); + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $nofiltertable = 1 ); # Check if there is really no filter table. @@ -2096,23 +2211,24 @@ sub addfilter{ # Create the filter database table. - $filterdb_string_handle = $filterdb_database_handle->prepare('CREATE TABLE kiriwrite_filters ( + $filterdb_statement_handle = $filterdb_database_handle->prepare('CREATE TABLE kiriwrite_filters ( id int(7) primary key, priority int(5), findsetting varchar(1024), replacesetting varchar(1024), + enabled boolean, notes text )') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle->execute(); } # Find the lowest filter identification number available. - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); - while (@database_filters = $filterdb_string_handle->fetchrow_array()){ + while (@database_filters = $filterdb_statement_handle->fetchrow_array()){ $filter_id = $database_filters[0]; @@ -2132,12 +2248,12 @@ sub addfilter{ $new_id = $filter_id + 1; - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters WHERE id = \'' . $class->convert($new_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters WHERE id = \'' . $class->convert($new_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); # Get the filter identification number. - while (@filterid_check = $filterdb_string_handle->fetchrow_array()){ + while (@filterid_check = $filterdb_statement_handle->fetchrow_array()){ $filter_found = 1; @@ -2161,11 +2277,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; @@ -2174,14 +2290,15 @@ sub addfilter{ # Add the filter to the filter database. - $filterdb_string_handle = $filterdb_database_handle->prepare('INSERT INTO kiriwrite_filters (id, priority, findsetting, replacesetting, notes) VALUES ( + $filterdb_statement_handle = $filterdb_database_handle->prepare('INSERT INTO kiriwrite_filters (id, priority, findsetting, replacesetting, enabled, notes) VALUES ( \'' . $class->convert($new_id) . '\', \'' . $class->convert($filter_priority) . '\', \'' . $class->convert($filter_find) . '\', \'' . $class->convert($filter_replace) .'\', + \'' . $class->convert($filter_enabled) . '\', \'' . $class->convert($filter_notes) . '\' )') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle->execute(); } @@ -2199,6 +2316,7 @@ sub editfilter{ # NewFindFilter Specifies the new find filter setting. # # NewReplaceFilter Specifies the new replace filter setting. # # NewFilterPriority Specifies the new filter priority setting. # +# NewEnabled Specifies if the filter should be enabled. # # NewFilterNotes Specifies the new notes for the filter. # ################################################################################# @@ -2220,12 +2338,13 @@ sub editfilter{ my $filter_newfind = $passedoptions->{"NewFindFilter"}; my $filter_newreplace = $passedoptions->{"NewReplaceFilter"}; my $filter_newpriority = $passedoptions->{"NewFilterPriority"}; + my $filter_enabled = $passedoptions->{"NewEnabled"}; my $filter_newnotes = $passedoptions->{"NewFilterNotes"}; # Check if the filter database permissions are valid. - my $filterdb_exists = main::kiriwrite_fileexists("filters.db.sqlite", 1, 1); - my $filterdb_permissions = main::kiriwrite_filepermissions("filters.db.sqlite", 1, 1); + my $filterdb_exists = kiriwrite_fileexists("filters.db.sqlite", 1, 1); + my $filterdb_permissions = kiriwrite_filepermissions("filters.db.sqlite", 1, 1); if ($filterdb_permissions eq 1){ @@ -2238,12 +2357,12 @@ sub editfilter{ # Check if the filter exists before editing it. - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); # Check if the filter exists. - while (@filter_data = $filterdb_string_handle->fetchrow_array()){ + while (@filter_data = $filterdb_statement_handle->fetchrow_array()){ $filter_exists = 1; @@ -2263,15 +2382,16 @@ sub editfilter{ # Edit the selected filter. - $filterdb_string_handle = $filterdb_database_handle->prepare('UPDATE kiriwrite_filters SET + $filterdb_statement_handle = $filterdb_database_handle->prepare('UPDATE kiriwrite_filters SET findsetting = \'' . $class->convert($filter_newfind) . '\', replacesetting = \'' . $class->convert($filter_newreplace) . '\', priority = \'' . $class->convert($filter_newpriority) . '\', + enabled = \'' . $class->convert($filter_enabled) . '\', notes = \'' . $class->convert($filter_newnotes) . '\' WHERE id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle->execute(); - undef $filterdb_string_handle; + undef $filterdb_statement_handle; return; } @@ -2306,10 +2426,10 @@ sub deletefilter{ # Check if the filter exists before deleting. - $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); - while (@filter_data = $filterdb_string_handle->fetchrow_array()){ + while (@filter_data = $filterdb_statement_handle->fetchrow_array()){ $filter_exists = 1; @@ -2326,10 +2446,10 @@ sub deletefilter{ # Delete the filter from the filter database. - $filterdb_string_handle = $filterdb_database_handle->prepare('DELETE FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); - $filterdb_string_handle->execute(); + $filterdb_statement_handle = $filterdb_database_handle->prepare('DELETE FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return ); + $filterdb_statement_handle->execute(); - undef $filterdb_string_handle; + undef $filterdb_statement_handle; } @@ -2356,7 +2476,7 @@ sub connecttemplate{ # Check if the template database exists. - my $templatedatabase_exists = main::kiriwrite_fileexists("templates.db.sqlite"); + my $templatedatabase_exists = kiriwrite_fileexists("templates.db.sqlite"); if ($templatedatabase_exists eq 1){ @@ -2373,7 +2493,7 @@ sub connecttemplate{ # Check if the permission settings for the template database are valid. - my $templatedb_permissions = main::kiriwrite_filepermissions("templates.db.sqlite", 1, 0); + my $templatedb_permissions = kiriwrite_filepermissions("templates.db.sqlite", 1, 0); if ($templatedb_permissions eq 1){ @@ -2410,33 +2530,82 @@ sub disconnecttemplate{ if ($templatedb_loaded eq 1){ - undef $template_string_handle; + undef $template_statement_handle; $template_database_handle->disconnect(); } } +sub gettemplatecount{ +################################################################################# +# gettemplatecount: Gets the count of templates in the template database. # +# # +# Usage: # +# # +# $dbmodule->gettemplatecount(); # +################################################################################# + + $error = ""; + $errorext = ""; + + my $class = shift; + + $template_statement_handle = $template_database_handle->prepare('SELECT COUNT(*) FROM kiriwrite_templates') or ( $error = "FilterDatabaseError", $errorext = $template_database_handle->errstr, return); + $template_statement_handle->execute(); + + my $count = $template_statement_handle->fetchrow_array(); + + return $count; + +} + sub gettemplatelist{ ################################################################################# # gettemplatelist: Gets the list of templates. # # # # Usage: # # # -# $dbmodule->gettemplatelist(); # +# $dbmodule->gettemplatelist(options); # +# # +# options Specifies the following options as a hash (in any order). # +# # +# StartFrom Specifies where the list of templates will start from. # +# Limit Specifies how many templates should be retrieved. # ################################################################################# $error = ""; $errorext = ""; - $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates ORDER BY filename ASC') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + my $class = shift; + my ($passedoptions) = @_; + + my $start_from = $passedoptions->{"StartFrom"}; + my $limit = $passedoptions->{"Limit"}; + + if (defined($start_from)){ + + if (!$limit){ + + $limit = 0; + + } + + $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates ORDER BY filename ASC LIMIT ' . $start_from . ',' . $limit ) or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); + + } else { + + $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates ORDER BY filename ASC') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); + + } my @database_template; my @templates_list; my $template_filename; - while (@database_template = $template_string_handle->fetchrow_array()){ + while (@database_template = $template_statement_handle->fetchrow_array()){ # Get certain values from the array. @@ -2463,6 +2632,8 @@ sub gettemplateinfo{ # options Specifies the following options in any order. # # # # TemplateFilename Specifies the template filename to use. # +# Reduced Specifies a reduced version of template information to # +# get. # ################################################################################# $error = ""; @@ -2485,11 +2656,21 @@ sub gettemplateinfo{ my $template_found = 0; my $filename = $passedoptions->{"TemplateFilename"}; + my $reduced = $passedoptions->{"Reduced"}; + + if ($reduced && $reduced eq 1){ - $template_string_handle = $template_database_handle->prepare('SELECT filename, templatename, templatedescription, templatelayout, datemodified FROM kiriwrite_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle = $template_database_handle->prepare('SELECT filename, templatename, templatedescription, datemodified FROM kiriwrite_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); + + } else { + + $template_statement_handle = $template_database_handle->prepare('SELECT filename, templatename, templatedescription, templatelayout, datemodified FROM kiriwrite_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); + + } - while (@template_data = $template_string_handle->fetchrow_array()){ + while (@template_data = $template_statement_handle->fetchrow_array()){ # Get certain values from the array. @@ -2562,8 +2743,8 @@ sub addtemplate{ # Check if the template database permissions are valid. - my $templatedb_exists = main::kiriwrite_fileexists("templates.db.sqlite", 1, 1); - my $templatedb_permissions = main::kiriwrite_filepermissions("templates.db.sqlite", 1, 1); + my $templatedb_exists = kiriwrite_fileexists("templates.db.sqlite", 1, 1); + my $templatedb_permissions = kiriwrite_filepermissions("templates.db.sqlite", 1, 1); if ($templatedb_permissions eq 1){ @@ -2578,13 +2759,13 @@ sub addtemplate{ if ($templatedb_exists eq 0){ - $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ($blankfile = 1); + $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ($blankfile = 1); if ($blankfile eq 0){ - $template_string_handle->execute(); + $template_statement_handle->execute(); - while (@page_exists = $template_string_handle->fetchrow_array()){ + while (@page_exists = $template_statement_handle->fetchrow_array()){ $error = "TemplatePageExists"; return; @@ -2622,7 +2803,7 @@ sub addtemplate{ } - my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0); + my $directory_permissions = kiriwrite_filepermissions(".", 1, 1, 0); if ($directory_permissions eq 1 && $templatedb_exists){ @@ -2636,7 +2817,7 @@ sub addtemplate{ # Check to see if a template can be added. - $template_string_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES( + $template_statement_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES( \'' . $class->convert($template_filename) . '\', \'' . $class->convert($template_name) . '\', \'' . $class->convert($template_description) . '\', @@ -2646,7 +2827,7 @@ sub addtemplate{ if (!$notemplatetable){ - $template_string_handle->execute(); + $template_statement_handle->execute(); } @@ -2656,7 +2837,7 @@ sub addtemplate{ # Create a template table. - my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0); + my $directory_permissions = kiriwrite_filepermissions(".", 1, 1, 0); if ($directory_permissions eq 1){ @@ -2668,23 +2849,23 @@ sub addtemplate{ } - $template_string_handle = $template_database_handle->prepare('create table kiriwrite_templates( + $template_statement_handle = $template_database_handle->prepare('create table kiriwrite_templates( filename varchar(256) primary key, templatename varchar(512), templatedescription varchar(512), templatelayout text, datemodified datetime );') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle->execute(); - $template_string_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES( + $template_statement_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES( \'' . $class->convert($template_filename) . '\', \'' . $class->convert($template_name) . '\', \'' . $class->convert($template_description) . '\', \'' . $class->convert($template_layout) . '\', \'' . $class->convert($template_date) . '\' )') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle->execute(); } @@ -2717,10 +2898,10 @@ sub deletetemplate{ # Check if the template exists. - $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); - while (@pagedata = $template_string_handle->fetchrow_array()){ + while (@pagedata = $template_statement_handle->fetchrow_array()){ $template_count++; @@ -2737,8 +2918,8 @@ sub deletetemplate{ # Delete the template from the template database. - $template_string_handle = $template_database_handle->prepare('DELETE FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle = $template_database_handle->prepare('DELETE FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); } @@ -2776,8 +2957,8 @@ sub edittemplate{ # Check if the template database permissions are valid. - my $templatedb_exists = main::kiriwrite_fileexists("templates.db.sqlite", 1, 1); - my $templatedb_permissions = main::kiriwrite_filepermissions("templates.db.sqlite", 1, 1); + my $templatedb_exists = kiriwrite_fileexists("templates.db.sqlite", 1, 1); + my $templatedb_permissions = kiriwrite_filepermissions("templates.db.sqlite", 1, 1); if ($templatedb_permissions eq 1){ @@ -2790,10 +2971,10 @@ sub edittemplate{ # Check if the template exists. - $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); + $template_statement_handle->execute(); - while (@template_info = $template_string_handle->fetchrow_array()){ + while (@template_info = $template_statement_handle->fetchrow_array()){ $template_found = 1; @@ -2816,7 +2997,7 @@ sub edittemplate{ # Update the template information. - $template_string_handle = $template_database_handle->prepare('UPDATE kiriwrite_templates SET + $template_statement_handle = $template_database_handle->prepare('UPDATE kiriwrite_templates SET filename = \'' . $class->convert($new_template_filename) . '\', templatename = \'' . $class->convert($new_template_name) . '\', templatedescription = \'' . $class->convert($new_template_description) . '\', @@ -2824,7 +3005,7 @@ sub edittemplate{ datemodified = \'' . $class->convert($templatenewdate) . '\' WHERE filename = \'' . $class->convert($template_filename) . '\' ') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return ); - $template_string_handle->execute(); + $template_statement_handle->execute(); } @@ -2856,7 +3037,7 @@ sub disconnect{ # This function is not needed in this database module. - undef $string_handle; + undef $statement_handle; }