Branche 1.1

2012-01-19 21:14:22 +00:00 · 2012-01-19 21:14:22 +00:00 · 5b3f2444cb
commit 5b3f2444cb
parent 0b769d7418 ed4da858c2
28 changed files with 2 additions and 2 deletions
--- a/1.0/Sphinx.sh
+++ b/1.0/Sphinx.sh
--- a/1.0/config/Sphinx/Dev/act.conf
+++ b/1.0/config/Sphinx/Dev/act.conf
@ -1,4 +1,4 @@
-source source_act
+source act
 {
    type			= mysql
    sql_host		= 192.168.78.230
@ -21,7 +21,7 @@ source source_act

 index act
 {
-    source            = source_act
+    source            = act
    path              = /dbs/sphinx/act
    docinfo           = extern
    morphology        = none
--- a/1.0/config/Sphinx/Dev/dir.conf
+++ b/1.0/config/Sphinx/Dev/dir.conf
--- a/1.0/config/Sphinx/Dev/dirtmp.conf
+++ b/1.0/config/Sphinx/Dev/dirtmp.conf
--- a/1.0/config/Sphinx/Dev/ent.conf
+++ b/1.0/config/Sphinx/Dev/ent.conf
--- a/1.0/config/Sphinx/Dev/enttmp.conf
+++ b/1.0/config/Sphinx/Dev/enttmp.conf
--- a/1.0/config/Sphinx/Dev/histo.conf
+++ b/1.0/config/Sphinx/Dev/histo.conf
--- a/1.0/config/Sphinx/MysqlServer/ent.conf
+++ b/1.0/config/Sphinx/MysqlServer/ent.conf
--- a/1.0/config/Sphinx/MysqlServer/enttmp.conf
+++ b/1.0/config/Sphinx/MysqlServer/enttmp.conf
--- a/1.0/config/Sphinx/sphinx.conf
+++ b/1.0/config/Sphinx/sphinx.conf
--- a/1.0/config/SphinxHisto/MysqlServer/act.conf
+++ b/1.0/config/SphinxHisto/MysqlServer/act.conf
--- a/1.0/config/SphinxHisto/MysqlServer/dirtmp.conf
+++ b/1.0/config/SphinxHisto/MysqlServer/dirtmp.conf
--- a/1.0/config/SphinxHisto/MysqlServer/histo.conf
+++ b/1.0/config/SphinxHisto/MysqlServer/histo.conf
--- a/1.0/config/SphinxHisto/sphinx.conf
+++ b/1.0/config/SphinxHisto/sphinx.conf
--- a/1.0/config/srvws02/sphinx.conf
+++ b/1.0/config/srvws02/sphinx.conf
--- a/1.0/config/srvws02/srvws02/dir.conf
+++ b/1.0/config/srvws02/srvws02/dir.conf
--- a/1.0/configure.php
+++ b/1.0/configure.php
--- a/1.0/indexer/indexerAct.sh
+++ b/1.0/indexer/indexerAct.sh
--- a/1.0/indexer/indexerDiri.sh
+++ b/1.0/indexer/indexerDiri.sh
--- a/1.0/indexer/indexerEtab.sh
+++ b/1.0/indexer/indexerEtab.sh
--- a/1.0/indexer/sql/countDiri.sql
+++ b/1.0/indexer/sql/countDiri.sql
--- a/1.0/indexer/sql/countDiri_tmp.sql
+++ b/1.0/indexer/sql/countDiri_tmp.sql
--- a/1.0/indexer/sql/countEtab.sql
+++ b/1.0/indexer/sql/countEtab.sql
--- a/1.0/indexer/sql/countEtab_tmp.sql
+++ b/1.0/indexer/sql/countEtab_tmp.sql
--- a/1.0/indexer/sql/finIndexationDiri.sql
+++ b/1.0/indexer/sql/finIndexationDiri.sql
--- a/1.0/indexer/sql/finIndexationEtab.sql
+++ b/1.0/indexer/sql/finIndexationEtab.sql
--- a/1.0/initscript/sphinxsearch
+++ b/1.0/initscript/sphinxsearch
--- a/1.0/logrotate/searchd
+++ b/1.0/logrotate/searchd