[Blends-commit] [SCM] website branch, master, updated. c5662ffdf5aeaa193f9b90221846fc40e6dc4220

[Andreas Tille]

The following commit has been merged in the master branch:
commit c5662ffdf5aeaa193f9b90221846fc40e6dc4220
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jul 15 13:40:44 2013 +0200

    Add links to tasks in additional column

diff --git a/webtools/templates/thermometer.xhtml b/webtools/templates/thermometer.xhtml
index 66ab200..3c09e6f 100644
--- a/webtools/templates/thermometer.xhtml
+++ b/webtools/templates/thermometer.xhtml
@@ -62,12 +62,12 @@
         <caption><h3>$projectname Package Thermometer</h3></caption>
           <tr class='title'>
             <th>Package</th>
-            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>UNRELEASED</th><th>upstream</th>
+            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>UNRELEASED</th><th>upstream</th><th>tasks</th>
          </tr>
          <py:for each="pkg in blend_data">
          <tr class='${pkg.debianstatus}'>
            <td><strong>${pkg.source}</strong> (<span py:choose="pkg.is_in_debian"><span py:when="1"><a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>, </span><span py:otherwise=""><span py:if="pkg.wnpp != ''"><a href="http://bugs.debian.org/${pkg.wnpp}">WNPP</a>, </span></span></span><span py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</a>, </span><a href='${pkg.homepage}'>UP</a>)</td>
-           <td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.experimental}</td><td>${pkg.UNRELEASED}</td><td class='${pkg.upstreamstatus}'>${pkg.upstream}</td>
+           <td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.experimental}</td><td>${pkg.UNRELEASED}</td><td class='${pkg.upstreamstatus}'>${pkg.upstream}</td><td class='none'><py:for each="task in pkg.tasks"><a href="../tasks/${task}">${task}</a> </py:for></td>
          </tr>
          </py:for>
      </table>
diff --git a/webtools/templates/uthermometer.xhtml b/webtools/templates/uthermometer.xhtml
index 2e6fb42..84d5ce7 100644
--- a/webtools/templates/uthermometer.xhtml
+++ b/webtools/templates/uthermometer.xhtml
@@ -62,12 +62,12 @@
         <caption><h3>$projectname  packages in Ubuntu Thermometer</h3></caption>
           <tr class='title'>
             <th>Package</th>
-            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>precise</th><th>quantal</th><th>raring</th><th>upstream</th>
+            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>precise</th><th>quantal</th><th>raring</th><th>upstream</th><th>tasks</th>
          </tr>
          <py:for each="pkg in blend_data">
          <tr class='${pkg.ubuntustatus}'>
            <td><strong>${pkg.source}</strong> (<span py:choose="pkg.is_in_debian"><span py:when="1"><a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>, </span><span py:otherwise=""><span py:if="pkg.wnpp != ''"><a href="http://bugs.debian.org/${pkg.wnpp}">WNPP</a>, </span></span></span><span py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</a>, </span><a href='${pkg.homepage}'>UP</a>)</td>
-           <td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.precise}</td><td>${pkg.quantal}</td><td>${pkg.raring}</td><td class='${pkg.upstreamstatus}'>${pkg.upstream}</td>
+           <td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.precise}</td><td>${pkg.quantal}</td><td>${pkg.raring}</td><td class='${pkg.upstreamstatus}'>${pkg.upstream}</td><td class='none'><py:for each="task in pkg.tasks"><a href="../tasks/${task}">${task}</a> </py:for></td>
          </tr>
          </py:for>
      </table>
diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index e5a4843..8830462 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -10,7 +10,7 @@ DEFAULTPORT=5432
 from sys import argv, stderr, exit
 import os
 import psycopg2
-#import json
+import json
 import re
 import time
 from datetime import datetime
@@ -82,7 +82,7 @@ def main():
            wnpp,
            is_in_debian,
            vcs_browser,
-           tasks,
+           tasks.tasks,
            CASE WHEN stable.version >= unstable.version THEN 'upToDate'
                 WHEN stable.version <  unstable.version THEN 'debianOutOfDate'
                 WHEN stable.version IS NOT NULL AND unstable.version IS NULL THEN 'obsolete'
@@ -257,12 +257,15 @@ def main():
       LEFT OUTER JOIN (
         SELECT source, array_agg(task) AS tasks FROM (
           SELECT DISTINCT p.source, b.task
-            FROM packages p
-            JOIN releases r ON p.release = r.release
+            FROM all_packages p                                  -- needs 'all_packages' / 'all_sources' and NOT verifying releases to fetch Ubuntu only packages
             JOIN blends_dependencies b ON b.package = p.package
-            JOIN sources s ON p.source = s.source AND p.release = s.release
-            WHERE b.blend = '$1'
-        ) tmp
+            JOIN all_sources s ON p.source = s.source
+            WHERE b.blend = $1
+          UNION
+            SELECT DISTINCT pr.source, bd.task FROM blends_prospectivepackages pr
+              JOIN blends_dependencies bd ON bd.package = pr.package
+              WHERE bd.blend = $1 AND bd.distribution = 'prospective'
+          ) tmp
         GROUP BY source
       ) tasks ON b.source = tasks.source
       LEFT OUTER JOIN dehs d ON b.source = d.source
@@ -281,7 +284,7 @@ def main():
     else:
         print >>stderr, "No data received for Blend", blendname
         exit(1)
-    
+
     # Define directories used
     current_dir  = os.path.dirname(__file__)
     # locale_dir   = os.path.join(current_dir, 'locale')

-- 
Static and dynamic websites for Debian Pure Blends