Merge branch 'master' of https://github.com/geoadmin/service-sphinxse…

…arch
geoadmin · Oct 10, 2013 · a6fc857 · a6fc857
2 parents 3a2324c + 0778b30
commit a6fc857
Showing 1 changed file with 50 additions and 10 deletions.
diff --git a/conf/sphinx.conf.in b/conf/sphinx.conf.in
@@ -155,10 +155,18 @@ source src_layers_de : layers
             , volltextsuche as detail \
             , bod_layer_id as layer \
             , 'de' as lang \
-            , projekte as topics \
+            , 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
@@ -171,10 +179,18 @@ source src_layers_fr : layers
             , volltextsuche as detail \
             , bod_layer_id as layer \
             , 'fr' as lang \
-            , projekte as topics \
+            , 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
@@ -187,10 +203,18 @@ source src_layers_en : layers
             , volltextsuche as detail \
             , bod_layer_id as layer \
             , 'en' as lang \
-            , projekte as topics \
+            , 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
@@ -203,10 +227,18 @@ source src_layers_it : layers
             , volltextsuche as detail \
             , bod_layer_id as layer \
             , 'it' as lang \
-            , projekte as topics \
+            , 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