diff --git a/analyseWriter.exe b/analyseWriter.exe index 138f697..0ae2b10 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 280fc55..4c5d29c 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index 38d9222..005e565 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/bin/MEPTL/verificationFichierAnalyse.class b/bin/MEPTL/verificationFichierAnalyse.class index b618c50..88d8eb9 100644 Binary files a/bin/MEPTL/verificationFichierAnalyse.class and b/bin/MEPTL/verificationFichierAnalyse.class differ diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index 88fba23..cb07f7f 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -1116,7 +1116,9 @@ public class meptl { if(noddraw.get(j).getAttributs().get("text:anchor-type")!=null) { if(noddraw.get(j).getAttributs().get("text:anchor-type").equals("page")) { if(noddraw.get(j).getAttributs().get("text:anchor-page-number")!=null) { - node page1 = a.retourneFirstNodeByNameAttributValue(nodpage, "page", "numeroabsolue", noddraw.get(j).getAttributs().get("text:anchor-page-number")); + node page1 = null; + if(pagezerosupprimer) page1 = a.retourneFirstNodeByNameAttributValue(nodpage, "page", "numeroabsolue", String.valueOf(Integer.valueOf(noddraw.get(j).getAttributs().get("text:anchor-page-number"))-1)); + if(!pagezerosupprimer) page1 = a.retourneFirstNodeByNameAttributValue(nodpage, "page", "numeroabsolue", noddraw.get(j).getAttributs().get("text:anchor-page-number")); if(page1!=null) { if(pagezerosupprimer) { page1.getNodes().add(noddraw.get(j)); diff --git a/src/MEPTL/verificationFichierAnalyse.java b/src/MEPTL/verificationFichierAnalyse.java index 8a02e39..6704d2b 100644 --- a/src/MEPTL/verificationFichierAnalyse.java +++ b/src/MEPTL/verificationFichierAnalyse.java @@ -848,11 +848,17 @@ public class verificationFichierAnalyse { String cheminVersFichierAnalyse = commandes.PathFilenameAnalysis; if(!commandes.console) cheminVersFichierAnalyse = commandes.PathFilenameAnalysis.substring(0,commandes.PathFilenameAnalysis.lastIndexOf("\\")); if(commandes.analysis_filename.contains(".")) { - Run.ecritureNodeEnXML(commandes.sujet,commandes.analysis_filename.substring(0, commandes.nameSujet.lastIndexOf(".")),cheminVersFichierAnalyse,Run.TypeFile.Sujet); +// Run.ecritureNodeEnXML(commandes.sujet,commandes.analysis_filename.substring(0, commandes.nameSujet.lastIndexOf(".")),cheminVersFichierAnalyse,Run.TypeFile.Sujet); + Run.ecritureNodeEnXML(commandes.sujet,commandes.analysis_filename.substring(0, commandes.analysis_filename.lastIndexOf(".")),cheminVersFichierAnalyse,Run.TypeFile.Sujet); }else { Run.ecritureNodeEnXML(commandes.sujet,commandes.analysis_filename,cheminVersFichierAnalyse,Run.TypeFile.Sujet); } + commandes.message.append("

**********************************************************

"); + commandes.message.append("

Ecriture du fichier avec le nouveau hash.

"); + commandes.message.append("

**********************************************************

"); + + }else { commandes.message.append("

**********************************************************

");