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

[Andreas Tille]

The following commit has been merged in the master branch:
commit acdf1bfcddb0d760667387dbfbabc3186c0702eb
Author: Andreas Tille <tille at debian.org>
Date:   Sat Feb 13 08:32:41 2016 +0100

    Add popcon and edam values

diff --git a/misc/sql/edam.sh b/misc/sql/edam.sh
index 2f6b2ef..7edba02 100755
--- a/misc/sql/edam.sh
+++ b/misc/sql/edam.sh
@@ -72,7 +72,10 @@ $JSONBEGIN
          p.source, p.homepage,
           en.description AS description, en.long_description AS long_description,
           interface.tags AS interface, biology.tags AS biology, field.tags AS fields, use.tags AS use,
-          bibdoi.value as doi
+          pop.vote || ' / ' || pop.recent || ' / ' || pop.insts as popcon,
+          bibdoi.value as doi,
+          edam.topics  as topics,
+          edam.scopes  as edam_scopes
     FROM (
       SELECT * FROM (
         SELECT DISTINCT
@@ -163,6 +166,8 @@ $JSONBEGIN
           GROUP BY package
     ) use ON use.package = p.package
     LEFT OUTER JOIN bibref bibdoi     ON p.source = bibdoi.source     AND bibdoi.rank = 0     AND bibdoi.key     = 'doi'     AND bibdoi.package = ''
+    LEFT OUTER JOIN popcon pop        ON p.package = pop.package
+    LEFT OUTER JOIN edam   edam       ON p.source = edam.source       AND p.package = edam.package
    ORDER BY source, package
 -- If you want to make the output at source level uncomment this
 -- ) tmp

-- 
Static and dynamic websites for Debian Pure Blends