From d3de8de471150abff7b4613fba32495cbf3eb9a6 Mon Sep 17 00:00:00 2001 From: Damien LASSERRE Date: Wed, 21 Sep 2011 12:26:08 +0000 Subject: [PATCH] --- bash/0.1/Sphinx.sh | 8 +++++ bash/0.1/function.sh | 2 +- bash/0.1/sphinx.conf | 85 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 78 insertions(+), 17 deletions(-) diff --git a/bash/0.1/Sphinx.sh b/bash/0.1/Sphinx.sh index 22c08e3..ff0a6f2 100755 --- a/bash/0.1/Sphinx.sh +++ b/bash/0.1/Sphinx.sh @@ -120,6 +120,14 @@ then echo -e "11. Compilation : /source/sphinx-$version/src/ "$VERT"Complited" $NORMAL echo -e $VERT"Directory and Files as beens creates\n" $NORMAL + echo -n "Machine MASTER ? (y/n) : "; read response + if [ $response = 'y' ];then + MASTER=1 + echo -e $ROUGE"Mode MASTER activated"$NORMAL + else + MASTER=0 + echo -e $ROUGE"Mode SLAVE activated"$NORMAL + fi echo -n "Do you want to configure Index ? (y/n) : "; read response if [ $response = 'y' ] then diff --git a/bash/0.1/function.sh b/bash/0.1/function.sh index ce95afd..d0a8a6c 100644 --- a/bash/0.1/function.sh +++ b/bash/0.1/function.sh @@ -21,7 +21,7 @@ function loadIndicationFile() { } function createIndexeFile() { - if [$2 = "true"];then + if [ $2 = "true" ];then index=$2 else index=$1 diff --git a/bash/0.1/sphinx.conf b/bash/0.1/sphinx.conf index 21ab46f..c3d7d8c 100644 --- a/bash/0.1/sphinx.conf +++ b/bash/0.1/sphinx.conf @@ -1,8 +1,7 @@ - source source_act { type = mysql - sql_host = 192.168.3.30 + sql_host = 192.168.78.230 sql_user = sphinx sql_pass = indexer sql_db = jo @@ -32,29 +31,86 @@ index act_phx source = source_act path = /dbs/sphinx/act_phx docinfo = extern - morphology = libstemmer_francais + morphology = libstemmer_fr 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 + sql_host = 192.168.78.230 + sql_user = sphinx + sql_pass = indexer + sql_db = jo + sql_query_pre = +# sql_query = SELECT id, siren, actif, \ +#IF(civilite='M',1,IF(civilite='MME' OR civilite='MLLE',2,0)) AS genre, \ +#CONCAT(nom,' ',naissance_nom, ' ', dirRS) AS nom, prenom, \ +# YEAR(naissance_date) AS naiss_annee, \ +#MONTH(naissance_date) AS naiss_mois, \ +# DAY(naissance_date) AS naiss_jour, \ +#naissance_lieu, adr_dep \ +#FROM rncs_dirigeants; + sql_query = SELECT id, siren, adr_dep, typeDir, dirSiren, civilite, CONCAT(nom,' ',naissance_nom, ' ', dirRS) AS nom, prenom, \ + YEAR(naissance_date) AS naiss_annee, \ + MONTH(naissance_date) AS naiss_mois, \ + DAY(naissance_date) AS naiss_jour, \ + naissance_lieu, fonction_code, actif \ + FROM dirigeants_tmp; + sql_attr_str2ordinal= civilite + sql_attr_str2ordinal= typeDir + sql_attr_str2ordinal= fonction_code + sql_attr_uint = dirSiren + sql_attr_uint = naiss_annee + sql_attr_uint = naiss_mois + sql_attr_uint = naiss_jour + sql_attr_uint = actif +# sql_attr_uint = genre + sql_attr_uint = adr_dep +} + +index dir +{ + source = source_dir + path = /dbs/sphinx/dir + docinfo = extern + morphology = none + #ispell_aff = /usr/local/sphinx/etc/francais.aff + 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 dir_phx +{ + source = source_dir + path = /dbs/sphinx/dir_phx + docinfo = extern + morphology = libstemmer_fr + 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 - sql_host = 192.168.3.30 + sql_host = 192.168.78.230 sql_user = sphinx sql_pass = indexer sql_db = jo sql_query_pre = sql_query = SELECT id, siren, nic, siege, CONCAT(raisonSociale,\ ' "" ',enseigne,' "" ',sigle,' "" ',identite_pre,' "" ',\ -REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(sigle,' ',''),\ -'@','A'), '&',' ET '),'/',''),',',''),'-',''),'.',''),' ',\ -REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(sigle,\ -'@','A'), '&',' ET '),'/',''),',',''),'-',''),'.','')) AS nom, adr_dep, \ +REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(sigle,' ',''),\ +'@','A'), '&',' ET '),'/',''),',',''),'-',''),'.',''), '`', ' ')) AS nom, adr_dep, \ actif, adr_num, adr_typeVoie, CONCAT(adr_libVoie,' ',adr_comp) AS adresse, adr_cp, \ adr_ville AS ville, cj, ape_etab, (siren>200) AS sirenValide, rang \ -FROM etablissements_tmp; +FROM etablissements; sql_attr_str2ordinal = adr_typeVoie sql_attr_uint = siren sql_attr_uint = nic @@ -75,8 +131,7 @@ index ent path = /dbs/sphinx/ent docinfo = extern wordforms = /usr/local/sphinx/etc/wordforms.txt - abreviations = /usr/local/sphinx/etc/abreviations.txt - ispell_aff = /usr/local/sphinx/etc/francais.aff + stopwords = /usr/local/sphinx/etc/stopwords.txt 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, \ @@ -89,8 +144,6 @@ index ent_mns path = /dbs/sphinx/ent_mns docinfo = extern wordforms = /usr/local/sphinx/etc/wordforms.txt - abreviations = /usr/local/sphinx/etc/abreviations.txt - non_significatifs = /usr/local/sphinx/etc/mots-non-significatifs.txt 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, \ @@ -102,7 +155,7 @@ index ent_phx source = source_ent path = /dbs/sphinx/ent_phx docinfo = extern - morphology = libstemmer_francais + morphology = libstemmer_fr wordforms = /usr/local/sphinx/etc/wordforms.txt charset_type = sbcs charset_table = 0..9, A..Z->a..z, a..z, \ @@ -117,7 +170,7 @@ indexer { # memory limit, in bytes, kiloytes (16384K) or megabytes (256M) # optional, default is 32M, max is 2047M, recommended is 256M to 1024M - mem_limit = 256 + mem_limit = 2047 # maximum IO calls per second (for I/O throttling) # optional, default is 0 (unlimited) @@ -154,7 +207,7 @@ searchd # query log file, all search queries are logged here # optional, default is empty (do not log queries) - query_log = /dbs/sphinxlog/query.log + query_log = /var/log/query.log # client read timeout, seconds # optional, default is 5