X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fdatabase.py;h=fc8dd677d9dd0d91ed857a24ccea7648d0e98eaa;hb=cf570123df90046ddf8161608f2a044af59649ee;hp=dbfa2af76226457b1046f81b52d3c20b196f4915;hpb=562c828dc45dea97cd00143b8bde5352bbed3bb0;p=dak.git diff --git a/daklib/database.py b/daklib/database.py index dbfa2af7..fc8dd677 100755 --- a/daklib/database.py +++ b/daklib/database.py @@ -34,6 +34,7 @@ import sys import time import types import utils +import pg from binary import Binary ################################################################################ @@ -851,12 +852,14 @@ def get_new_comments(package): """ comments = [] - query = projectB.query(""" SELECT version, comment, author + query = projectB.query(""" SELECT version, comment, author, notedate FROM new_comments - WHERE package = '%s' """ % (package)) + WHERE package = '%s' + ORDER BY notedate + """ % (package)) for row in query.getresult(): - comments.append("\nAuthor: %s\nVersion: %s\n\n%s\n" % (row[2], row[0], row[1])) + comments.append("\nAuthor: %s\nVersion: %s\nTimestamp: %s\n\n%s\n" % (row[2], row[0], row[3], row[1])) comments.append("-"*72) return comments @@ -905,7 +908,7 @@ def add_new_comment(package, version, comment, author): projectB.query(""" INSERT INTO new_comments (package, version, comment, author) VALUES ('%s', '%s', '%s', '%s') - """ % (package, version, comment, author) ) + """ % (package, version, pg.escape_string(comment), pg.escape_string(author))) return