X-Git-Url: https://git.auf.org/?p=auf_savoirs_en_partage_django.git;a=blobdiff_plain;f=auf_savoirs_en_partage%2Fscripts%2Fsphinx.conf.py.in;h=f9e01c20f49a893c3daf8d371be98dc260901e1d;hp=c5f52f70ceb5ad75cfd546289e35b0c2a35cd1c5;hb=99d595cddab97168550bc729b20b1785236e3baa;hpb=db134a95e6652f048ced4e99fbedc3a1ebafecc7

diff --git a/auf_savoirs_en_partage/scripts/sphinx.conf.py.in b/auf_savoirs_en_partage/scripts/sphinx.conf.py.in
index c5f52f7..f9e01c2 100644
--- a/auf_savoirs_en_partage/scripts/sphinx.conf.py.in
+++ b/auf_savoirs_en_partage/scripts/sphinx.conf.py.in
@@ -171,15 +171,15 @@ emit_source('savoirsenpartage_chercheurs',
                       r.nom AS region,
                       r.id AS region_id,
                       GROUP_CONCAT(DISTINCT d.nom_discipline) AS disciplines,
-                      GROUP_CONCAT(DISTINCT pub.titre) AS publications,
+                      GROUP_CONCAT(DISTINCT IFNULL(pub.titre, pub.publication_affichage)) AS publications,
                       t.titre AS these,
                       GROUP_CONCAT(DISTINCT g.nom) AS groupes,
                       GROUP_CONCAT(DISTINCT ex.nom) AS expertises,
                       GROUP_CONCAT(DISTINCT g.id) AS groupe_ids,
                       TO_DAYS(c.date_modification) AS date_modification,
-                      CASE pays WHEN 'Nord' THEN 1 
-                                WHEN 'Sud' THEN 2 
-                                END AS nord_sud,
+                      CASE pays.nord_sud WHEN 'Nord' THEN 1 
+                                         WHEN 'Sud' THEN 2 
+                                         END AS nord_sud,
                       CASE statut WHEN 'enseignant' THEN 1
                                   WHEN 'etudiant' THEN 2
                                   WHEN 'independant' THEN 3