From 56ed01c0f21a544f2f55cd2b399fa88e4281fbb0 Mon Sep 17 00:00:00 2001 From: Damien LASSERRE Date: Wed, 2 Nov 2011 08:08:48 +0000 Subject: [PATCH] --- config/Sphinx/act.conf-MysqlServer | 31 -------- config/Sphinx/act.conf-MysqlServerSlave | 31 -------- config/Sphinx/cmp.conf-MysqlServer | 40 ---------- config/Sphinx/cmp.conf-MysqlServerSlave | 40 ---------- config/Sphinx/dir.conf-MysqlServer | 45 ------------ config/Sphinx/dir.conf-MysqlServerSlave | 45 ------------ config/Sphinx/ent.conf-MysqlServer | 44 ----------- config/Sphinx/ent.conf-MysqlServerSlave | 44 ----------- config/Sphinx/histo.conf-MysqlServer | 39 ---------- config/Sphinx/sphinx.conf | 77 -------------------- config/SphinxHisto/act.conf-MysqlServer | 40 ---------- config/SphinxHisto/act.conf-MysqlServerSlave | 40 ---------- config/SphinxHisto/cmp.conf-MysqlServer | 40 ---------- config/SphinxHisto/cmp.conf-MysqlServerSlave | 40 ---------- config/SphinxHisto/dir.conf-MysqlServer | 59 --------------- config/SphinxHisto/dir.conf-MysqlServerSlave | 59 --------------- config/SphinxHisto/ent.conf-MysqlServer | 72 ------------------ config/SphinxHisto/ent.conf-MysqlServerSlave | 72 ------------------ config/SphinxHisto/histo.conf-MysqlServer | 39 ---------- config/SphinxHisto/sphinx.conf | 77 -------------------- config/sdsrvws02/act.conf-MysqlServer | 31 -------- config/sdsrvws02/act.conf-MysqlServerSlave | 31 -------- config/sdsrvws02/cmp.conf-MysqlServer | 40 ---------- config/sdsrvws02/cmp.conf-MysqlServerSlave | 40 ---------- config/sdsrvws02/dir.conf-MysqlServer | 45 ------------ config/sdsrvws02/dir.conf-MysqlServerSlave | 45 ------------ config/sdsrvws02/ent.conf-MysqlServer | 44 ----------- config/sdsrvws02/ent.conf-MysqlServerSlave | 44 ----------- config/sdsrvws02/histo.conf-MysqlServer | 39 ---------- config/sdsrvws02/sphinx.conf | 77 -------------------- 30 files changed, 1410 deletions(-) delete mode 100644 config/Sphinx/act.conf-MysqlServer delete mode 100644 config/Sphinx/act.conf-MysqlServerSlave delete mode 100644 config/Sphinx/cmp.conf-MysqlServer delete mode 100644 config/Sphinx/cmp.conf-MysqlServerSlave delete mode 100644 config/Sphinx/dir.conf-MysqlServer delete mode 100644 config/Sphinx/dir.conf-MysqlServerSlave delete mode 100644 config/Sphinx/ent.conf-MysqlServer delete mode 100644 config/Sphinx/ent.conf-MysqlServerSlave delete mode 100644 config/Sphinx/histo.conf-MysqlServer delete mode 100644 config/Sphinx/sphinx.conf delete mode 100644 config/SphinxHisto/act.conf-MysqlServer delete mode 100644 config/SphinxHisto/act.conf-MysqlServerSlave delete mode 100644 config/SphinxHisto/cmp.conf-MysqlServer delete mode 100644 config/SphinxHisto/cmp.conf-MysqlServerSlave delete mode 100644 config/SphinxHisto/dir.conf-MysqlServer delete mode 100644 config/SphinxHisto/dir.conf-MysqlServerSlave delete mode 100644 config/SphinxHisto/ent.conf-MysqlServer delete mode 100644 config/SphinxHisto/ent.conf-MysqlServerSlave delete mode 100644 config/SphinxHisto/histo.conf-MysqlServer delete mode 100644 config/SphinxHisto/sphinx.conf delete mode 100644 config/sdsrvws02/act.conf-MysqlServer delete mode 100644 config/sdsrvws02/act.conf-MysqlServerSlave delete mode 100644 config/sdsrvws02/cmp.conf-MysqlServer delete mode 100644 config/sdsrvws02/cmp.conf-MysqlServerSlave delete mode 100644 config/sdsrvws02/dir.conf-MysqlServer delete mode 100644 config/sdsrvws02/dir.conf-MysqlServerSlave delete mode 100644 config/sdsrvws02/ent.conf-MysqlServer delete mode 100644 config/sdsrvws02/ent.conf-MysqlServerSlave delete mode 100644 config/sdsrvws02/histo.conf-MysqlServer delete mode 100644 config/sdsrvws02/sphinx.conf diff --git a/config/Sphinx/act.conf-MysqlServer b/config/Sphinx/act.conf-MysqlServer deleted file mode 100644 index 9682316..0000000 --- a/config/Sphinx/act.conf-MysqlServer +++ /dev/null @@ -1,31 +0,0 @@ -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 - sql_attr_str2ordinal= Pays -} - -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 -} \ No newline at end of file diff --git a/config/Sphinx/act.conf-MysqlServerSlave b/config/Sphinx/act.conf-MysqlServerSlave deleted file mode 100644 index 9682316..0000000 --- a/config/Sphinx/act.conf-MysqlServerSlave +++ /dev/null @@ -1,31 +0,0 @@ -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 - sql_attr_str2ordinal= Pays -} - -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 -} \ No newline at end of file diff --git a/config/Sphinx/cmp.conf-MysqlServer b/config/Sphinx/cmp.conf-MysqlServer deleted file mode 100644 index d01a87e..0000000 --- a/config/Sphinx/cmp.conf-MysqlServer +++ /dev/null @@ -1,40 +0,0 @@ - -source comptage -{ - type = mysql - sql_host = 192.168.3.30 - sql_user = root - sql_pass = scores - sql_db = jo - sql_port = 3306 - sql_query = SELECT id,ape_etab,ape_entrep,source,siren,nic,actif,siege,adr_cp,adr_dep,adr_com,(tel>100000000) AS tel,(fax>100000000) AS fax,cj,capital,age_entrep,age_etab,tca,tcaexp,teff_entrep,teff_etab,rang,dateCrea_etab,eff_entrep,eff_etab,nbEtab,bilType,bilAnnee,bilTca,bilCA,bilCAexp,bilRN FROM etablissements_act; - sql_attr_str2ordinal = bilType - sql_attr_uint = source - sql_attr_uint = actif - sql_attr_uint = siege - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = adr_com - sql_attr_uint = tel - sql_attr_uint = fax - sql_attr_uint = cj - sql_attr_uint = capital - sql_attr_uint = age_entrep - sql_attr_uint = age_etab - sql_attr_uint = tca - sql_attr_uint = tcaexp - sql_attr_uint = teff_entrep - sql_attr_uint = teff_etab - sql_attr_uint = rang - sql_attr_uint = dateCrea_etab - sql_attr_uint = eff_entrep - sql_attr_uint = eff_etab - sql_attr_uint = nbEtab - sql_attr_uint = bilAnnee - sql_attr_uint = bilTca - sql_attr_uint = bilCA - sql_attr_uint = bilCAexp - sql_attr_uint = bilRN - - sql_query_info = SELECT siren, nic, ape_etab,ape_entrep, raisonSociale, enseigne, sigle, adr_libVoie, adr_cp, adr_ville FROM etablissements WHERE id=$id; -} \ No newline at end of file diff --git a/config/Sphinx/cmp.conf-MysqlServerSlave b/config/Sphinx/cmp.conf-MysqlServerSlave deleted file mode 100644 index d01a87e..0000000 --- a/config/Sphinx/cmp.conf-MysqlServerSlave +++ /dev/null @@ -1,40 +0,0 @@ - -source comptage -{ - type = mysql - sql_host = 192.168.3.30 - sql_user = root - sql_pass = scores - sql_db = jo - sql_port = 3306 - sql_query = SELECT id,ape_etab,ape_entrep,source,siren,nic,actif,siege,adr_cp,adr_dep,adr_com,(tel>100000000) AS tel,(fax>100000000) AS fax,cj,capital,age_entrep,age_etab,tca,tcaexp,teff_entrep,teff_etab,rang,dateCrea_etab,eff_entrep,eff_etab,nbEtab,bilType,bilAnnee,bilTca,bilCA,bilCAexp,bilRN FROM etablissements_act; - sql_attr_str2ordinal = bilType - sql_attr_uint = source - sql_attr_uint = actif - sql_attr_uint = siege - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = adr_com - sql_attr_uint = tel - sql_attr_uint = fax - sql_attr_uint = cj - sql_attr_uint = capital - sql_attr_uint = age_entrep - sql_attr_uint = age_etab - sql_attr_uint = tca - sql_attr_uint = tcaexp - sql_attr_uint = teff_entrep - sql_attr_uint = teff_etab - sql_attr_uint = rang - sql_attr_uint = dateCrea_etab - sql_attr_uint = eff_entrep - sql_attr_uint = eff_etab - sql_attr_uint = nbEtab - sql_attr_uint = bilAnnee - sql_attr_uint = bilTca - sql_attr_uint = bilCA - sql_attr_uint = bilCAexp - sql_attr_uint = bilRN - - sql_query_info = SELECT siren, nic, ape_etab,ape_entrep, raisonSociale, enseigne, sigle, adr_libVoie, adr_cp, adr_ville FROM etablissements WHERE id=$id; -} \ No newline at end of file diff --git a/config/Sphinx/dir.conf-MysqlServer b/config/Sphinx/dir.conf-MysqlServer deleted file mode 100644 index be3e753..0000000 --- a/config/Sphinx/dir.conf-MysqlServer +++ /dev/null @@ -1,45 +0,0 @@ -source source_dir -{ - type = mysql - sql_host = 192.168.3.30 - 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; -# UNION \ -#SELECT id, siren, 0 AS actif, \ -#'' AS genre, \ -#CONCAT(nom,' ',nomUsage,' ',rs) AS nom, prenom, \ -#0 AS naiss_annee, \ -#0 AS naiss_mois, \ -#0 AS naiss_jour, \ -#'' AS naissance_lieu, 0 AS adr_dep \ -#FROM bodacc_dirigeants_histo; - 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 -} \ No newline at end of file diff --git a/config/Sphinx/dir.conf-MysqlServerSlave b/config/Sphinx/dir.conf-MysqlServerSlave deleted file mode 100644 index be3e753..0000000 --- a/config/Sphinx/dir.conf-MysqlServerSlave +++ /dev/null @@ -1,45 +0,0 @@ -source source_dir -{ - type = mysql - sql_host = 192.168.3.30 - 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; -# UNION \ -#SELECT id, siren, 0 AS actif, \ -#'' AS genre, \ -#CONCAT(nom,' ',nomUsage,' ',rs) AS nom, prenom, \ -#0 AS naiss_annee, \ -#0 AS naiss_mois, \ -#0 AS naiss_jour, \ -#'' AS naissance_lieu, 0 AS adr_dep \ -#FROM bodacc_dirigeants_histo; - 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 -} \ No newline at end of file diff --git a/config/Sphinx/ent.conf-MysqlServer b/config/Sphinx/ent.conf-MysqlServer deleted file mode 100644 index 26e4abd..0000000 --- a/config/Sphinx/ent.conf-MysqlServer +++ /dev/null @@ -1,44 +0,0 @@ -source source_ent -{ - type = mysql - sql_host = 192.168.3.30 - 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, \ -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; - sql_attr_str2ordinal = adr_typeVoie - sql_attr_uint = siren - sql_attr_uint = nic - sql_attr_uint = siege - sql_attr_uint = adr_num - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = actif - sql_attr_uint = cj - sql_attr_uint = sirenValide - sql_attr_uint = rang - -} - -index ent -{ - source = source_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 - 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 -} \ No newline at end of file diff --git a/config/Sphinx/ent.conf-MysqlServerSlave b/config/Sphinx/ent.conf-MysqlServerSlave deleted file mode 100644 index 84d34ac..0000000 --- a/config/Sphinx/ent.conf-MysqlServerSlave +++ /dev/null @@ -1,44 +0,0 @@ -source source_ent -{ - type = mysql - sql_host = 192.168.3.30 - 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, \ -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; - sql_attr_str2ordinal = adr_typeVoie - sql_attr_uint = siren - sql_attr_uint = nic - sql_attr_uint = siege - sql_attr_uint = adr_num - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = actif - sql_attr_uint = cj - sql_attr_uint = sirenValide - sql_attr_uint = rang - -} - -index ent -{ - source = source_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 - 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 -} \ No newline at end of file diff --git a/config/Sphinx/histo.conf-MysqlServer b/config/Sphinx/histo.conf-MysqlServer deleted file mode 100644 index 29473ad..0000000 --- a/config/Sphinx/histo.conf-MysqlServer +++ /dev/null @@ -1,39 +0,0 @@ -# -# Sphinx configuration file sample -# -# WARNING! While this sample file mentions all available options, -# it contains (very) short helper descriptions only. Please refer to -# doc/sphinx.html for details. -# - -############################################################################# -## data source definition -############################################################################# - -source histo -{ - type = mysql - sql_host = 192.168.78.230 - sql_user = sphinx_histo - sql_pass = sphinx - sql_db = histobodacc - sql_port = 3306 # optional, default is 3306 - sql_query = SELECT id, nomFichier, annee1, dateBod, texte FROM bodacc_ocr; - sql_attr_uint = annee1 - sql_query_info = SELECT * FROM bodacc_ocr WHERE id=$id -} - -############################################################################# -## index definition -############################################################################# - -index histo -{ - source = histo - path = /home/sphinx/histo - docinfo = extern - morphology = none - min_word_len = 1 - charset_type = sbcs - html_strip = 1 -} diff --git a/config/Sphinx/sphinx.conf b/config/Sphinx/sphinx.conf deleted file mode 100644 index b390725..0000000 --- a/config/Sphinx/sphinx.conf +++ /dev/null @@ -1,77 +0,0 @@ - -############################################################################# -## indexer settings -############################################################################# - -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 - - # maximum IO calls per second (for I/O throttling) - # optional, default is 0 (unlimited) - # - # max_iops = 40 - - - # maximum IO call size, bytes (for I/O throttling) - # optional, default is 0 (unlimited) - # - # max_iosize = 1048576 -} - -############################################################################# -## searchd settings -############################################################################# - -searchd -{ - # IP address to bind on - # optional, default is 0.0.0.0 (ie. listen on all interfaces) - # - # address = 127.0.0.1 - # address = 192.168.0.1 - - - # searchd TCP port number - # mandatory, default is 3312 - listen = 3312 - - # log file, searchd run info is logged here - # optional, default is 'searchd.log' - log = /dbs/sphinxlog/searchd.log - - # query log file, all search queries are logged here - # optional, default is empty (do not log queries) - query_log = /dbs/sphinxlog/query.log - - # client read timeout, seconds - # optional, default is 5 - read_timeout = 5 - - # maximum amount of children to fork (concurrent searches to run) - # optional, default is 0 (unlimited) - max_children = 30 - - # PID file, searchd process ID file name - # mandatory - pid_file = /var/log/searchd.pid - - # max amount of matches the daemon ever keeps in RAM, per-index - # WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL - # default is 1000 (just like Google) - max_matches = 1000 - - # seamless rotate, prevents rotate stalls if precaching huge datasets - # optional, default is 1 - seamless_rotate = 0 - - # whether to forcibly preopen all indexes on startup - # optional, default is 0 (do not preopen) - preopen_indexes = 0 - - # whether to unlink .old index copies on succesful rotation. - # optional, default is 1 (do unlink) - unlink_old = 1 -} diff --git a/config/SphinxHisto/act.conf-MysqlServer b/config/SphinxHisto/act.conf-MysqlServer deleted file mode 100644 index 9b9e2bf..0000000 --- a/config/SphinxHisto/act.conf-MysqlServer +++ /dev/null @@ -1,40 +0,0 @@ - -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 -} \ No newline at end of file diff --git a/config/SphinxHisto/act.conf-MysqlServerSlave b/config/SphinxHisto/act.conf-MysqlServerSlave deleted file mode 100644 index 9b9e2bf..0000000 --- a/config/SphinxHisto/act.conf-MysqlServerSlave +++ /dev/null @@ -1,40 +0,0 @@ - -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 -} \ No newline at end of file diff --git a/config/SphinxHisto/cmp.conf-MysqlServer b/config/SphinxHisto/cmp.conf-MysqlServer deleted file mode 100644 index d01a87e..0000000 --- a/config/SphinxHisto/cmp.conf-MysqlServer +++ /dev/null @@ -1,40 +0,0 @@ - -source comptage -{ - type = mysql - sql_host = 192.168.3.30 - sql_user = root - sql_pass = scores - sql_db = jo - sql_port = 3306 - sql_query = SELECT id,ape_etab,ape_entrep,source,siren,nic,actif,siege,adr_cp,adr_dep,adr_com,(tel>100000000) AS tel,(fax>100000000) AS fax,cj,capital,age_entrep,age_etab,tca,tcaexp,teff_entrep,teff_etab,rang,dateCrea_etab,eff_entrep,eff_etab,nbEtab,bilType,bilAnnee,bilTca,bilCA,bilCAexp,bilRN FROM etablissements_act; - sql_attr_str2ordinal = bilType - sql_attr_uint = source - sql_attr_uint = actif - sql_attr_uint = siege - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = adr_com - sql_attr_uint = tel - sql_attr_uint = fax - sql_attr_uint = cj - sql_attr_uint = capital - sql_attr_uint = age_entrep - sql_attr_uint = age_etab - sql_attr_uint = tca - sql_attr_uint = tcaexp - sql_attr_uint = teff_entrep - sql_attr_uint = teff_etab - sql_attr_uint = rang - sql_attr_uint = dateCrea_etab - sql_attr_uint = eff_entrep - sql_attr_uint = eff_etab - sql_attr_uint = nbEtab - sql_attr_uint = bilAnnee - sql_attr_uint = bilTca - sql_attr_uint = bilCA - sql_attr_uint = bilCAexp - sql_attr_uint = bilRN - - sql_query_info = SELECT siren, nic, ape_etab,ape_entrep, raisonSociale, enseigne, sigle, adr_libVoie, adr_cp, adr_ville FROM etablissements WHERE id=$id; -} \ No newline at end of file diff --git a/config/SphinxHisto/cmp.conf-MysqlServerSlave b/config/SphinxHisto/cmp.conf-MysqlServerSlave deleted file mode 100644 index d01a87e..0000000 --- a/config/SphinxHisto/cmp.conf-MysqlServerSlave +++ /dev/null @@ -1,40 +0,0 @@ - -source comptage -{ - type = mysql - sql_host = 192.168.3.30 - sql_user = root - sql_pass = scores - sql_db = jo - sql_port = 3306 - sql_query = SELECT id,ape_etab,ape_entrep,source,siren,nic,actif,siege,adr_cp,adr_dep,adr_com,(tel>100000000) AS tel,(fax>100000000) AS fax,cj,capital,age_entrep,age_etab,tca,tcaexp,teff_entrep,teff_etab,rang,dateCrea_etab,eff_entrep,eff_etab,nbEtab,bilType,bilAnnee,bilTca,bilCA,bilCAexp,bilRN FROM etablissements_act; - sql_attr_str2ordinal = bilType - sql_attr_uint = source - sql_attr_uint = actif - sql_attr_uint = siege - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = adr_com - sql_attr_uint = tel - sql_attr_uint = fax - sql_attr_uint = cj - sql_attr_uint = capital - sql_attr_uint = age_entrep - sql_attr_uint = age_etab - sql_attr_uint = tca - sql_attr_uint = tcaexp - sql_attr_uint = teff_entrep - sql_attr_uint = teff_etab - sql_attr_uint = rang - sql_attr_uint = dateCrea_etab - sql_attr_uint = eff_entrep - sql_attr_uint = eff_etab - sql_attr_uint = nbEtab - sql_attr_uint = bilAnnee - sql_attr_uint = bilTca - sql_attr_uint = bilCA - sql_attr_uint = bilCAexp - sql_attr_uint = bilRN - - sql_query_info = SELECT siren, nic, ape_etab,ape_entrep, raisonSociale, enseigne, sigle, adr_libVoie, adr_cp, adr_ville FROM etablissements WHERE id=$id; -} \ No newline at end of file diff --git a/config/SphinxHisto/dir.conf-MysqlServer b/config/SphinxHisto/dir.conf-MysqlServer deleted file mode 100644 index 10ea1f0..0000000 --- a/config/SphinxHisto/dir.conf-MysqlServer +++ /dev/null @@ -1,59 +0,0 @@ - -source source_dir -{ - type = mysql - sql_host = 192.168.3.30 - 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_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 -} \ No newline at end of file diff --git a/config/SphinxHisto/dir.conf-MysqlServerSlave b/config/SphinxHisto/dir.conf-MysqlServerSlave deleted file mode 100644 index 10ea1f0..0000000 --- a/config/SphinxHisto/dir.conf-MysqlServerSlave +++ /dev/null @@ -1,59 +0,0 @@ - -source source_dir -{ - type = mysql - sql_host = 192.168.3.30 - 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_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 -} \ No newline at end of file diff --git a/config/SphinxHisto/ent.conf-MysqlServer b/config/SphinxHisto/ent.conf-MysqlServer deleted file mode 100644 index 9f46f0c..0000000 --- a/config/SphinxHisto/ent.conf-MysqlServer +++ /dev/null @@ -1,72 +0,0 @@ - -source source_ent -{ - type = mysql - sql_host = 192.168.3.30 - 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, \ -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; - sql_attr_str2ordinal = adr_typeVoie - sql_attr_uint = siren - sql_attr_uint = nic - sql_attr_uint = siege - sql_attr_uint = adr_num - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = actif - sql_attr_uint = cj - sql_attr_uint = sirenValide - sql_attr_uint = rang - -} - -index ent -{ - source = source_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 - 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 ent_mns -{ - source = source_ent - 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, \ -U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF -} - -index ent_phx -{ - source = source_ent - path = /dbs/sphinx/ent_phx - docinfo = extern - morphology = libstemmer_francais - wordforms = /usr/local/sphinx/etc/wordforms.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, \ -U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF -} \ No newline at end of file diff --git a/config/SphinxHisto/ent.conf-MysqlServerSlave b/config/SphinxHisto/ent.conf-MysqlServerSlave deleted file mode 100644 index 9f46f0c..0000000 --- a/config/SphinxHisto/ent.conf-MysqlServerSlave +++ /dev/null @@ -1,72 +0,0 @@ - -source source_ent -{ - type = mysql - sql_host = 192.168.3.30 - 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, \ -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; - sql_attr_str2ordinal = adr_typeVoie - sql_attr_uint = siren - sql_attr_uint = nic - sql_attr_uint = siege - sql_attr_uint = adr_num - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = actif - sql_attr_uint = cj - sql_attr_uint = sirenValide - sql_attr_uint = rang - -} - -index ent -{ - source = source_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 - 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 ent_mns -{ - source = source_ent - 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, \ -U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF -} - -index ent_phx -{ - source = source_ent - path = /dbs/sphinx/ent_phx - docinfo = extern - morphology = libstemmer_francais - wordforms = /usr/local/sphinx/etc/wordforms.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, \ -U+C0..U+DE->U+E0..U+FE, U+DF, U+E0..U+FF -} \ No newline at end of file diff --git a/config/SphinxHisto/histo.conf-MysqlServer b/config/SphinxHisto/histo.conf-MysqlServer deleted file mode 100644 index 29473ad..0000000 --- a/config/SphinxHisto/histo.conf-MysqlServer +++ /dev/null @@ -1,39 +0,0 @@ -# -# Sphinx configuration file sample -# -# WARNING! While this sample file mentions all available options, -# it contains (very) short helper descriptions only. Please refer to -# doc/sphinx.html for details. -# - -############################################################################# -## data source definition -############################################################################# - -source histo -{ - type = mysql - sql_host = 192.168.78.230 - sql_user = sphinx_histo - sql_pass = sphinx - sql_db = histobodacc - sql_port = 3306 # optional, default is 3306 - sql_query = SELECT id, nomFichier, annee1, dateBod, texte FROM bodacc_ocr; - sql_attr_uint = annee1 - sql_query_info = SELECT * FROM bodacc_ocr WHERE id=$id -} - -############################################################################# -## index definition -############################################################################# - -index histo -{ - source = histo - path = /home/sphinx/histo - docinfo = extern - morphology = none - min_word_len = 1 - charset_type = sbcs - html_strip = 1 -} diff --git a/config/SphinxHisto/sphinx.conf b/config/SphinxHisto/sphinx.conf deleted file mode 100644 index b390725..0000000 --- a/config/SphinxHisto/sphinx.conf +++ /dev/null @@ -1,77 +0,0 @@ - -############################################################################# -## indexer settings -############################################################################# - -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 - - # maximum IO calls per second (for I/O throttling) - # optional, default is 0 (unlimited) - # - # max_iops = 40 - - - # maximum IO call size, bytes (for I/O throttling) - # optional, default is 0 (unlimited) - # - # max_iosize = 1048576 -} - -############################################################################# -## searchd settings -############################################################################# - -searchd -{ - # IP address to bind on - # optional, default is 0.0.0.0 (ie. listen on all interfaces) - # - # address = 127.0.0.1 - # address = 192.168.0.1 - - - # searchd TCP port number - # mandatory, default is 3312 - listen = 3312 - - # log file, searchd run info is logged here - # optional, default is 'searchd.log' - log = /dbs/sphinxlog/searchd.log - - # query log file, all search queries are logged here - # optional, default is empty (do not log queries) - query_log = /dbs/sphinxlog/query.log - - # client read timeout, seconds - # optional, default is 5 - read_timeout = 5 - - # maximum amount of children to fork (concurrent searches to run) - # optional, default is 0 (unlimited) - max_children = 30 - - # PID file, searchd process ID file name - # mandatory - pid_file = /var/log/searchd.pid - - # max amount of matches the daemon ever keeps in RAM, per-index - # WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL - # default is 1000 (just like Google) - max_matches = 1000 - - # seamless rotate, prevents rotate stalls if precaching huge datasets - # optional, default is 1 - seamless_rotate = 0 - - # whether to forcibly preopen all indexes on startup - # optional, default is 0 (do not preopen) - preopen_indexes = 0 - - # whether to unlink .old index copies on succesful rotation. - # optional, default is 1 (do unlink) - unlink_old = 1 -} diff --git a/config/sdsrvws02/act.conf-MysqlServer b/config/sdsrvws02/act.conf-MysqlServer deleted file mode 100644 index 9682316..0000000 --- a/config/sdsrvws02/act.conf-MysqlServer +++ /dev/null @@ -1,31 +0,0 @@ -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 - sql_attr_str2ordinal= Pays -} - -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 -} \ No newline at end of file diff --git a/config/sdsrvws02/act.conf-MysqlServerSlave b/config/sdsrvws02/act.conf-MysqlServerSlave deleted file mode 100644 index 9682316..0000000 --- a/config/sdsrvws02/act.conf-MysqlServerSlave +++ /dev/null @@ -1,31 +0,0 @@ -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 - sql_attr_str2ordinal= Pays -} - -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 -} \ No newline at end of file diff --git a/config/sdsrvws02/cmp.conf-MysqlServer b/config/sdsrvws02/cmp.conf-MysqlServer deleted file mode 100644 index d01a87e..0000000 --- a/config/sdsrvws02/cmp.conf-MysqlServer +++ /dev/null @@ -1,40 +0,0 @@ - -source comptage -{ - type = mysql - sql_host = 192.168.3.30 - sql_user = root - sql_pass = scores - sql_db = jo - sql_port = 3306 - sql_query = SELECT id,ape_etab,ape_entrep,source,siren,nic,actif,siege,adr_cp,adr_dep,adr_com,(tel>100000000) AS tel,(fax>100000000) AS fax,cj,capital,age_entrep,age_etab,tca,tcaexp,teff_entrep,teff_etab,rang,dateCrea_etab,eff_entrep,eff_etab,nbEtab,bilType,bilAnnee,bilTca,bilCA,bilCAexp,bilRN FROM etablissements_act; - sql_attr_str2ordinal = bilType - sql_attr_uint = source - sql_attr_uint = actif - sql_attr_uint = siege - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = adr_com - sql_attr_uint = tel - sql_attr_uint = fax - sql_attr_uint = cj - sql_attr_uint = capital - sql_attr_uint = age_entrep - sql_attr_uint = age_etab - sql_attr_uint = tca - sql_attr_uint = tcaexp - sql_attr_uint = teff_entrep - sql_attr_uint = teff_etab - sql_attr_uint = rang - sql_attr_uint = dateCrea_etab - sql_attr_uint = eff_entrep - sql_attr_uint = eff_etab - sql_attr_uint = nbEtab - sql_attr_uint = bilAnnee - sql_attr_uint = bilTca - sql_attr_uint = bilCA - sql_attr_uint = bilCAexp - sql_attr_uint = bilRN - - sql_query_info = SELECT siren, nic, ape_etab,ape_entrep, raisonSociale, enseigne, sigle, adr_libVoie, adr_cp, adr_ville FROM etablissements WHERE id=$id; -} \ No newline at end of file diff --git a/config/sdsrvws02/cmp.conf-MysqlServerSlave b/config/sdsrvws02/cmp.conf-MysqlServerSlave deleted file mode 100644 index d01a87e..0000000 --- a/config/sdsrvws02/cmp.conf-MysqlServerSlave +++ /dev/null @@ -1,40 +0,0 @@ - -source comptage -{ - type = mysql - sql_host = 192.168.3.30 - sql_user = root - sql_pass = scores - sql_db = jo - sql_port = 3306 - sql_query = SELECT id,ape_etab,ape_entrep,source,siren,nic,actif,siege,adr_cp,adr_dep,adr_com,(tel>100000000) AS tel,(fax>100000000) AS fax,cj,capital,age_entrep,age_etab,tca,tcaexp,teff_entrep,teff_etab,rang,dateCrea_etab,eff_entrep,eff_etab,nbEtab,bilType,bilAnnee,bilTca,bilCA,bilCAexp,bilRN FROM etablissements_act; - sql_attr_str2ordinal = bilType - sql_attr_uint = source - sql_attr_uint = actif - sql_attr_uint = siege - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = adr_com - sql_attr_uint = tel - sql_attr_uint = fax - sql_attr_uint = cj - sql_attr_uint = capital - sql_attr_uint = age_entrep - sql_attr_uint = age_etab - sql_attr_uint = tca - sql_attr_uint = tcaexp - sql_attr_uint = teff_entrep - sql_attr_uint = teff_etab - sql_attr_uint = rang - sql_attr_uint = dateCrea_etab - sql_attr_uint = eff_entrep - sql_attr_uint = eff_etab - sql_attr_uint = nbEtab - sql_attr_uint = bilAnnee - sql_attr_uint = bilTca - sql_attr_uint = bilCA - sql_attr_uint = bilCAexp - sql_attr_uint = bilRN - - sql_query_info = SELECT siren, nic, ape_etab,ape_entrep, raisonSociale, enseigne, sigle, adr_libVoie, adr_cp, adr_ville FROM etablissements WHERE id=$id; -} \ No newline at end of file diff --git a/config/sdsrvws02/dir.conf-MysqlServer b/config/sdsrvws02/dir.conf-MysqlServer deleted file mode 100644 index be3e753..0000000 --- a/config/sdsrvws02/dir.conf-MysqlServer +++ /dev/null @@ -1,45 +0,0 @@ -source source_dir -{ - type = mysql - sql_host = 192.168.3.30 - 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; -# UNION \ -#SELECT id, siren, 0 AS actif, \ -#'' AS genre, \ -#CONCAT(nom,' ',nomUsage,' ',rs) AS nom, prenom, \ -#0 AS naiss_annee, \ -#0 AS naiss_mois, \ -#0 AS naiss_jour, \ -#'' AS naissance_lieu, 0 AS adr_dep \ -#FROM bodacc_dirigeants_histo; - 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 -} \ No newline at end of file diff --git a/config/sdsrvws02/dir.conf-MysqlServerSlave b/config/sdsrvws02/dir.conf-MysqlServerSlave deleted file mode 100644 index be3e753..0000000 --- a/config/sdsrvws02/dir.conf-MysqlServerSlave +++ /dev/null @@ -1,45 +0,0 @@ -source source_dir -{ - type = mysql - sql_host = 192.168.3.30 - 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; -# UNION \ -#SELECT id, siren, 0 AS actif, \ -#'' AS genre, \ -#CONCAT(nom,' ',nomUsage,' ',rs) AS nom, prenom, \ -#0 AS naiss_annee, \ -#0 AS naiss_mois, \ -#0 AS naiss_jour, \ -#'' AS naissance_lieu, 0 AS adr_dep \ -#FROM bodacc_dirigeants_histo; - 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 -} \ No newline at end of file diff --git a/config/sdsrvws02/ent.conf-MysqlServer b/config/sdsrvws02/ent.conf-MysqlServer deleted file mode 100644 index 26e4abd..0000000 --- a/config/sdsrvws02/ent.conf-MysqlServer +++ /dev/null @@ -1,44 +0,0 @@ -source source_ent -{ - type = mysql - sql_host = 192.168.3.30 - 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, \ -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; - sql_attr_str2ordinal = adr_typeVoie - sql_attr_uint = siren - sql_attr_uint = nic - sql_attr_uint = siege - sql_attr_uint = adr_num - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = actif - sql_attr_uint = cj - sql_attr_uint = sirenValide - sql_attr_uint = rang - -} - -index ent -{ - source = source_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 - 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 -} \ No newline at end of file diff --git a/config/sdsrvws02/ent.conf-MysqlServerSlave b/config/sdsrvws02/ent.conf-MysqlServerSlave deleted file mode 100644 index 84d34ac..0000000 --- a/config/sdsrvws02/ent.conf-MysqlServerSlave +++ /dev/null @@ -1,44 +0,0 @@ -source source_ent -{ - type = mysql - sql_host = 192.168.3.30 - 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, \ -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; - sql_attr_str2ordinal = adr_typeVoie - sql_attr_uint = siren - sql_attr_uint = nic - sql_attr_uint = siege - sql_attr_uint = adr_num - sql_attr_uint = adr_cp - sql_attr_uint = adr_dep - sql_attr_uint = actif - sql_attr_uint = cj - sql_attr_uint = sirenValide - sql_attr_uint = rang - -} - -index ent -{ - source = source_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 - 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 -} \ No newline at end of file diff --git a/config/sdsrvws02/histo.conf-MysqlServer b/config/sdsrvws02/histo.conf-MysqlServer deleted file mode 100644 index 29473ad..0000000 --- a/config/sdsrvws02/histo.conf-MysqlServer +++ /dev/null @@ -1,39 +0,0 @@ -# -# Sphinx configuration file sample -# -# WARNING! While this sample file mentions all available options, -# it contains (very) short helper descriptions only. Please refer to -# doc/sphinx.html for details. -# - -############################################################################# -## data source definition -############################################################################# - -source histo -{ - type = mysql - sql_host = 192.168.78.230 - sql_user = sphinx_histo - sql_pass = sphinx - sql_db = histobodacc - sql_port = 3306 # optional, default is 3306 - sql_query = SELECT id, nomFichier, annee1, dateBod, texte FROM bodacc_ocr; - sql_attr_uint = annee1 - sql_query_info = SELECT * FROM bodacc_ocr WHERE id=$id -} - -############################################################################# -## index definition -############################################################################# - -index histo -{ - source = histo - path = /home/sphinx/histo - docinfo = extern - morphology = none - min_word_len = 1 - charset_type = sbcs - html_strip = 1 -} diff --git a/config/sdsrvws02/sphinx.conf b/config/sdsrvws02/sphinx.conf deleted file mode 100644 index b390725..0000000 --- a/config/sdsrvws02/sphinx.conf +++ /dev/null @@ -1,77 +0,0 @@ - -############################################################################# -## indexer settings -############################################################################# - -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 - - # maximum IO calls per second (for I/O throttling) - # optional, default is 0 (unlimited) - # - # max_iops = 40 - - - # maximum IO call size, bytes (for I/O throttling) - # optional, default is 0 (unlimited) - # - # max_iosize = 1048576 -} - -############################################################################# -## searchd settings -############################################################################# - -searchd -{ - # IP address to bind on - # optional, default is 0.0.0.0 (ie. listen on all interfaces) - # - # address = 127.0.0.1 - # address = 192.168.0.1 - - - # searchd TCP port number - # mandatory, default is 3312 - listen = 3312 - - # log file, searchd run info is logged here - # optional, default is 'searchd.log' - log = /dbs/sphinxlog/searchd.log - - # query log file, all search queries are logged here - # optional, default is empty (do not log queries) - query_log = /dbs/sphinxlog/query.log - - # client read timeout, seconds - # optional, default is 5 - read_timeout = 5 - - # maximum amount of children to fork (concurrent searches to run) - # optional, default is 0 (unlimited) - max_children = 30 - - # PID file, searchd process ID file name - # mandatory - pid_file = /var/log/searchd.pid - - # max amount of matches the daemon ever keeps in RAM, per-index - # WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL - # default is 1000 (just like Google) - max_matches = 1000 - - # seamless rotate, prevents rotate stalls if precaching huge datasets - # optional, default is 1 - seamless_rotate = 0 - - # whether to forcibly preopen all indexes on startup - # optional, default is 0 (do not preopen) - preopen_indexes = 0 - - # whether to unlink .old index copies on succesful rotation. - # optional, default is 1 (do unlink) - unlink_old = 1 -}