X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FInclude.pm;h=e619a228d7506402b232975eebf5ac6155d7f58c;hp=1cbcca9de3e09790280105192f16df6345ab1f2d;hb=07aec9f5f20e4a605d65bbe2337a05663c0b16e7;hpb=208f038007b693c71734ee3c4bbee3ef7dc43cef diff --git a/lib/NDWeb/Include.pm b/lib/NDWeb/Include.pm index 1cbcca9..e619a22 100644 --- a/lib/NDWeb/Include.pm +++ b/lib/NDWeb/Include.pm @@ -27,7 +27,7 @@ use CGI qw/:standard/; our @ISA = qw/Exporter/; our @EXPORT = qw/parseMarkup - intelquery html_escape + html_escape comma_value array_expand/; sub html_escape($) { @@ -76,18 +76,6 @@ sub parseMarkup ($) { return $text; } -sub intelquery { - my ($columns,$where) = @_; - return qq{ -SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username -FROM (intel i NATURAL JOIN users u) - JOIN current_planet_stats t ON i.target = t.pid - JOIN current_planet_stats o ON i.sender = o.pid -WHERE $where -GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick,i.sender,i.target -ORDER BY i.tick DESC, i.mission}; -} - sub array_expand ($) { my ($array) = @_;