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

[Andreas Tille]

The following commit has been merged in the master branch:
commit f3af052714bea1cf58ff7b997677aca7f7151111
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 5 12:18:38 2016 +0100

    Add description

diff --git a/misc/sql/edam.sh b/misc/sql/edam.sh
index ddfb14e..ad76335 100755
--- a/misc/sql/edam.sh
+++ b/misc/sql/edam.sh
@@ -31,11 +31,13 @@ team="'debian-med-packaging at lists.alioth.debian.org'"
 
 psql $PORT $OUTPUTFORMAT $SERVICE >edam.$EXT <<EOT
 $JSONBEGIN
- SELECT source, array_agg(package), distribution, release, component, version, homepage FROM
- (
+-- If you want to make the output at source level uncomment this
+-- SELECT source, array_agg(package) as packages, distribution, release, component, version, homepage FROM
+-- (
   SELECT DISTINCT
          p.package, p.distribution, p.release, p.component, p.version,
-         p.source, p.homepage
+         p.source, p.homepage,
+          en.description AS description, en.long_description AS long_description
     FROM (
       SELECT DISTINCT
              package, distribution, release, component, strip_binary_upload(version) AS version,
@@ -73,10 +75,11 @@ $JSONBEGIN
         JOIN releases rx ON py.release = rx.release
         GROUP BY px.package, px.version
        ) pvar ON pvar.package = p.package AND pvar.version = p.version AND pvar.release = p.release
-
- ) tmp
-   GROUP BY source, distribution, release, component, version, homepage
-   ORDER BY source
+   ORDER BY source, package
+-- If you want to make the output at source level uncomment this
+-- ) tmp
+--   GROUP BY source, distribution, release, component, version, homepage
+--   ORDER BY source
 $JSONEND
 ;
 EOT

-- 
Static and dynamic websites for Debian Pure Blends