diff --git a/.classpath b/.classpath index 4b5675b..148593c 100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,6 @@ - + diff --git a/analyseWriter.exe b/analyseWriter.exe index 9599456..9d76fad 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index db8ab99..adde80b 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 0bc2271..78b40c7 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -3,13 +3,3 @@ /evaluer/ /fenetres/ /list/ -/voir.svg -/voirmini.png -/what.svg -/whatmini.png -/zip.png -/zip.svg -/zipmini.png -/zipstudent.png -/zipstudent.svg -/zipstudentmini.png diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class index 2a498ef..ec5a37c 100644 Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java index 9a5e166..eaea738 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/MEPTL/rechercherUnNodeStudent.java @@ -78,9 +78,9 @@ public class rechercherUnNodeStudent { - //************************************************************************************************ - //** Recherche les nodes text:p, text:h, text:span, text:list, text:note par le contenu textuel ** - //************************************************************************************************ + //********************************************************************************************************** + //** Recherche les nodes text:p, text:h, text:span, text:list, text:note, text:tab par le contenu textuel ** + //********************************************************************************************************** if(nodSujet.getNomElt().contains("text:")) { nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a); if(nameNode.equals("text:line-break")) return nodStudent; @@ -241,7 +241,7 @@ public class rechercherUnNodeStudent { */ private static node findNodeByContenuTextuel(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a) { node nodStudent = null; - if(nodSujet.retourneLesContenusEnfants("").length()<1) return null; +// if(nodSujet.retourneLesContenusEnfants("").length()<1) return null; String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list|^text:line-break$|^text:note$|^text:tab$"); //le node qui peuvent rechercher par le contenu textuel