From b9a54507e83742a03321b352e5cb12deaae84876 Mon Sep 17 00:00:00 2001 From: rey jean-Francois Date: Mon, 5 Aug 2013 14:23:24 +0200 Subject: [PATCH] update bugfix + readme --- HOWTO | 0 README | 68 ++++++++++++++++++++++++++++++++++++++-- main_tools/FirstPass.sh | 3 +- main_tools/SecondPass.sh | 2 +- tools/scripts/CheckFirstPass.sh | 2 +- tools/scripts/CheckSecondPass.sh | 6 ++-- tools/scripts/CheckThirdPass.sh | 6 ++-- 7 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 HOWTO diff --git a/HOWTO b/HOWTO new file mode 100644 index 0000000..e69de29 diff --git a/README b/README index dbd2ba2..49716fd 100644 --- a/README +++ b/README @@ -25,8 +25,62 @@ DESCRIPTION DEPENDENCIES ------------ - +GNU Toolchain + Available from : http://www.gnu.org + and debian packages + + Compiling, linking, and building applications. + + +avconv (libav-tools >= 0.8) + Available from : http://libav.org + and debian package + + avconv is a very fast video and audio converter. + +JAVA JDK and JRE ( >= 6) + Available from : http://www.oralce.com + and debian packages + + JAVA Developpment kit and JAVA runtime environment. + +Python ( >= 2.7.0) + Available from : http://http://www.python.org/ + and debian packages + + Python is a programming language. + +Perl ( >= 5.0.0) + Available from : http://www.perl.org/ + and debian packages + + Perl is a programming language. + +iconvi ( >= 2.0.0) + Available from : http://www.gnu.org + and debian package + + Character set conversion. + +csh shell (csh) + Available on debian packages. + + The C shell was originally written at UCB to overcome limitations in the + Bourne shell. Its flexibility and comfort (at that time) quickly made it + the shell of choice until more advanced shells like ksh, bash, zsh or + tcsh appeared. Most of the latter incorporate features original to csh + +The SRI Language Modeling Toolkit (SRILM >= 1.6.0) + Available from : http://www.speech.sri.com/projects/srilm/ + + SRILM is a toolkit for building and applying statistical language models. + +Tomcat ( >= 7.0.0) + Available from : http://tomcat.apache.org/ + and debian packages + + Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies. INSTALLATION ------------ @@ -43,21 +97,31 @@ INSTALLATION $> ./install.sh $> export OTMEDIA_HOME=path/to/OTMEDIA/directory + Read SOLR.INSTALL part 3/ to install SOLRDB. + +RUNNING +------- + + See HOWTO file. ACKNOWLEDGEMENTS ---------------- - Many thanks to Jean-François Rey for useful help. + + Many thanks to Jean-François Rey for useful help and work done. KNOWN BUGS ---------- + Many. COPYRIGHT --------- + See the COPYING file. AUTHORS ------- + Jean-François Rey Hugo Mauchrétien Emmanuel Ferreira diff --git a/main_tools/FirstPass.sh b/main_tools/FirstPass.sh index 519be23..23b1f8b 100755 --- a/main_tools/FirstPass.sh +++ b/main_tools/FirstPass.sh @@ -346,9 +346,10 @@ do diff ${OUTPUT_DIR_BASENAME}/plp_${MODS[$i]}.lst ${OUTPUT_DIR_BASENAME}/.tmp | grep -e "^< " | sed -e "s/< //" > ${OUTPUT_DIR_BASENAME}/todo.lst rm ${OUTPUT_DIR_BASENAME}/.tmp # log seg to do - print_log_file $LOGFILE "Segs not done :" + print_log_file $LOGFILE "Segs not done [" cat ${OUTPUT_DIR_BASENAME}/todo.lst >> $LOGFILE todo=${OUTPUT_DIR_BASENAME}/todo.lst + print_log_file $LOGFILE "] [$(date +'%d/%m/%y %H:%M:%S')]" print_warn "[${BASENAME}] Try $redo" 3 fi fi diff --git a/main_tools/SecondPass.sh b/main_tools/SecondPass.sh index ba68956..99fca94 100755 --- a/main_tools/SecondPass.sh +++ b/main_tools/SecondPass.sh @@ -180,7 +180,7 @@ nbtreil_p2=$(ls $RES_DIR/*.treil 2> /dev/null | wc -l) if [ $nbres_p1 -gt 0 ] then pourcentage=$((($nbtreil_p2*100)/$nbres_p1)) - if [ $pourcentage -gt 89 ] + if [ $pourcentage -gt 89 ] && [ ${RERUN} -eq 0 ] then print_info "[${BASENAME}] Lattice already done, skipping $BASENAME" 1 exit 0 diff --git a/tools/scripts/CheckFirstPass.sh b/tools/scripts/CheckFirstPass.sh index f49fa63..81afefa 100755 --- a/tools/scripts/CheckFirstPass.sh +++ b/tools/scripts/CheckFirstPass.sh @@ -56,7 +56,7 @@ check_first_pass_output_speeral() if [ ! -e "$1" ] || [ -z "$1" ]; then return 1; fi FILENBSEG=$(ls $2/*.seg 2>/dev/null | grep -f "$1" | wc -l) FILENBRES=$(ls $2/*.res 2>/dev/null | grep -f "$1" | wc -l) - #FILENBPHO=$(ls "$2/*.pho" | grep -f "$1" | wc -l) + #FILENBPHO=$(ls $2/*.pho | grep -f "$1" | wc -l) FILENB=$(cat "$1" | wc -l) FILENBPHO=$FILENB if [ $FILENB -ne $FILENBSEG ] || [ $FILENB -ne $FILENBRES ] || [ $FILENB -ne $FILENBPHO ] ; then return 1;fi diff --git a/tools/scripts/CheckSecondPass.sh b/tools/scripts/CheckSecondPass.sh index 1fc3ebe..ad94fe3 100644 --- a/tools/scripts/CheckSecondPass.sh +++ b/tools/scripts/CheckSecondPass.sh @@ -20,9 +20,9 @@ function check_second_pass_output_speeral() if [ $# -eq 2 ] then if [ ! -e "$1" ] || [ -z "$1" ]; then return 1; fi - FILENBSEG=$(ls "$2/*.seg" 2> /dev/null | grep -f "$1" | wc -l) - FILENBRES=$(ls "$2/*.res" 2> /dev/null | grep -f "$1" | wc -l) - FILENBTREIL=$(ls "$2/*.treil" 2> /dev/null | grep -f "$1" | wc -l) + FILENBSEG=$(ls $2/*.seg 2>/dev/null | grep -f "$1" | wc -l) + FILENBRES=$(ls $2/*.res 2>/dev/null | grep -f "$1" | wc -l) + FILENBTREIL=$(ls $2/*.treil 2>/dev/null | grep -f "$1" | wc -l) FILENB=$(cat "$1" | wc -l) if [ $FILENB -ne $FILENBSEG ] || [ $FILENB -ne $FILENBRES ] || [ $FILENB -ne $FILENBTREIL ] ; then return 1;fi fi diff --git a/tools/scripts/CheckThirdPass.sh b/tools/scripts/CheckThirdPass.sh index 9ca83dd..b6dc75a 100644 --- a/tools/scripts/CheckThirdPass.sh +++ b/tools/scripts/CheckThirdPass.sh @@ -20,9 +20,9 @@ function check_third_pass_output_speeral() if [ $# -eq 2 ] then if [ ! -e "$1" ] || [ -z "$1" ]; then return 1; fi - FILENBSEG=$(ls "$2/*.seg" 2>/dev/null | grep -f "$1" | wc -l) - FILENBRES=$(ls "$2/*.res" 2>/dev/null | grep -f "$1" | wc -l) - FILENBTREIL=$(ls "$2/*.treil" 2>/deV/null | grep -f "$1" | wc -l) + FILENBSEG=$(ls $2/*.seg 2>/dev/null | grep -f "$1" | wc -l) + FILENBRES=$(ls $2/*.res 2>/dev/null | grep -f "$1" | wc -l) + FILENBTREIL=$(ls $2/*.treil 2>/deV/null | grep -f "$1" | wc -l) FILENB=$(cat "$1" | wc -l) if [ $FILENB -ne $FILENBSEG ] || [ $FILENB -ne $FILENBRES ] || [ $FILENB -ne $FILENBTREIL ] ; then return 1;fi fi -- 1.8.2.3