diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2009-09-21 11:03:41 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2009-09-21 11:03:41 +0000 |
| commit | 83591a31c7d27155e47b35c2e62d2662b759f462 (patch) | |
| tree | 36a7a03f19d2f8dceec961c4d9efbafdb57a89aa /weblog-model.lua | |
| parent | f2c79a9fb3c0a96b16c8f723848cee90ab173c57 (diff) | |
| download | acf-weblog-83591a31c7d27155e47b35c2e62d2662b759f462.tar.bz2 acf-weblog-83591a31c7d27155e47b35c2e62d2662b759f462.tar.xz | |
Added pagination for history and usage, more precision for history timestamp.
Diffstat (limited to 'weblog-model.lua')
| -rw-r--r-- | weblog-model.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/weblog-model.lua b/weblog-model.lua index 14f394f..c4d5080 100644 --- a/weblog-model.lua +++ b/weblog-model.lua @@ -19,7 +19,7 @@ local configcontent = fs.read_file(configfile) or "" local config = format.parse_ini_file(configcontent, "") or {} local database_creation_script = { - "CREATE TABLE dbhistlog (logdatetime timestamp(0) without time zone NOT NULL, msgtext text)", + "CREATE TABLE dbhistlog (logdatetime timestamp(3) without time zone NOT NULL, msgtext text)", "CREATE TABLE pubblocklog(sourcename character varying(40), clientip inet NOT NULL, clientuserid character varying(64) NOT NULL, logdatetime timestamp(3) without time zone NOT NULL, uri text NOT NULL, bytes integer NOT NULL, reason text, score integer, shortreason text)", "CREATE TABLE blocklog(sourcename character varying(40), clientip inet NOT NULL, clientuserid character varying(64) NOT NULL, logdatetime timestamp(0) without time zone NOT NULL, uri text NOT NULL, bytes integer NOT NULL, reason text, score integer, shortreason text)", "CREATE TABLE pubweblog(sourcename character varying(40), clientip inet NOT NULL, clientuserid character varying(64) NOT NULL, logdatetime timestamp(3) without time zone NOT NULL, uri text NOT NULL, bytes integer NOT NULL, reason text, score integer, shortreason text)", @@ -160,8 +160,7 @@ local databasedisconnect = function() end local logme = function(message) - local sql = string.format("INSERT INTO dbhistlog VALUES ('%s', '%s')", - os.date("%Y-%m-%d %H:%M:%S"), escape(message)) + local sql = string.format("INSERT INTO dbhistlog VALUES ('now', '%s')", escape(message)) local res = assert (con:execute(sql)) end @@ -479,7 +478,7 @@ local listusagestats = function() local entries = {} -- retrieve a cursor local sql = "SELECT sourcename, date, sum(numrequest) AS numrequest, sum(numblock) AS numblock " .. - "FROM usagestat GROUP BY sourcename, date ORDER BY sourcename, date" + "FROM usagestat GROUP BY sourcename, date ORDER BY date, sourcename" cur = assert (con:execute(sql)) row = cur:fetch ({}, "a") while row do |