bugfix 3pass

Jean-François Rey
1 parent 665a8dac32
Showing 5 changed files with 27 additions and 8 deletions Side-by-side Diff
HOWTO
INSTALL
TODO
main_tools/ThirdPass.sh
tools/scripts/CheckThirdPass.sh
@@ -4,8 +4,8 @@
 # version 1.0   #
 #---------------#
  
-1\ Main options
----------------
+1\ Main scripts options
+-----------------------
  
 There are five main options for otmedia scripts.
 -h : for help
@@ -125,4 +125,11 @@
     -e Do Exploit Confidence pass
     -R Do Recompose pass
     -s Do Scoring pass
+
+4\ Modify configuration
+
+    4.1\ Scripts configurations
+    4.2\ Speeral configurations
+
+5\ Modify binaries
@@ -44,4 +44,20 @@
  
 The install.sh script download otmedia-2013-04.tar.gz and untar it in OTMEDIA_HOME/tools/SOLR/ .
 See SOLR.INSTALL file to install OTMEDIA SOLR DB.
+
+4\ Install descriptions
+
+OTMEDIA_HOME
+    |-> bin/
+    |-> cfg/
+    |-> data/
+    |-> main_tools/
+    |-> tools/
+    |-> COPYING
+    |-> CorpusOTMedia.txt
+    |-> HOWTO
+    |-> INSTALL
+    |-> README
+    |-> SOLR.INSTALL
+    |-> TODO
 - Check and add Verbose messages
 - Modify option -r behaviour
 - Modifiy SOLR request
+- Create Doc in latex
@@ -167,6 +167,7 @@
 mkdir -p $RES_DIR
 print_info "[${BASENAME}] Make directory $RES_DIR" 3 
  
+rm $LOGFILE $ERRORFILE 2>/dev/null
 #--------------------#
 # Save configuration #
 #--------------------#
@@ -235,7 +236,7 @@
 ## Check missing seg and log it
 if [ $CHECK -eq 1 ]
 then
-    ls $RES_DIR/*.treil 2>/deV/null | sed -e "s|$RES_DIR\/||g" | sed -e 's/\.treil//' | sort > ${OUTPUT_DIR_BASENAME}/.tmp
+    ls $RES_DIR/*.treil 2>/dev/null | sed -e "s|$RES_DIR\/||g" | sed -e 's/\.treil//' | sort > ${OUTPUT_DIR_BASENAME}/.tmp
     todo=$(cat ${PLP_LIST_P1} 2>/dev/null | wc -l)
     if [ $todo -eq 0 ]; then todo=1;fi
     notdone=$(($todo - $(cat ${OUTPUT_DIR_BASENAME}/.tmp | wc -l)))
@@ -22,7 +22,7 @@
         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)
+        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
...	...	@@ -4,8 +4,8 @@
4	4	# version 1.0 #
5	5	#---------------#
6	6
7		-1\ Main options
8		----------------
	7	+1\ Main scripts options
	8	+-----------------------
9	9
10	10	There are five main options for otmedia scripts.
11	11	-h : for help
...	...	@@ -125,4 +125,11 @@
125	125	-e Do Exploit Confidence pass
126	126	-R Do Recompose pass
127	127	-s Do Scoring pass
	128	+
	129	+4\ Modify configuration
	130	+
	131	+ 4.1\ Scripts configurations
	132	+ 4.2\ Speeral configurations
	133	+
	134	+5\ Modify binaries
...	...	@@ -44,4 +44,20 @@
44	44
45	45	The install.sh script download otmedia-2013-04.tar.gz and untar it in OTMEDIA_HOME/tools/SOLR/ .
46	46	See SOLR.INSTALL file to install OTMEDIA SOLR DB.
	47	+
	48	+4\ Install descriptions
	49	+
	50	+OTMEDIA_HOME
	51	+ \|-> bin/
	52	+ \|-> cfg/
	53	+ \|-> data/
	54	+ \|-> main_tools/
	55	+ \|-> tools/
	56	+ \|-> COPYING
	57	+ \|-> CorpusOTMedia.txt
	58	+ \|-> HOWTO
	59	+ \|-> INSTALL
	60	+ \|-> README
	61	+ \|-> SOLR.INSTALL
	62	+ \|-> TODO
1	1	- Check and add Verbose messages
2	2	- Modify option -r behaviour
3	3	- Modifiy SOLR request
	4	+- Create Doc in latex
...	...	@@ -167,6 +167,7 @@
167	167	mkdir -p $RES_DIR
168	168	print_info "[${BASENAME}] Make directory $RES_DIR" 3
169	169
	170	+rm $LOGFILE $ERRORFILE 2>/dev/null
170	171	#--------------------#
171	172	# Save configuration #
172	173	#--------------------#
...	...	@@ -235,7 +236,7 @@
235	236	## Check missing seg and log it
236	237	if [ $CHECK -eq 1 ]
237	238	then
238		- ls $RES_DIR/*.treil 2>/deV/null \| sed -e "s\|$RES_DIR\/\|\|g" \| sed -e 's/\.treil//' \| sort > ${OUTPUT_DIR_BASENAME}/.tmp
	239	+ ls $RES_DIR/*.treil 2>/dev/null \| sed -e "s\|$RES_DIR\/\|\|g" \| sed -e 's/\.treil//' \| sort > ${OUTPUT_DIR_BASENAME}/.tmp
239	240	todo=$(cat ${PLP_LIST_P1} 2>/dev/null \| wc -l)
240	241	if [ $todo -eq 0 ]; then todo=1;fi
241	242	notdone=$(($todo - $(cat ${OUTPUT_DIR_BASENAME}/.tmp \| wc -l)))
...	...	@@ -22,7 +22,7 @@
22	22	if [ ! -e "$1" ] \|\| [ -z "$1" ]; then return 1; fi
23	23	FILENBSEG=$(ls $2/*.seg 2>/dev/null \| grep -f "$1" \| wc -l)
24	24	FILENBRES=$(ls $2/*.res 2>/dev/null \| grep -f "$1" \| wc -l)
25		- FILENBTREIL=$(ls $2/*.treil 2>/deV/null \| grep -f "$1" \| wc -l)
	25	+ FILENBTREIL=$(ls $2/*.treil 2>/dev/null \| grep -f "$1" \| wc -l)
26	26	FILENB=$(cat "$1" \| wc -l)
27	27	if [ $FILENB -ne $FILENBSEG ] \|\| [ $FILENB -ne $FILENBRES ] \|\| [ $FILENB -ne $FILENBTREIL ] ; then return 1;fi
28	28	fi