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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 096e133f598580109977227a626e4450ab6babc5
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 5 17:49:17 2016 +0100

    Get long descriptions for vcs packages as well (but needs to speed up again

diff --git a/misc/sql/edam.sh b/misc/sql/edam.sh
index e2bd111..c73576e 100755
--- a/misc/sql/edam.sh
+++ b/misc/sql/edam.sh
@@ -61,7 +61,11 @@ $JSONBEGIN
                       (SELECT DISTINCT package FROM blends_dependencies WHERE blend = 'debian-med' AND task IN ('bio', 'bio-dev'))
        ) tmp
     ) p
-    LEFT OUTER JOIN descriptions en ON en.language = 'en' AND en.package = p.package AND en.release = p.release  AND en.description_md5 = p.description_md5
+    LEFT OUTER JOIN (
+       SELECT package, description, long_description, release, description_md5 FROM descriptions WHERE language = 'en'
+       UNION
+       SELECT package, description, long_description, 'vcs' AS release, description_md5 FROM blends_prospectivepackages 
+    ) en ON en.package = p.package AND (en.release = p.release OR p.release = 'vcs')  AND (en.description_md5 = p.description_md5 OR en.description_md5 IS NULL)
     JOIN (
       -- select packages which have versions outside experimental
       SELECT px.package, strip_binary_upload(px.version) AS version,

-- 
Static and dynamic websites for Debian Pure Blends