summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2013-10-09 21:18:58 +0000
committerTed Trask <ttrask01@yahoo.com>2013-10-09 21:18:58 +0000
commit6e7e6c4bd7f1892bf1b03c19ef8e665ac07540b0 (patch)
tree8faf4da756d7874868a28817f3b04d63c34058bd
parent8721aec349e783755ed8bee0b5a14e6551a0a74a (diff)
downloadacf-weblog-6e7e6c4bd7f1892bf1b03c19ef8e665ac07540b0.tar.bz2
acf-weblog-6e7e6c4bd7f1892bf1b03c19ef8e665ac07540b0.tar.xz
Change use of require to work with Lua 5.2
-rw-r--r--weblog-adhocquery-html.lsp2
-rw-r--r--weblog-listfiles-html.lsp2
-rw-r--r--weblog-listsources-html.lsp2
-rw-r--r--weblog-model.lua8
-rw-r--r--weblog-status-html.lsp2
-rw-r--r--weblog-viewactivitylog-html.lsp2
-rw-r--r--weblog-viewauditstats-html.lsp2
-rw-r--r--weblog-viewusagestats-html.lsp2
-rw-r--r--weblog-viewweblog-html.lsp2
9 files changed, 12 insertions, 12 deletions
diff --git a/weblog-adhocquery-html.lsp b/weblog-adhocquery-html.lsp
index 1a20f02..074ddcb 100644
--- a/weblog-adhocquery-html.lsp
+++ b/weblog-adhocquery-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("htmlviewfunctions")
+htmlviewfunctions = require("htmlviewfunctions")
html = require("acf.html")
%>
diff --git a/weblog-listfiles-html.lsp b/weblog-listfiles-html.lsp
index bdef372..2139c2b 100644
--- a/weblog-listfiles-html.lsp
+++ b/weblog-listfiles-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("htmlviewfunctions")
+htmlviewfunctions = require("htmlviewfunctions")
html = require("acf.html")
%>
diff --git a/weblog-listsources-html.lsp b/weblog-listsources-html.lsp
index 66d246c..85817fb 100644
--- a/weblog-listsources-html.lsp
+++ b/weblog-listsources-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ...
-require("htmlviewfunctions")
+htmlviewfunctions = require("htmlviewfunctions")
html = require("acf.html")
%>
diff --git a/weblog-model.lua b/weblog-model.lua
index b205c85..c1ef952 100644
--- a/weblog-model.lua
+++ b/weblog-model.lua
@@ -1,13 +1,13 @@
module(..., package.seeall)
-- Load libraries
-require("modelfunctions")
+modelfunctions = require("modelfunctions")
fs = require("acf.fs")
format = require("acf.format")
validator = require("acf.validator")
-require("luasql.postgres")
-require("posix")
-require("subprocess")
+luasql = require("luasql.postgres")
+posix = require("posix")
+subprocess = require("subprocess")
local DatabaseName = "webproxylog"
local DatabaseOwner = "weblogowner"
diff --git a/weblog-status-html.lsp b/weblog-status-html.lsp
index 616a075..6b05dfc 100644
--- a/weblog-status-html.lsp
+++ b/weblog-status-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ...
-require("htmlviewfunctions")
+htmlviewfunctions = require("htmlviewfunctions")
%>
<% htmlviewfunctions.displaycommandresults({"createdatabase"}, session, true) %>
diff --git a/weblog-viewactivitylog-html.lsp b/weblog-viewactivitylog-html.lsp
index 20c9549..9a5ff8a 100644
--- a/weblog-viewactivitylog-html.lsp
+++ b/weblog-viewactivitylog-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% local subdata, pagedata = htmlviewfunctions.paginate(data.value, page_info.clientdata, 100) %>
diff --git a/weblog-viewauditstats-html.lsp b/weblog-viewauditstats-html.lsp
index 9a9f773..88c77eb 100644
--- a/weblog-viewauditstats-html.lsp
+++ b/weblog-viewauditstats-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<script type="text/javascript">
diff --git a/weblog-viewusagestats-html.lsp b/weblog-viewusagestats-html.lsp
index f7df041..af8e56f 100644
--- a/weblog-viewusagestats-html.lsp
+++ b/weblog-viewusagestats-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% local subdata, pagedata = htmlviewfunctions.paginate(data.value, page_info.clientdata, 100) %>
diff --git a/weblog-viewweblog-html.lsp b/weblog-viewweblog-html.lsp
index 28b0b01..e7f1a6a 100644
--- a/weblog-viewweblog-html.lsp
+++ b/weblog-viewweblog-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ... %>
-<% require("htmlviewfunctions") %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<% format = require("acf.format") %>