diff --git a/analyseWriter.jar b/analyseWriter.jar index 898c9d1..7f0e745 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class index de72e33..54083dc 100644 Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ diff --git a/bin/fenetres/filechooserXML.class b/bin/fenetres/filechooserXML.class index 364f2f5..0662a12 100644 Binary files a/bin/fenetres/filechooserXML.class and b/bin/fenetres/filechooserXML.class differ diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java index f60a0d1..a6a2a5b 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/MEPTL/rechercherUnNodeStudent.java @@ -201,14 +201,7 @@ public class rechercherUnNodeStudent { node nodStudent = null; if(nodSujet.getAttributs().get("recherche_contenu_plus_proche_voisin").equals("true")) { if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) { -// System.out.println("recherche par le contenu plus proche voisin"); -// if(nod0Student!=null) System.out.println("nod0Student "+ nod0Student.toString() + " contenu=" + nod0Student.retourneLesContenusEnfants("")); -// if(nod1Student!=null) System.out.println("nod1Student "+ nod1Student.toString() + " contenu=" + nod1Student.retourneLesContenusEnfants("")); -// if(nod2Student!=null) System.out.println("nod2Student "+ nod2Student.toString() + " contenu=" + nod2Student.retourneLesContenusEnfants("")); - - String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); -// System.out.println("Contenu recherché = " + valueAttribut); if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod2Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); diff --git a/src/fenetres/filechooserXML.java b/src/fenetres/filechooserXML.java index 29f4c9a..286829e 100644 --- a/src/fenetres/filechooserXML.java +++ b/src/fenetres/filechooserXML.java @@ -59,7 +59,12 @@ public class filechooserXML extends JFileChooser { private void openFileXML(File file) { commandes.fichierAnalyseValide=true; - commandes.path = file.getPath().substring(0,file.getPath().lastIndexOf("\\")); + if(file.getPath().lastIndexOf("\\")>0) { + commandes.path = file.getPath().substring(0,file.getPath().lastIndexOf("\\")); + }else { + commandes.path = file.getPath(); + } + commandes.PathFilenameAnalysis = getCurrentDirectory().getPath(); commandes.nameSujet = file.getName().toString();