diff --git a/analyseWriter.jar b/analyseWriter.jar index 7901a3e..9314572 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index d092f21..77aa50d 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,3 +1,4 @@ /fenetres/ /resources/ /MEPTL/ +/evaluer/ diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class index f7f0bb5..74b2f4b 100644 Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ diff --git a/bin/evaluer/analyseLesNodesPrincipaux.class b/bin/evaluer/analyseLesNodesPrincipaux.class index 66263e2..16b9b75 100644 Binary files a/bin/evaluer/analyseLesNodesPrincipaux.class and b/bin/evaluer/analyseLesNodesPrincipaux.class differ diff --git a/icons/versfichierAnalyseModifmax.svg b/icons/versfichierAnalyseModifmax.svg index ab1d5cf..c3264ab 100644 --- a/icons/versfichierAnalyseModifmax.svg +++ b/icons/versfichierAnalyseModifmax.svg @@ -10,8 +10,8 @@ sodipodi:docname="versfichierAnalyseModifmax.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" inkscape:export-filename="versfichierAnalyse.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" + inkscape:export-xdpi="98" + inkscape:export-ydpi="98" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java index 6338dc6..0ef3ff9 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/MEPTL/rechercherUnNodeStudent.java @@ -40,8 +40,10 @@ public class rechercherUnNodeStudent { //** Le contenu exact supprime dans le texte les espaces au début et à la fin et ignore la case ** //************************************************************************************************ if(nodSujet.getAttributs().get("recherche_contenu_exact")!=null){ - nodStudent = findNodeParContenuEXACT(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a); - if(nodStudent!=null) return nodStudent; + if(nodSujet.getAttributs().get("recherche_contenu_exact").contentEquals("true")) { + nodStudent = findNodeParContenuEXACT(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a); + if(nodStudent!=null) return nodStudent; + } } @@ -237,7 +239,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; - Pattern p = Pattern.compile("^text:p|^text:h|text:span"); + Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list"); Matcher m = p.matcher(nodSujet.getNomElt()); if(m.find()) { if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) { diff --git a/src/evaluer/analyseLesNodesPrincipaux.java b/src/evaluer/analyseLesNodesPrincipaux.java index 0e8c3a3..2a49746 100644 --- a/src/evaluer/analyseLesNodesPrincipaux.java +++ b/src/evaluer/analyseLesNodesPrincipaux.java @@ -1163,7 +1163,7 @@ public class analyseLesNodesPrincipaux { //************************************ //** analyse tous les nodes enfants ** //************************************ - page = analyseLesNodesEnfants.nodeNext(page, "ana:page", pageStudent, null, null, pageSujet, nodSujetParagraphs, nodStudentParagraphs,nodmenu, a); + page = analyseLesNodesEnfants.nodeNext(page, "ana:page", pageStudent, nodStudentS, null, pageSujet, nodSujetParagraphs, nodStudentParagraphs,nodmenu, a); //**************************************************************** //** Insère les attributs des points dans les node de l'analyse **