From a6dc8ca7294f5dd439bb3cc8a79c4de0503358bb Mon Sep 17 00:00:00 2001
From: Damien LASSERRE <dlasserre@scores-decisions.com>
Date: Wed, 7 Sep 2011 08:19:30 +0000
Subject: [PATCH]

---
 sphinx.conf | 78 ++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/sphinx.conf b/sphinx.conf
index fedadbe..1e5c430 100644
--- a/sphinx.conf
+++ b/sphinx.conf
@@ -1,4 +1,43 @@
 
+source source_act
+{
+    type		= mysql
+    sql_host		= 192.168.3.31
+    sql_user		= sphinx
+    sql_pass		= indexer
+    sql_db		= jo
+    sql_query_pre	=
+    sql_query		= SELECT id, Siren1, RaisonSociale, Siren2, actif, dateLien, IF(dateUpdate > dateInsert, dateUpdate,dateInsert) as dateMaj, source, Pmin*1 AS PminNum, MajMin, PpPm, IF(Pays='','FRA',Pays) AS Pays FROM   liens WHERE  ActionPart=1 AND Siren1>1000 AND Siren1 IN (SELECT DISTINCT SIREN FROM etablissements_old);
+    sql_attr_uint	= actif
+    sql_attr_uint	= source
+    sql_attr_uint	= PminNum
+    sql_attr_str2ordinal= MajMin
+    sql_attr_str2ordinal= PpPm
+}
+
+index act
+{
+    source            = source_act
+    path              = /dbs/sphinx/act
+    docinfo           = extern
+    morphology        = none
+    charset_type      = sbcs
+    charset_table     = 0..9, A..Z->a..z, a..z, \
+U+23, U+25, U+26, U+2B, U+3D, U+40, \
+U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF
+}
+
+index act_phx
+{
+    source            = source_act
+    path              = /dbs/sphinx/act_phx
+    docinfo           = extern
+    morphology        = libstemmer_francais
+    charset_type      = sbcs
+    charset_table     = 0..9, A..Z->a..z, a..z, \
+U+23, U+25, U+26, U+2B, U+3D, U+40, \
+U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF
+}
 source source_dir
 {
     type              = mysql
@@ -57,45 +96,6 @@ index dir_phx
 U+23, U+25, U+26, U+2B, U+3D, U+40, \
 U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF
 }
-source source_act
-{
-    type		= mysql
-    sql_host		= 192.168.3.30
-    sql_user		= sphinx
-    sql_pass		= indexer
-    sql_db		= jo
-    sql_query_pre	=
-    sql_query		= SELECT id, Siren1, RaisonSociale, Siren2, actif, dateLien, IF(dateUpdate > dateInsert, dateUpdate,dateInsert) as dateMaj, source, Pmin*1 AS PminNum, MajMin, PpPm, IF(Pays='','FRA',Pays) AS Pays FROM   liens WHERE  ActionPart=1 AND Siren1>1000 AND Siren1 IN (SELECT DISTINCT SIREN FROM etablissements_old);
-    sql_attr_uint	= actif
-    sql_attr_uint	= source
-    sql_attr_uint	= PminNum
-    sql_attr_str2ordinal= MajMin
-    sql_attr_str2ordinal= PpPm
-}
-
-index act
-{
-    source            = source_act
-    path              = /dbs/sphinx/act
-    docinfo           = extern
-    morphology        = none
-    charset_type      = sbcs
-    charset_table     = 0..9, A..Z->a..z, a..z, \
-U+23, U+25, U+26, U+2B, U+3D, U+40, \
-U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF
-}
-
-index act_phx
-{
-    source            = source_act
-    path              = /dbs/sphinx/act_phx
-    docinfo           = extern
-    morphology        = libstemmer_francais
-    charset_type      = sbcs
-    charset_table     = 0..9, A..Z->a..z, a..z, \
-U+23, U+25, U+26, U+2B, U+3D, U+40, \
-U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF
-}
 source source_ent
 {
     type              = mysql