MAJ V4.4.0 (amélioration des nodes textuels dans différentes pas).

This commit is contained in:
pablo rodriguez 2022-12-11 10:38:29 +01:00
parent cee58adc93
commit 34476969a5
7 changed files with 9 additions and 6 deletions

Binary file not shown.

1
bin/.gitignore vendored
View File

@ -1,3 +1,4 @@
/fenetres/
/resources/
/MEPTL/
/evaluer/

View File

@ -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"

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -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()) {

View File

@ -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 **