From 8ef54fcd63260f44fd8727702869812d0bc11997 Mon Sep 17 00:00:00 2001 From: loicgasser Date: Thu, 10 Oct 2013 11:05:52 +0200 Subject: [PATCH 1/2] use topic in layers_js instead of projekte in layers_bod_info --- conf/sphinx.conf.in | 68 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/conf/sphinx.conf.in b/conf/sphinx.conf.in index ae337097..8fa360b7 100755 --- a/conf/sphinx.conf.in +++ b/conf/sphinx.conf.in @@ -154,11 +154,19 @@ source src_layers_de : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'de' as lang \ - , projekte as topics \ + , 'rm' as lang \ + , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ - from re3.view_bod_layer_info_de + from (SELECT view_layers_js.bgdi_id, \ + view_bod_layer_info_de.kurzbezeichnung, \ + view_bod_layer_info_de.volltextsuche, \ + view_bod_layer_info_de.bod_layer_id, \ + view_layers_js.topics, \ + view_layers_js.staging \ + from re3.view_layers_js, \ + re3.view_bod_layer_info_de \ + where view_layers_js.bod_layer_id = view_bod_layer_info_de.bod_layer_id) as res } source src_layers_fr : layers @@ -170,11 +178,19 @@ source src_layers_fr : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'fr' as lang \ - , projekte as topics \ + , 'rm' as lang \ + , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ - from re3.view_bod_layer_info_fr + from (SELECT view_layers_js.bgdi_id, \ + view_bod_layer_info_fr.kurzbezeichnung, \ + view_bod_layer_info_fr.volltextsuche, \ + view_bod_layer_info_fr.bod_layer_id, \ + view_layers_js.topics, \ + view_layers_js.staging \ + from re3.view_layers_js, \ + re3.view_bod_layer_info_fr \ + where view_layers_js.bod_layer_id = view_bod_layer_info_fr.bod_layer_id) as res } source src_layers_en : layers @@ -186,11 +202,19 @@ source src_layers_en : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'en' as lang \ - , projekte as topics \ + , 'rm' as lang \ + , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ - from re3.view_bod_layer_info_en + from (SELECT view_layers_js.bgdi_id, \ + view_bod_layer_info_en.kurzbezeichnung, \ + view_bod_layer_info_en.volltextsuche, \ + view_bod_layer_info_en.bod_layer_id, \ + view_layers_js.topics, \ + view_layers_js.staging \ + from re3.view_layers_js, \ + re3.view_bod_layer_info_en \ + where view_layers_js.bod_layer_id = view_bod_layer_info_en.bod_layer_id) as res } source src_layers_it : layers @@ -202,11 +226,19 @@ source src_layers_it : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'it' as lang \ - , projekte as topics \ + , 'rm' as lang \ + , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ - from re3.view_bod_layer_info_it + from (SELECT view_layers_js.bgdi_id, \ + view_bod_layer_info_it.kurzbezeichnung, \ + view_bod_layer_info_it.volltextsuche, \ + view_bod_layer_info_it.bod_layer_id, \ + view_layers_js.topics, \ + view_layers_js.staging \ + from re3.view_layers_js, \ + re3.view_bod_layer_info_it \ + where view_layers_js.bod_layer_id = view_bod_layer_info_it.bod_layer_id) as res } source src_layers_rm : layers @@ -219,10 +251,18 @@ source src_layers_rm : layers , volltextsuche as detail \ , bod_layer_id as layer \ , 'rm' as lang \ - , projekte as topics \ + , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ - from re3.view_bod_layer_info_rm + from (SELECT view_layers_js.bgdi_id, \ + view_bod_layer_info_rm.kurzbezeichnung, \ + view_bod_layer_info_rm.volltextsuche, \ + view_bod_layer_info_rm.bod_layer_id, \ + view_layers_js.topics, \ + view_layers_js.staging \ + from re3.view_layers_js, \ + re3.view_bod_layer_info_rm \ + where view_layers_js.bod_layer_id = view_bod_layer_info_rm.bod_layer_id) as res } source def_searchable_features : def_pqsql From bd07bb8dadb0fd615cec0ccafb6ea57683b84117 Mon Sep 17 00:00:00 2001 From: loicgasser Date: Thu, 10 Oct 2013 12:04:34 +0200 Subject: [PATCH 2/2] Fix lang definition --- conf/sphinx.conf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/sphinx.conf.in b/conf/sphinx.conf.in index 8fa360b7..5af9d457 100755 --- a/conf/sphinx.conf.in +++ b/conf/sphinx.conf.in @@ -154,7 +154,7 @@ source src_layers_de : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'rm' as lang \ + , 'de' as lang \ , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ @@ -178,7 +178,7 @@ source src_layers_fr : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'rm' as lang \ + , 'fr' as lang \ , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ @@ -202,7 +202,7 @@ source src_layers_en : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'rm' as lang \ + , 'en' as lang \ , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \ @@ -226,7 +226,7 @@ source src_layers_it : layers , 'layer' as origin \ , volltextsuche as detail \ , bod_layer_id as layer \ - , 'rm' as lang \ + , 'it' as lang \ , topics as topics \ , staging as staging \ , bgdi_id::bigint as id \