1 files changed, 15 insertions, 11 deletions
diff --git a/weblog-adhocquery-html.lsp b/weblog-adhocquery-html.lsp
index b55fc4d..e1c79f2 100644
--- a/weblog-adhocquery-html.lsp
+++ b/weblog-adhocquery-html.lsp
@@ -4,30 +4,29 @@ require("viewfunctions")
 
 <% if form.value.result then %>
 <H1><%= html.html_escape(form.value.result.label) %></H1>
+<DL>
 <% require("html") %>
 <%= html.cfe_unpack(form.value.result.value) %>
 <form action="/cgi-bin/acf/weblog/weblog/downloadadhocquery" method="POST">
 <input class="hidden" type="hidden"  name="query"  value="<%= html.html_escape(form.value.query.value) %>" >
-<DL>
 <DT>Download query result</DT><DD><input class="submit" type="submit" name="Download" value="Download"></DD>
-</DL>
 </FORM>
+</DL>
 <% end %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <% displayformstart(form, page_info) %>
-<DL>
 <% displayformitem(form.value.query, "query") %>
-</DL>
-<% displayformend(form) %>
-
 This form accepts a Postgresql SELECT statement and displays the results. Examples:
 <ul>
 <li><pre>SELECT clientuserid, sum(bytes) AS total FROM weblog GROUP BY clientuserid ORDER BY total DESC</pre>
 <li><pre>SELECT extract(hour from date) AS hour, sum(numrequest) AS numrequest, sum(numblock) AS numblock FROM usagestat GROUP BY extract(hour from date) ORDER BY hour</pre>
 </ul>
 The available database tables and descriptions are as follows:<br>
+<% displayformend(form) %>
+
 <H3>PubWeblog and PubBlocklog</H3>
+<DL>
 These tables contain the combined squid access log and dansguardian log for every access and blocked access respectively. The definition of the table is as follows:
 <pre>
 (
@@ -41,16 +40,19 @@ These tables contain the combined squid access log and dansguardian log for ever
     score integer,
     shortreason text
 )
-</pre>
+</pre></DL>
 <H3>dbHistLog</H3>
+<DL>
 This table contains the database history, including such information as which log files were loaded and how many entries they contained. The definition of the table is as follows:
 <pre>
 (
     logdatetime timestamp(3) without time zone NOT NULL,
     msgtext text
 )
-</pre>
+</pre></DL>
+
 <H3>Source</H3>
+<DL>
 This table contains the list of log file sources. The definition of the table is as follows:
 <pre>
 (
@@ -62,8 +64,9 @@ This table contains the list of log file sources. The definition of the table is
     tzislocal boolean,
     enabled boolean
 )
-</pre>
+</pre></DL>
 <H3>Usagestat</H3>
+<DL>
 This table contains a historical record of pages requested and blocked by hour. The definition of the table is as follows:
 <pre>
 (
@@ -72,12 +75,13 @@ This table contains a historical record of pages requested and blocked by hour.
     numrequest integer,
     numblock integer
 )
-</pre>
+</pre></DL>
 <H3>Watchlist</H3>
+<DL>
 This table contains the user watch list. The definition of the table is as follows:
 <pre>
 (
     clientuserid character varying(64) NOT NULL,
     expiredatetime timestamp(0) without time zone NOT NULL
 )
-</pre>
+</pre></DL>