From 6e7e6c4bd7f1892bf1b03c19ef8e665ac07540b0 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 9 Oct 2013 21:18:58 +0000 Subject: Change use of require to work with Lua 5.2 --- weblog-adhocquery-html.lsp | 2 +- weblog-listfiles-html.lsp | 2 +- weblog-listsources-html.lsp | 2 +- weblog-model.lua | 8 ++++---- weblog-status-html.lsp | 2 +- weblog-viewactivitylog-html.lsp | 2 +- weblog-viewauditstats-html.lsp | 2 +- weblog-viewusagestats-html.lsp | 2 +- weblog-viewweblog-html.lsp | 2 +- 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") %>