From 3293ffeb968fc5a1b58b232cdd5a71886be244d1 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Mon, 14 Jul 2008 15:35:58 +0000
Subject: Modified apk-tools to use updated apk.lua library.  Available now
 shows a version to allow for updates.

git-svn-id: svn://svn.alpinelinux.org/acf/apk-tools/trunk@1301 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 apk-html.lsp  | 10 ++++++----
 apk-model.lua | 14 +++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apk-html.lsp b/apk-html.lsp
index 13c1749..d2fa83d 100644
--- a/apk-html.lsp
+++ b/apk-html.lsp
@@ -41,15 +41,17 @@ io.write("</span>")
 <TABLE>
 	<TR style="background:#eee;font-weight:bold;">
 		<TD style="padding-right:20px;white-space:nowrap;" class="header">Install</TD>
-		<TD style="white-space:nowrap;" WIDTH="90%" class="header">Package Name</TD>
+		<TD style="padding-right:20px;white-space:nowrap;" class="header">Package Name</TD>
+		<TD style="white-space:nowrap;" WIDTH="90%" class="header">Version</TD>
 	</TR>
 
-<? for i,package in pairs(form.value.available.value) do ?>
+<? for i,packagetable in pairs(form.value.available.value) do ?>
 	<TR>
 		<TD style="padding-right:20px;white-space:nowrap;">
-		<?= html.link{value = "install?package=" .. package, label="Install"} ?>
+		<?= html.link{value = "install?package=" .. packagetable.name, label="Install"} ?>
 		</TD>
-		<TD><?= package ?></TD>
+		<TD><?= packagetable.name ?></TD>
+		<TD><?= packagetable.version ?></TD>
 	</TR>
 <? end ?>
 </TABLE>
diff --git a/apk-model.lua b/apk-model.lua
index 53b3c9f..f26fbb8 100644
--- a/apk-model.lua
+++ b/apk-model.lua
@@ -7,27 +7,27 @@ local configfile = "/etc/apk/apk.conf"
 
 get_all_packages = function()
 	-- read in all of the packages
-	return cfe({ type="list", value=apk.get_all_packages(), label="All Packages"})
+	return cfe({ type="list", value=apk.get_all(), label="All Packages"})
 end
 
 get_loaded_packages = function()
 	-- read in the loaded packages
-	return cfe({ type="list", value=apk.get_loaded_packages(), label="Loaded Packages"})
+	return cfe({ type="list", value=apk.get_loaded(), label="Loaded Packages"})
 end
 
 get_available_packages = function()
 	-- available are all except loaded
-	return cfe({ type="list", value=apk.get_available_packages(), label="Available Packages" })
+	return cfe({ type="list", value=apk.get_available(), label="Available Packages" })
 end
 
 get_packages = function()
-	local loaded = get_loaded_packages()
-	local available = get_available_packages(loaded)
+	local loaded = get_loaded()
+	local available = get_available()
 	return cfe({ type="group", value={loaded=loaded, available=available} })
 end
 
 delete_package = function(package, sessiondata)
-	local success, cmdresult = apk.delete_package(package)
+	local success, cmdresult = apk.delete(package)
 	if success then
 		-- Destroy menu and permissions info in session so recalculated
 		if sessiondata then sessiondata.menu = nil end
@@ -37,7 +37,7 @@ delete_package = function(package, sessiondata)
 end
 
 install_package = function(package,sessiondata)
-	local success, cmdresult = apk.install_package(package)
+	local success, cmdresult = apk.install(package)
 	if success then
 		-- Destroy menu and permissions info in session so recalculated
 		if sessiondata then sessiondata.menu = nil end
-- 
cgit v1.2.3