', defaults={'date': None})
+@app.route('/log/', defaults={'chan': Default_Chan, 'date': None})
+@app.route('/log', defaults={'chan': Default_Chan, 'date': None})
+def log(chan, date):
+ # Handle rubbish chan:
+ if chan not in Channels:
+ return redirect(url_for('log'))
+
+ # Get current time
+ now = datetime.now()
+
+ # Whether we are viewing 'current' tail
+ tail = False
+
+ # If viewing 'current' log:
+ if date == None:
+ date = now.strftime(Date_Short_Format)
+ tail = True
+
+ # Parse given date, and redirect to default log if rubbish:
+ try:
+ day_start = datetime.strptime(date, Date_Short_Format)
+ except Exception, e:
+ return redirect(url_for('log'))
+
+ # Determine the end of the interval being shown
+ day_end = day_start + timedelta(days=1)
+
+ # Get the loglines from DB
+ lines = query_db(
+ '''select * from loglines where chan=%s
+ and t between %s and %s order by idx asc;''',
+ [chan, day_start, day_end], one=False)
+
+ # Return the HTMLized text
+ return render_template('log.html',
+ chan = chan,
+ loglines = lines,
+ date = date,
+ tail = tail)
+
+
+
+Name_Chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"
+
+def sanitize_speaker(s):
+ return "".join([ch for ch in s if ch in Name_Chars])
+
+
+def re_escape(s):
+ return re.sub(r"[(){}\[\].*?|^$\\+-]", r"\\\g<0>", s)
+
+# Search knob. Supports 'chan' parameter.
+@app.route('/log-search')
+def logsearch():
+ # The query params:
+ chan = request.args.get('chan', default = Default_Chan, type = str)
+ query = request.args.get('q', default = '', type = str)
+ # page_num = request.args.get('page', default = 0, type = int)
+
+ # Handle rubbish chan:
+ if chan not in Channels:
+ return redirect(url_for('log'))
+
+ nres = 0
+ searchres = []
+ tokens_orig = []
+ search_head = "Query is too short!"
+ # Forbid query that is too short:
+ if len(query) >= Min_Query_Length:
+ # Get the search tokens to use:
+ tokens = query.split()
+ tokens_standard = []
+ from_users = []
+
+ # separate out "from:foo" tokens and ordinary:
+ for t in tokens:
+ if t.startswith("from:") or t.startswith("f:"):
+ from_users.append(t.split(':')[1]) # Record user for 'from' query
+ else:
+ tokens_standard.append(t)
+
+ from_users = ['%' + sanitize_speaker(t) + '%' for t in from_users]
+ tokens_orig = [re_escape(t) for t in tokens_standard]
+ tokens_formed = ['%' + t + '%' for t in tokens_orig]
+
+ # Query is usable; perform the search on DB and get the finds
+ if from_users == []:
+ searchres = query_db(
+ '''select * from loglines where chan=%s
+ and payload ilike all(%s) order by idx desc limit %s;''',
+ [chan,
+ tokens_formed,
+ Max_Search_Results], one=False)
+ else:
+ print "from=", from_users
+
+ searchres = query_db(
+ '''select * from loglines where chan=%s
+ and speaker ilike any(%s)
+ and payload ilike all(%s) order by idx desc limit %s;''',
+ [chan,
+ from_users,
+ tokens_formed,
+ Max_Search_Results], one=False)
+
+
+ # Number of entries found
+ nres = len(searchres)
+ search_head = "{0} entries found in {1} for '{2}' :".format(
+ nres, chan, html_escape(query))
+
+ # No paging support just yet:
+ return render_template('searchres.html',
+ query = query,
+ nres = nres,
+ chan = chan,
+ search_head = search_head,
+ tokens = tokens_orig,
+ loglines = searchres)
+
+
+# Comment this out if you don't have one
+@app.route('/favicon.ico')
+def favicon():
+ return redirect(url_for('static', filename='favicon.ico'))
+
+
+## App Mode
+if __name__ == '__main__':
+ app.run(threaded=True, port=WWW_Port)
diff -uNr a/logotron/static/README b/logotron/static/README
--- a/logotron/static/README false
+++ b/logotron/static/README d89bc958b029448a46d627da724957403b8db562b3a8756236142341a5a998212440f9e5a5d5679633d89f19c5f07217195165e4c7931ce57697bb678bea6fe4
@@ -0,0 +1 @@
+favicon.ico goes in this dir.
diff -uNr a/logotron/templates/layout.html b/logotron/templates/layout.html
--- a/logotron/templates/layout.html false
+++ b/logotron/templates/layout.html 587ccf877ba1bff6dfa4547ebfed8fae1b071cf243fa4bd77f56f91c0a1b6a692137ff9dc5b458c34783ac632bcb83abac664073ab82d79649709810f4cf9c0a
@@ -0,0 +1,127 @@
+
+
+
+
+ {% block title %}
+ {% endblock %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ |
+
+
+ {{ gen_chanlist( chan ) | safe }}
+ |
+
+
+
+ 
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ {% block body %}{% endblock %}
+
+
+
+
diff -uNr a/logotron/templates/log.html b/logotron/templates/log.html
--- a/logotron/templates/log.html false
+++ b/logotron/templates/log.html 44d51aaef738815d01d92cbf6a1d0d44803627579352dbaafe0257346e5fdff9d76ec64fd00ebb435e177869502f97c1b72c7322ee6108c6784011d222966ba7
@@ -0,0 +1,17 @@
+{% extends "layout.html" %}
+
+{% block title %}
+#{{ chan }} | {{ date }}
+{% endblock %}
+
+{% block body %}
+
+{{ generate_navbar(date, tail, chan) | safe }}
+
+{% for l in loglines %}
+{{ format_logline(l) | safe }}
+{% endfor %}
+
+{{ generate_navbar(date, tail, chan) | safe }}
+
+{% endblock %}
diff -uNr a/logotron/templates/searchres.html b/logotron/templates/searchres.html
--- a/logotron/templates/searchres.html false
+++ b/logotron/templates/searchres.html a60ca105a579ed2b256dbfc92a7ca7468d17ba875a3215217bb1bb2ea15ac04e9e56c66205b1a4387263b068c39f9d72f08e76edce2b371f4f1aebe24bbf7f03
@@ -0,0 +1,17 @@
+{% extends "layout.html" %}
+
+{% block title %}
+{{ nres }} Results for {{ query }} in #{{ chan }}
+{% endblock %}
+
+{% block body %}
+
+{{ search_head | safe }}
+
+
+
+{% for l in loglines %}
+{{ format_logline(l, tokens) | safe }}
+{% endfor %}
+
+{% endblock %}