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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 88bebeb3f394e37fc55079fd0442a8f6878675cf
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 29 14:58:02 2015 +0200

    Adapt thermometer to use upstream table instead of deprecated dehs table

diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index 6da63cb..cbb539f 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -89,8 +89,16 @@ def main():
            ubuntuprev2.version AS ubuntuprev2,
            ubuntuprev1.version AS ubuntuprev1,
            latestubuntu.version AS latestubuntu,
-           d.unstable_upstream AS upstream,
-           CASE WHEN d.unstable_status IS NOT NULL THEN CAST(unstable_status AS text) ELSE 'none' END AS upstreamstatus,
+           d.upstream_version AS upstream,
+           -- map values from former dehs to upstream table values
+           CASE WHEN d.status IS NULL OR
+                     d.status = '' OR
+                     d.status = 'error'					THEN 'none'
+                WHEN d.status = 'Newer version available'		THEN 'outdated'
+                WHEN d.status = 'up to date'				THEN 'upToDate'
+                WHEN d.status = 'Debian version newer than remote site'	THEN 'newer-in-debian'
+                ELSE 'unknown' -- should not occure!
+           END AS upstreamstatus,
            homepage,
            wnpp,
            is_in_debian,
@@ -311,7 +319,7 @@ def main():
           ) tmp
         GROUP BY source
       ) tasks ON b.source = tasks.source
-      LEFT OUTER JOIN dehs d ON b.source = d.source
+      LEFT OUTER JOIN (SELECT source, upstream_version, status FROM upstream WHERE release = 'sid') d ON b.source = d.source
       ORDER BY b.source
     ;
     """ % ( ubuntuprev2, ubuntuprev1, latestubuntu )

-- 
Static and dynamic websites for Debian Pure Blends