Corrections, lexique non fonctionnel toujours

etherpad_to_lexique/etherpad_to_lexique.ant

 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." name="myantce" default="main">
-    <property file="etherpad_to_optim.properties"/>    
+    <property file="etherpad_to_lexique.properties"/>    
     <!-- CHECK FOR WINDOWS FAMILY OS -->
     <condition property="is_windows">
         <os family="windows"/>
@@ -30,34 +30,36 @@
         <exec dir="../etherpad_to_hdoc" executable="run.sh"/>
     </target>
     
-    <target name="to_optim_sh" if="${is_unix}">
+    <target name="to_lex_sh" if="${is_unix}">
         <delete>
-            <fileset dir="${opti_in}">
+            <fileset dir="${lex_in}">
                 <include name="*.hdoc"/>
             </fileset>
         </delete>
-        <copy file="${eth_out}/output.hdoc" todir="${opti_in}"/>
-        <exec dir="../hdoc_to_optim" executable="run.sh"/>
-        <copy file="${opti_out}/*.scar" todir="output"/>        
+        <copy file="${eth_out}/output.hdoc" todir="${lex_in}"/>
+        <exec dir="../hdoc_to_lexique" executable="run.sh"/>
+        <copy file="${lex_out}/*.scar" todir="output"/>        
     </target>
     
-    <target name="to_optim_windows" if="${is_windows}">
+    <target name="to_lex_windows" if="${is_windows}">
         <delete>
-            <fileset dir="${opti_in}">
+            <fileset dir="${lex_in}">
                 <include name="*.hdoc"/>
             </fileset>
         </delete>
-        <copy file="${eth_out}/output.hdoc" todir="${opti_in}"/>
-        <exec dir="../hdoc_to_opale" executable="run.bat"/>
+        <copy file="${eth_out}/output.hdoc" todir="${lex_in}"/>
+        <exec dir="../hdoc_to_lexique" executable="run.bat"/>
         <mkdir dir="output"/>
-        <copy file="${opti_out}/result.scar" todir="output"/>
+        <copy todir="output">
+            <fileset dir="${lex_out}"/>
+        </copy>
     </target>
         
     <target name="main">
         <antcall target="to_hdoc_sh"/>
         <antcall target="to_hdoc_windows"/>
-        <antcall target="to_optim_sh"/>        
-        <antcall target="to_optim_windows"/>        
+        <antcall target="to_lex_sh"/>        
+        <antcall target="to_lex_windows"/>        
     </target>
     
 </project>
\ No newline at end of file

etherpad_to_lexique/etherpad_to_lexique.properties

@@ -8,5 +8,5 @@ log = ${basedir}/log
 eth_in = ../etherpad_to_hdoc/input
 eth_out = ../etherpad_to_hdoc/output
 lex_in = ../hdoc_to_lexique/input
-lex_out = ../hdoc_to_lexique/output
+lex_out = ../hdoc_to_lexique/out
 rootfilename = content.xml
\ No newline at end of file

etherpad_to_optim/etherpad_to_optim.ant

@@ -48,7 +48,7 @@
             </fileset>
         </delete>
         <copy file="${eth_out}/output.hdoc" todir="${opti_in}"/>
-        <exec dir="../hdoc_to_opale" executable="run.bat"/>
+        <exec dir="../hdoc_to_optim" executable="run.bat"/>
         <mkdir dir="output"/>
         <copy file="${opti_out}/result.scar" todir="output"/>
     </target>