Remove all calls to 'module' in preparation for move to Lua 5.2

Use mymodule parameter for module definition.

1 files changed, 14 insertions, 12 deletions

diff --git a/dbmodelfunctions.lua b/dbmodelfunctions.lua
index 09e3edf..665bc06 100644
--- a/dbmodelfunctions.lua
+++ b/dbmodelfunctions.lua
@@ -1,8 +1,8 @@
-module(..., package.seeall)
+local mymodule = {}
 -- Helper library for model functions for viewing and editing database entries
 -- Relies heavily on the acf-lib/db.lua library (db object passed into each function)
 
-function list_databases(db, self, clientdata)
+function mymodule.list_databases(db, self, clientdata)
 	local retval = {}
         local errtxt
 	local res, err = pcall(function()
@@ -15,7 +15,7 @@ function list_databases(db, self, clientdata)
 	return cfe({ type="list", value=retval, label="List of Databases", errtxt=errtxt })
 end
 
-function list_tables(db, self, clientdata)
+function mymodule.list_tables(db, self, clientdata)
 	local retval = {}
         local errtxt
 	local res, err = pcall(function()
@@ -30,7 +30,7 @@ function list_tables(db, self, clientdata)
 	return cfe({ type="list", value=retval, label="List of Database Tables", errtxt=errtxt })
 end
 
-function list_table_entries(db, self, clientdata)
+function mymodule.list_table_entries(db, self, clientdata)
 	local table = clientdata.table
 	local retval = {}
 	retval.table = cfe({ value=table or "", label="Table" })
@@ -59,7 +59,7 @@ function list_table_entries(db, self, clientdata)
 	return cfe({ type="group", value=retval, label="Database Table Entries", errtxt=errtxt })
 end
 
-function get_new_table_entry(db, self, clientdata)
+function mymodule.get_new_table_entry(db, self, clientdata)
 	local retval = {}
 	retval.table = cfe({ value=clientdata.table or "", label="Table", errtxt="Table does not exist", readonly=true, seq=0 })
 	local errtxt = "Table does not exist"
@@ -93,8 +93,8 @@ function get_new_table_entry(db, self, clientdata)
 	return cfe({ type="group", value=retval, label="Database Table Entry", errtxt=errtxt })
 end
 
-function get_table_entry(db, self, clientdata)
-	local retval = get_new_table_entry(db, self, clientdata)
+function mymodule.get_table_entry(db, self, clientdata)
+	local retval = mymodule.get_new_table_entry(db, self, clientdata)
 	if not retval.value.table.errtxt and retval.value.id then
 		retval.value.id.type = "text"
 		local res, err = pcall(function()
@@ -127,11 +127,11 @@ function get_table_entry(db, self, clientdata)
 	return retval
 end
 
-function create_table_entry(db, self, entry, action)
-        return update_table_entry(db, self, entry, action, true)
+function mymodule.create_table_entry(db, self, entry, action)
+        return mymodule.update_table_entry(db, self, entry, action, true)
 end
 
-function update_table_entry(db, self, entry, action, create)
+function mymodule.update_table_entry(db, self, entry, action, create)
 	local success = true
 	local errtxt
 	-- Validate the settings
@@ -203,14 +203,14 @@ function update_table_entry(db, self, entry, action, create)
 	return entry
 end
 
-function get_delete_table_entry(db, self, clientdata)
+function mymodule.get_delete_table_entry(db, self, clientdata)
 	local retval = {}
 	retval.table = cfe({ value=clientdata.table or "", label="Table", seq=0 })
 	retval.id = cfe({ value=clientdata.id or "", label="ID", seq=1 })
 	return cfe({ type="group", value=retval, label="Delete Database Table Entry" })
 end
 
-function delete_table_entry(db, self, entry)
+function mymodule.delete_table_entry(db, self, entry)
 	entry.errtxt = "Failed to delete table entry"
 	if entry.value.table.value == "" then
 		entry.value.table.errtxt = "Invalid table"
@@ -241,3 +241,5 @@ function delete_table_entry(db, self, entry)
 
 	return entry
 end
+
+return mymodule