Merge branch 'master' into security

[dak.git] / dak / queue_report.py
diff --git a/dak/queue_report.py b/dak/queue_report.py

index f1d805650b1397c4b06e0f23591f2c7f0fadd020..e2d8578b8865a902ff32a308b52af97743b050c1 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -40,7 +40,7 @@ import apt_pkg
  
  from daklib import utils
  from daklib.queue import Upload
-from daklib.dbconn import DBConn, has_new_comment, DBChange, get_uid_from_fingerprint
+from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, get_uid_from_fingerprint
  from daklib.textutils import fix_maintainer
  from daklib.dak_exceptions import *
  
@@ -172,6 +172,23 @@ def header():
      <title>
        Debian NEW and BYHAND Packages
      </title>
+    <script type="text/javascript">
+    function togglePkg() {
+        var children = document.getElementsByTagName("*");
+        for (var i = 0; i < children.length; i++) {
+            if(!children[i].hasAttribute("class"))
+                continue;
+            c = children[i].getAttribute("class").split(" ");
+            for(var j = 0; j < c.length; j++) {
+                if(c[j] == "binNEW") {
+                    if (children[i].style.display == '')
+                        children[i].style.display = 'none';
+                    else children[i].style.display = '';
+                }
+            }
+        }
+    }
+    </script>
    </head>
    <body id="NEW">
      <div id="logo">
@@ -219,10 +236,12 @@ def footer():
      """
  
  def table_header(type, source_count, total_count):
-    print "<h1>Summary for: %s</h1>" % (type)
+    print "<h1 class='binNEW'>Summary for: %s</h1>" % (type)
+    print "<h1 class='binNEW' style='display: none'>Summary for: binary-%s only</h1>" % (type)
      print """
      <table class="NEW">
-      <caption>
+      <p class="togglepkg" onclick="togglePkg()">Click to toggle all/binary-NEW packages</p>
+      <caption class="binNEW">
      """
      print "Package count in <strong>%s</strong>: <em>%s</em>&nbsp;|&nbsp; Total Package count: <em>%s</em>" % (type, source_count, total_count)
      print """
@@ -250,10 +269,15 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
      global row_number
  
      trclass = "sid"
+    session = DBConn().session()
      for dist in distribution:
          if dist == "experimental":
              trclass = "exp"
  
+    if not len(session.query(DBSource).filter_by(source = source).all()):
+        trclass += " binNEW"
+    session.commit()
+
      if row_number % 2 != 0:
          print "<tr class=\"%s even\">" % (trclass)
      else:
@@ -262,7 +286,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
      print "<td class=\"package\">%s</td>" % (source)
      print "<td class=\"version\">"
      for vers in version.split():
-        print "<a href=\"/new/%s_%s.html\">%s</a><br/>" % (source, utils.html_escape(vers), utils.html_escape(vers))
+        print "<a href=\"new/%s_%s.html\">%s</a><br/>" % (source, utils.html_escape(vers), utils.html_escape(vers))
      print "</td>"
      print "<td class=\"arch\">%s</td>" % (arch)
      print "<td class=\"distribution\">"
@@ -430,16 +454,16 @@ def process_changes_files(changes_files, type, log):
          age =  Cnf["Queue-Report::Options::Age"]
      if Cnf.has_key("Queue-Report::Options::New"):
      # If we produce html we always have oldest first.
-        direction.append([4,-1,"ao"])
+        direction.append([5,-1,"ao"])
      else:
          if Cnf.has_key("Queue-Report::Options::Sort"):
              for i in Cnf["Queue-Report::Options::Sort"].split(","):
                  if i == "ao":
                      # Age, oldest first.
-                    direction.append([4,-1,age])
+                    direction.append([5,-1,age])
                  elif i == "an":
                      # Age, newest first.
-                    direction.append([4,1,age])
+                    direction.append([5,1,age])
                  elif i == "na":
                      # Name, Ascending.
                      direction.append([0,1,0])
@@ -448,10 +472,10 @@ def process_changes_files(changes_files, type, log):
                      direction.append([0,-1,0])
                  elif i == "nl":
                      # Notes last.
-                    direction.append([3,1,0])
+                    direction.append([4,1,0])
                  elif i == "nf":
                      # Notes first.
-                    direction.append([3,-1,0])
+                    direction.append([4,-1,0])
      entries.sort(lambda x, y: sortfunc(x, y))
      # Yes, in theory you can add several sort options at the commandline with. But my mind is to small
      # at the moment to come up with a real good sorting function that considers all the sidesteps you
@@ -495,7 +519,7 @@ def process_changes_files(changes_files, type, log):
              log.write("\n")
  
      if Cnf.has_key("Queue-Report::Options::New"):
-        direction.append([4,1,"ao"])
+        direction.append([5,1,"ao"])
          entries.sort(lambda x, y: sortfunc(x, y))
      # Output for a html file. First table header. then table_footer.
      # Any line between them is then a <tr> printed from subroutine table_row.