Removed downloadlogview action and use downloadweblog action again.

3 files changed, 6 insertions, 20 deletions

diff --git a/weblog-controller.lua b/weblog-controller.lua
index 83eeb9f..20b3134 100644
--- a/weblog-controller.lua
+++ b/weblog-controller.lua
@@ -56,25 +56,11 @@ end
 function downloadweblog(self)
 	self.conf.viewtype = "stream"
 	local retval = viewweblog(self)
-	local file = cfe({ type="longtext", value="", label=retval.value.clientuserid.value .. ".csv" })
-	local content = {"clientuserid,clientip,logdatetime,uri,bytes,reason,score,reason,badyesno,deniedyesno,bypassyesno"}
+	local file = cfe({ type="longtext", value="", label="Weblog-"..os.date()..".tab" })
+	local content = {"sourcename\tclientuserid\tclientip\tlogdatetime\turi\tbytes\treason\tscore\treason\tbadyesno\tdeniedyesno\tbypassyesno"}
 	for i,log in ipairs(retval.value.log.value) do
-		content[#content+1] = string.format("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,",
-			log.clientuserid, log.clientip, log.logdatetime, log.uri, log.bytes, log.reason, log.score or "0", log.reason, log.badyesno, log.deniedyesno, log.bypassyesno )
-	end
-	file.value = table.concat(content, "\n")
-	return file
-end
-
-function downloadlogview(self)
-	thisdate=os.date()
-	self.conf.viewtype = "stream"
-	local retval = viewweblog(self)
-	local file = cfe({ type="longtext", value="", label="Weblog-resnet-"..thisdate..".tab" })
-	local content = {"clientuserid\tclientip\tlogdatetime\turi\tbytes\treason\tscore\treason\tbadyesno\tdeniedyesno\tbypassyesno"}
-	for i,log in ipairs(retval.value.log.value) do
-		content[#content+1] = string.format("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t",
-			log.clientuserid, log.clientip, log.logdatetime, log.uri, log.bytes, log.reason, log.score or "0", log.reason, log.badyesno, log.deniedyesno, log.bypassyesno )
+		content[#content+1] = string.format("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
+			log.sourcename, log.clientuserid, log.clientip, log.logdatetime, log.uri, log.bytes, log.reason, log.score, log.reason, log.badyesno, log.deniedyesno, log.bypassyesno)
 	end
 	file.value = table.concat(content, "\n")
 	return file
diff --git a/weblog-viewweblog-html.lsp b/weblog-viewweblog-html.lsp
index 18e47d9..4193135 100644
--- a/weblog-viewweblog-html.lsp
+++ b/weblog-viewweblog-html.lsp
@@ -225,7 +225,7 @@ end
 <% end %>
 <DT>Download Options</DT>
 <% if page_info.action == "viewweblog" then %>
-<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/downloadlogview") %>" method="POST">
+<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/downloadweblog") %>" method="POST">
 <input type="hidden"  name="activelog" value="<%= html.html_escape(data.value.activelog.value) %>" >
 <input type="hidden"  name="starttime" value="<%= html.html_escape(data.value.starttime.value) %>" >
 <input type="hidden"  name="clientuserid" value="<%= html.html_escape(data.value.clientuserid.value) %>" >
diff --git a/weblog.roles b/weblog.roles
index 883acd2..bb30a50 100644
--- a/weblog.roles
+++ b/weblog.roles
@@ -1,3 +1,3 @@
 USER=weblog:viewauditstats,weblog:completeaudit,weblog:viewactivitylog,weblog:viewwatchlist,weblog:viewweblog,weblog:downloadweblog,weblog:viewblocklog,weblog:viewusagestats,weblog:deletewatchlistentry,weblog:createwatchlistentry,weblog:adhocquery,weblog:downloadadhocquery,weblog:updateselected,weblog:editselected
 EXPERT=weblog:config,weblog:viewweblog,weblog:listsources,weblog:createsource,weblog:deletesource,weblog:editsource,weblog:testsource,weblog:importlogs,weblog:status,weblog:createdatabase,weblog:listfiles,weblog:editfile
-ADMIN=weblog:config,weblog:viewauditstats,weblog:completeaudit,weblog:viewactivitylog,weblog:viewwatchlist,weblog:viewweblog,weblog:downloadweblog,weblog:downloadlogview,weblog:updateselected,weblog:editselected,weblog:clearselected,weblog:viewblocklog,weblog:viewusagestats,weblog:listsources,weblog:createsource,weblog:deletesource,weblog:editsource,weblog:testsource,weblog:importlogs,weblog:deletewatchlistentry,weblog:createwatchlistentry,weblog:adhocquery,weblog:downloadadhocquery,weblog:status,weblog:createdatabase,weblog:listfiles,weblog:editfile
+ADMIN=weblog:config,weblog:viewauditstats,weblog:completeaudit,weblog:viewactivitylog,weblog:viewwatchlist,weblog:viewweblog,weblog:downloadweblog,weblog:updateselected,weblog:editselected,weblog:clearselected,weblog:viewblocklog,weblog:viewusagestats,weblog:listsources,weblog:createsource,weblog:deletesource,weblog:editsource,weblog:testsource,weblog:importlogs,weblog:deletewatchlistentry,weblog:createwatchlistentry,weblog:adhocquery,weblog:downloadadhocquery,weblog:status,weblog:createdatabase,weblog:listfiles,weblog:editfile