diff --git a/CorpusOTMedia.txt b/CorpusOTMedia.txt index 47f73a1..d3b2f9d 100644 --- a/CorpusOTMedia.txt +++ b/CorpusOTMedia.txt @@ -5,7 +5,7 @@ Main corpus : /local_disk/zeus2/OTMEDIA/INA-TV2 Il y a des trucs de partout... -mais le plus interressent est dans hermes2, zeus2, et gaia +mais le plus intéressant est dans hermes2, zeus2, et gaia NYX ================================================================ diff --git a/SOLR.INSTALL b/SOLR.INSTALL index 28ca025..e81230a 100644 --- a/SOLR.INSTALL +++ b/SOLR.INSTALL @@ -9,7 +9,7 @@ 1/ Edit install.sh and put CONFPASS=1 -2/ Run install.sh, this will check tomcat is installed, untar otmedia SOLR DB and ask for solr service info. +2/ Run install.sh, this will check tomcat is installed, download and untar otmedia SOLR DB and ask for solr service info. 3/ Configure Tomcat and SOLR diff --git a/install.sh b/install.sh index 240fca5..f76352c 100755 --- a/install.sh +++ b/install.sh @@ -139,9 +139,11 @@ echo -e "SRILM toolkit : \t ${txtgrn}OK${txtrst}" ### Speeral Configuration ### + +echo -e "\t${txtblu}Speeral configuration${txtrst}\n" echo -e "Download Speeral bin and data :" scp -r rey@nyx:~/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/ -echo -e "\t${txtblu}Generating Speeral configuration files :${txtrst}\n" +echo -e "\n\t${txtblu}Generating Speeral configuration files :${txtrst}\n" cat $PWD/tools/Speeral/CFG/SpeeralFirstPass.xml.tmp | sed -e "s|[^<]*|$PWD/tools/Speeral/LEX/LEXIQUE_V6.speer|g" \ | sed -e "s|[^<]*|$PWD/tools/Speeral/LM/ML_4gOTMEDIA_LEXIQUE_V6|g" \ | sed -e "s|[^<]*|$PWD/tools/Speeral/LEX/LEXIQUE_V6.speer.bin|g" \ @@ -190,10 +192,10 @@ then echo -e "${txtpur}ERROR${txtrst} TOMCAT seems to not be installed)\n You have to install TOMCAT\n" exit 1; fi - echo -e "\nTOMCAT : \t ${txtgrn}OK${txtrst}" + echo -e "\nTOMCAT : \t ${txtgrn}OK${txtrst}\n" # SOLR secondly echo -e "\t${txtblu}Install SOLR DB${txtrst}" - read -p "You will need 300 Go of free space to install SOLR DB\nContinue ? (y/n) " solr + read -e -p "You will need 300 Go of free space to install SOLR DB\nContinue ? (y/n) " solr if [ "$solr" == "y" ] then @@ -201,20 +203,27 @@ then mkdir -p $OTMEDIA_HOME/tools/SOLR 2> /dev/null scp -r rey@nyx:~/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR echo -e "Unzip SOLR DB\r" + res=0 #res = $(tar -xvzf "$OTMEDIA_HOME/tools/SOLR/otmedia-2013-04.tar.gz" "$OTMEDIA_HOME/tools/SOLR/") if [ $res -eq 2 ]; then echo " ${txtpur}NOT OK${txtrst}"; else echo " ${txtgrn}OK${txtrst}"; fi + else + echo "Skipping SOLR install" + fi + read -e -p "Configure SOLR DB server ? (y/n) " solr + if [ "$solr" == "y" ] read -p "Enter SOLR server IP :" ip - if [ $ip == "" ];then ip="127.0.0.1";fi - echo 'machine = "194.57.216.43"' > $OTMEDIA_HOME/tools/scripts/solrinfo.py + if [ "${ip}" == "" ];then ip="127.0.0.1";fi + echo 'machine = "${ip}"' > $OTMEDIA_HOME/tools/scripts/solrinfo.py read -p "Enter SOLR server port :" port - if [ $port == "" ]; then port="8080";fi - echo "\n\tSOLR server IP $ip" - echo "\tSOLR server port $port" - echo 'port = "8080"' >> $OTMEDIA_HOME/tools/scripts/solrinfo.py + if [ "${port}" == "" ]; then port="8080";fi + echo -e "\n\tSOLR server IP ${ip}" + echo -e "\tSOLR server port ${port}" + echo 'port = "${port}"' >> $OTMEDIA_HOME/tools/scripts/solrinfo.py else - echo "Skipping SOLR install" + echo "Skipping SOLR DB Configuration" fi + echo -e "See SOLR.INSTALL file for more information\n" fi ### Set Variables in bashrc ###