X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=826e0441954ce8515968e07ee010e15900be840f;hb=b612f3da207fa0d75a5d3b204ac8f02bb244231a;hp=90b8e6dac1a964cf30b7c3db79d87ddd3e91e2b0;hpb=1520c50be414c3b56df277fd0edda01efa5d4d15;p=dak.git

diff --git a/daklib/database.py b/daklib/database.py
index 90b8e6da..826e0441 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -4,8 +4,9 @@
 @group readonly: get_suite_id, get_section_id, get_priority_id, get_override_type_id,
                  get_architecture_id, get_archive_id, get_component_id, get_location_id,
                  get_source_id, get_suite_version, get_files_id, get_maintainer, get_suites,
-                 get_suite_architectures
+                 get_suite_architectures, get_new_comments, has_new_comment
 @group read/write: get_or_set*, set_files_id
+@group writeonly: add_new_comment, delete_new_comments
 
 @contact: Debian FTP Master <ftpmaster@debian.org>
 @copyright: 2000, 2001, 2002, 2003, 2004, 2006  James Troup <james@nocrew.org>
@@ -33,6 +34,7 @@ import sys
 import time
 import types
 import utils
+import pg
 from binary import Binary
 
 ################################################################################
@@ -838,7 +840,112 @@ def get_suites(pkgname, src=False):
 
 ################################################################################
 
-def copy_temporary_contents(package, version, deb, reject):
+def get_new_comments(package):
+    """
+    Returns all the possible comments attached to C{package} in NEW. All versions.
+
+    @type package: string
+    @param package: name of the package
+
+    @rtype: list
+    @return: list of strings containing comments for all versions from all authors for package
+    """
+
+    comments = []
+    query = projectB.query(""" SELECT version, comment, author, notedate
+                               FROM new_comments
+                               WHERE package = '%s'
+                               ORDER BY notedate
+                           """ % (package))
+
+    for row in query.getresult():
+        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
+
+def has_new_comment(package, version, ignore_trainee=False):
+    """
+    Returns true if the given combination of C{package}, C{version} has a comment.
+    If C{ignore_trainee} is true, comments from a trainee are ignored.
+
+    @type package: string
+    @param package: name of the package
+
+    @type version: string
+    @param version: package version
+
+    @type version: boolean
+    @param version: ignore trainee comments
+
+    @rtype: boolean
+    @return: true/false
+    """
+
+    trainee=""
+    if ignore_trainee:
+        trainee='AND trainee=false'
+
+    exists = projectB.query("""SELECT 1 FROM new_comments
+                               WHERE package='%s'
+                               AND version='%s'
+                               %s
+                               LIMIT 1"""
+                            % (package, version, trainee) ).getresult()
+
+    if not exists:
+        return False
+    else:
+        return True
+
+def add_new_comment(package, version, comment, author, trainee=False):
+    """
+    Add a new comment for C{package}, C{version} written by C{author}
+
+    @type package: string
+    @param package: name of the package
+
+    @type version: string
+    @param version: package version
+
+    @type comment: string
+    @param comment: the comment
+
+    @type author: string
+    @param author: the authorname
+
+    @type trainee: boolean
+    @param trainee: trainee comment
+    """
+
+    projectB.query(""" INSERT INTO new_comments (package, version, comment, author, trainee)
+                       VALUES ('%s', '%s', '%s', '%s', '%s')
+    """ % (package, version, pg.escape_string(comment), pg.escape_string(author), trainee))
+
+    return
+
+def delete_new_comments(package, version):
+    """
+    Delete a comment for C{package}, C{version}, if one exists
+    """
+
+    projectB.query(""" DELETE FROM new_comments
+                       WHERE package = '%s' AND version = '%s'
+    """ % (package, version))
+    return
+
+def delete_all_new_comments(package):
+    """
+    Delete all comments for C{package}, if they exist
+    """
+
+    projectB.query(""" DELETE FROM new_comments
+                       WHERE package = '%s'
+    """ % (package))
+    return
+
+################################################################################
+def copy_temporary_contents(package, version, arch, deb, reject):
     """
     copy the previously stored contents from the temp table to the permanant one
 
@@ -848,8 +955,13 @@ def copy_temporary_contents(package, version, deb, reject):
 
     # first see if contents exist:
 
+    arch_id = get_architecture_id (arch)
+
     exists = projectB.query("""SELECT 1 FROM pending_content_associations
-                               WHERE package='%s' LIMIT 1""" % package ).getresult()
+                               WHERE package='%s'
+                               AND version='%s'
+                               AND architecture=%d LIMIT 1"""
+                            % (package, version, arch_id) ).getresult()
 
     if not exists:
         # This should NOT happen.  We should have added contents
@@ -858,6 +970,7 @@ def copy_temporary_contents(package, version, deb, reject):
         subst = {
             "__PACKAGE__": package,
             "__VERSION__": version,
+            "__ARCH__": arch,
             "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"],
             "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] }
 
@@ -870,10 +983,12 @@ def copy_temporary_contents(package, version, deb, reject):
         sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)
                  SELECT currval('binaries_id_seq'), filepath, filename FROM pending_content_associations
                  WHERE package='%s'
-                     AND version='%s'""" % (package, version)
+                     AND version='%s'
+                     AND architecture=%d""" % (package, version, arch_id)
         projectB.query(sql)
         projectB.query("""DELETE from pending_content_associations
                           WHERE package='%s'
-                            AND version='%s'""" % (package, version))
+                            AND version='%s'
+                            AND architecture=%d""" % (package, version, arch_id))
 
     return exists