diff options
author | Ted Trask <ttrask01@yahoo.com> | 2011-08-25 19:59:33 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2011-08-25 19:59:33 +0000 |
commit | 99457fa341d33006c4ff8b2b81196e5de60abb6a (patch) | |
tree | 0ca5df36c699c348cd6e2c3c50a7c53ee067611c /weblog-model.lua | |
parent | f04f17d0d906bbe65a2020551b57774e993543c7 (diff) | |
download | acf-weblog-99457fa341d33006c4ff8b2b81196e5de60abb6a.tar.bz2 acf-weblog-99457fa341d33006c4ff8b2b81196e5de60abb6a.tar.xz |
Cleaned up use of config files
Diffstat (limited to 'weblog-model.lua')
-rw-r--r-- | weblog-model.lua | 62 |
1 files changed, 22 insertions, 40 deletions
diff --git a/weblog-model.lua b/weblog-model.lua index 3ee6601..ca220e6 100644 --- a/weblog-model.lua +++ b/weblog-model.lua @@ -20,7 +20,8 @@ local configcontent = fs.read_file(configfile) or "" local config = format.parse_ini_file(configcontent, "") or {} local goodwordslist = "/etc/weblog/goodwords" local badwordslist = "/etc/weblog/badwords" -local baseurl = "/etc/weblog/" +local ignorewordslist = "/etc/weblog/ignorewords" +local files = {badwordslist, goodwordslist, ignorewordslist, configfile} local database_creation_script = { "CREATE TABLE dbhistlog (logdatetime timestamp(3) without time zone NOT NULL, msgtext text)", @@ -529,7 +530,7 @@ local function parsesquidlog(line) local ignoreme=false --check for ignored records first - for thisline in io.lines("/etc/weblog/ignorewords") do + for thisline in io.lines(ignorewordslist) do if not thisline then break end @@ -542,7 +543,7 @@ local function parsesquidlog(line) if ignoreme ~= true then --proceed with record analysis - for thisline in io.lines("/etc/weblog/badwords") do + for thisline in io.lines(badwordslist) do if not thisline then break end @@ -572,7 +573,7 @@ local function parsesquidlog(line) isbypass=1 end end - for goodline in io.lines("/etc/weblog/goodwords") do + for goodline in io.lines(goodwordslist) do if not goodline then break end @@ -641,7 +642,7 @@ local function parsesquarklog(line) local ignoreme=false --check for ignored records first - for thisline in io.lines("/etc/weblog/ignorewords") do + for thisline in io.lines(ignorewordslist) do if not thisline then break end @@ -653,7 +654,7 @@ local function parsesquarklog(line) end if ignoreme ~= true then - for thisline in io.lines(baseurl.."badwords") do + for thisline in io.lines(badwordslist) do if not thisline then -- logme("This line is apparently empty...") break @@ -681,7 +682,7 @@ local function parsesquarklog(line) isbypass=1 end end - for goodline in io.lines(baseurl.."goodwords") do + for goodline in io.lines(goodwordslist) do if not goodline then -- logme("This line is apparently empty...") break @@ -745,7 +746,7 @@ local function parsedglog(line) local ignoreme=false --check for ignored records first - for thisline in io.lines("/etc/weblog/ignorewords") do + for thisline in io.lines(ignorewordslist) do if not thisline then break end @@ -757,7 +758,7 @@ local function parsedglog(line) end if ignoreme ~= true then - for thisline in io.lines("/etc/weblog/badwords") do + for thisline in io.lines(badwordslist) do if not thisline then -- logme("This line is apparently empty...") break @@ -786,7 +787,7 @@ local function parsedglog(line) isbypass=1 end end - for goodline in io.lines("/etc/weblog/goodwords") do + for goodline in io.lines(goodwordslist) do if not goodline then -- logme("This line is apparently empty...") break @@ -846,7 +847,7 @@ local function parsedumplog(line) isbad=0 isdenied=0 isbypass=0 - for thisline in io.lines("/etc/weblog/badwords") do + for thisline in io.lines(badwordslist) do if not thisline then logme("This line is apparently empty...") break @@ -872,7 +873,7 @@ local function parsedumplog(line) isbypass=1 end end - for goodline in io.lines("/etc/weblog/goodwords") do + for goodline in io.lines(goodwordslist) do if not goodline then -- logme("This line is apparently empty...") break @@ -1798,40 +1799,21 @@ function create_database(database) return database end + function listfiles() local retval = cfe({ type="list", value={}, label="Weblog Files" }) - if not fs.is_dir(baseurl) then fs.create_directory(baseurl) end - for file in posix.files(baseurl) do - file = baseurl..file - if fs.is_file(file) then - table.insert(retval.value, file) - end - end - table.sort(retval.value) + for i,file in ipairs(files) do + local details = fs.stat(file) or {} + details.filename = file + retval.value[#retval.value + 1] = details + end return retval end -function getnewfile() - local filename = cfe({ label="File Name", descr="Must be in "..baseurl }) - return cfe({ type="group", value={filename=filename}, label="Weblog File" }) -end + function readfile(filename) - return modelfunctions.getfiledetails(filename, listfiles().value) + return modelfunctions.getfiledetails(filename, files) end function updatefile(filedetails) - return modelfunctions.setfiledetails(filedetails, listfiles().value) -end - -function deletefile(filename) - local retval = cfe({ label="Delete Weblog File result", errtxt = "Failed to delete Weblog File - invalid filename" }) - for i,file in ipairs(listfiles().value) do - if filename == file then - retval.value = "Deleted File" - retval.errtxt = nil - os.remove(filename) - break - end - end - - return retval + return modelfunctions.setfiledetails(filedetails, files) end |