From 8af53659827de6fa4448106bcde4ecb2e379661a Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Fri, 5 Apr 2024 16:01:47 +0200 Subject: [PATCH] V4.5.0 ajoute les attribut isDoublon dans les nodes de type text: des frames. --- bin/action/actNewFichierAnalyse.class | Bin 7988 -> 8033 bytes src/action/actNewFichierAnalyse.java | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/action/actNewFichierAnalyse.class b/bin/action/actNewFichierAnalyse.class index 16e649cc1b6b59ad6b98fab44a3b6d5e846beeb7..ec95e796de7691e06fb8d25f691dc3093effccfc 100644 GIT binary patch delta 2895 zcmcIm3vgUz75={L<0iYed2Key=FtaDN@GewS^*m&g`}yZG(kdb`aop6xkq z@Uo6y;#VriJ&UiZI(L4}uZfIE-zp@Pu*6|mNDz`q>`8Qn9@Q$j{3w#&xB9R^F z@`pQ(#bJMYpA|_XlwU8OJBCati8h^fj1rDOsJF++z!ExjY8WQ6tio>h_w^f{{&2fx z%h2gkr}QhDb)AzeC!^mV>hqf=M(X_$%PC7|Hgkylrk-|Vpz*RpgH=hGU{g9h1k7w+ zo%yP2Qi=XL3w1n0A2DO5+UqW_Fs;QpUd3`3OF2d3WT~mc=rN*UBT^j*8~&)Fb1J8) z{gcX^(^;;uOr4&Tf87kMC0r3Bx+EA0t_&IG@tHa+;5OSKg+{}vRxA!1ma$UjEMBFG zGi#<+vqt09g23fO{*I1dpvzcn3`BL#R-w!p{Gd{q6?3Y2t(v{X`Oa$A>71wBSw8PgI_t4XIA8?A!DvHoyPA_aS^n{K@vN#nx!{;V`|sT#_j=3B0F1r8DEokp}pVnkg0I6tBBPIW%J z$aWX~>SA{N^Z+GzJK?oTv$)mR)7Nc;E%0=9uu}zcuCxb&;H=Q%3t?;x1`NTl%Fo#5=u3%bv=;V!7uNIFrP=<2aGPFLGbWeJz3Cw8@*#VN0Sai8tdok;I>p`0EJ9hRNfI z4Wiz3XIh*N#+fdEZh6l1FgMP;OOX;Rcpkwxi;^s{CwN7YS0?#^1gnNHRUSN?li)Rt zL&&Rj`kV=VXb3LZW`Z}^==;NY-7Xt+Bm*`WPELc4L8aJJB>N2sW1}jWF}Uz z1R++Umo-=~Jm1J0a1R&YUM|FaY!TYFVl$Uw3xl|yYw&ny74L0CGZpFjgjvd^A zo!kkpl9P>%+AlOFOGE`or~N7yWp(_*-WLEg%bN?EH}#@n#mx~u*ulm87@S-p=cmIyCOMrNsIg5$iv~kOP{S_Z7L9X9k>Qk4^FzESIdsYQri4wG zgD*)3mnC_}q9MFc`7Bow&ts(7!>(A8t6D~IWZ5v+)Y@&=I)^?2QO@o*+(JI97@O}@snba7oE7kx_4}a++-K=*x2l2az(oZYYRN`{J30tH{93*FP=aN_M#m7 zP>CnSXTN}Q0C(UibYKXv7!G0+4&hN87T2foWgNvf#rcc`IEUjFimj<0@-Ylc@N}Hz z7x+c#uoou<>0zWviebTak950S2Ky7-E9J}-W$t4R9FlYkpX7cxC2bcE2*etnl1TX` z{;6<75-xT0AnX>_wb0&yTVr4hQ%uB1t9kJCLH(=DX?N9DE}=5V#0y{3k4F=*kNf(Qc!wU@Oe(!J0cYLilFgTp}%X z1q5}MIqt`Wzg|#x%H9bN4+*}D#wFfts~f_uN^=^NzDM77pA1{k_rL_xIJS;iK8L05 z$rEhb4DQp`{%^geE?eEID4q0-EGcrZLCr@XQhwqE7 zet@fG#x=-g7vV=}$Bz-~6r?ubC2Yn|Wf=ZU6n++Qyli1tm+Hj0d^H@kq$*#2IABRN z4LR6nN!2F7H(FA)OZb%*P7X_|y7V>We^CDKHD_@V92b$N(URlr3usNLv3L~I(qQ8e YaY^ITJSwYv8DoL0^22B3!*0I+9fj=Wg#Z8m delta 2833 zcmb`JZFp1V8OQ(syqz|E+O$mrq_hG;c`pSvb*osUr9iPo1f&yOT}V&cK$@^5g_gmh zfH2>faGZ!!5EKfcn>83B-H`3t_5r`RsoUJ#yxfc1+?;c6b1=d5xbF=`BLx zfGnV~H>j^S87bD9**xoGp-5tRA`o0BN(LoaHRmW^XDJ-hJ7i~F^Ex_0B6g=G;#|e+ zu~jO;0@)zoG}aTwLeDJDH~Ku4d?3-S}}rjf+yxcx-g6B+899Jmtnq#SZ@$ z6mP*XBCk_VERkSwH&^qE8gDh;DK59S@ixO@n^wt)H`zeHwd- zk(NGI1;_MGy|<<%kO+3^F~v>%3gPGoMcN7bY{f79Y={)W1_D$wZrFU zz6+XsK*KmXVgVbBcSpRCOykYc-qli0=W*v*~T z!(Digd+-qENrpvPsZfswc@ojs#KjP(!tMq(!-lKa*2ESrktMC8pEqKawS2{;ya`ST z?Bp^ohl?v@{&+ZsB&SOQHQuaYi3VLmNRu-SH)y=Z81PpnTQgkM+>aNhJGxyY&Hvk(=GR)YlkaK$L@!&@+_fL2xs4g_+3uvzX|_r4!J*Z% zk#86WD}2dEkcUT6fc@~{04neps&Ej~a7buAE?PfB+L<4@shj3D^d3crk_^`0?;WWP~Z8phpl8^9FK~p71_5LIe2%E`b ztjFkqQ<84yK^}rj(suE2A*b;P2{l5dX2TtpaMn~Ffx{wL3++P`XbcQtjLC6OZmn;D zcwF8Q7qC*}Mqyfc4&!Y@vRPYpki<>qso8S4T*RM~J*Gv3lR_mUJf0UhPYLls5&t_v{JSFkX(9fC5I-ZtzbC}MFT{T+ z#D65jPYLm~5I=kQiO>I(#OHik;^$F${u1U%z-^w@!^}4cbC(pt2`~G_(9Oe!Zn4+( zWA8Mx5Gp_6W`|!+PjPc^PS-G6=XAf*^70iqeV15y%+zE~NQ=42)tY%vYwo;ZAD85` znKrhw(rmF@+&&-+cUZ@69XxXX6FC}Rmb+I_hF8T^KgCS^OpeK)qggiGj$fb?$zNi# z(Ay?;zZY+aw_ia@eovYwYh6}}VfSiy+H$JAxp0{K#i%xv;E-ihy9D228Py@-*I3w` zmQj`HnjL>cez}?lY&o14QKr#y;|0uImNnz(a~NlXoyTN|jZgBpT;)xQ1#*=?J|$lc G^ZCCaIM?3* diff --git a/src/action/actNewFichierAnalyse.java b/src/action/actNewFichierAnalyse.java index 42fb73c..d018730 100644 --- a/src/action/actNewFichierAnalyse.java +++ b/src/action/actNewFichierAnalyse.java @@ -100,6 +100,7 @@ public class actNewFichierAnalyse extends AbstractAction{ placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage")); placeIsDoublonInStylePage(commandes.sujet.retourneFirstEnfantsByName("style:page")); placeIsDoublonInStylePage(commandes.sujet.retourneFirstEnfantsByName("style:style")); + placeIsDoublonInStylePage(commandes.sujet.retourneFirstEnfantsByName("frames")); commandes.sujet.getAttributs().put("analysis_filename","sujet.xml"); @@ -156,7 +157,7 @@ public class actNewFichierAnalyse extends AbstractAction{ Enumeration pages = Collections.enumeration(nod.getNodes()); while(pages.hasMoreElements()) { node nodLaPage = pages.nextElement(); - Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list$|^text:list-item$|^text:line-break$|^text:span$|^text:tab$"); //le node qui peuvent rechercher par le contenu textuel + Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list$|^text:list-item$|^text:line-break$|^text:span$|^text:tab$|^text:s$"); //le node qui peuvent rechercher par le contenu textuel ArrayList listTextesInPage = new ArrayList(); for(int i = 0 ; i < nodLaPage.getNodes().size();i++) { Matcher m = p.matcher(nodLaPage.getNodes().get(i).getNomElt()); @@ -181,7 +182,7 @@ public class actNewFichierAnalyse extends AbstractAction{ Enumeration pages = Collections.enumeration(nod.getNodes()); while(pages.hasMoreElements()) { node nodLaPage = pages.nextElement(); - Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list$|^text:list-item$|^text:line-break$|^text:span$|^text:tab$"); //le node qui peuvent rechercher par le contenu textuel + Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list$|^text:list-item$|^text:line-break$|^text:span$|^text:tab$|^text:s$"); //le node qui peuvent rechercher par le contenu textuel ArrayList listTextesInPage = new ArrayList(); for(int i = 0 ; i < nodLaPage.getNodes().size();i++) { Matcher m = p.matcher(nodLaPage.getNodes().get(i).getNomElt()); @@ -207,7 +208,7 @@ public class actNewFichierAnalyse extends AbstractAction{ * @param nod */ private static void placeIsDoublon(node nod) { - Pattern p = Pattern.compile("^text:p$|^text:h$|^text:list$|^text:list-item$|^text:line-break$|^text:span$|^text:tab$"); //le node qui peuvent rechercher par le contenu textuel + Pattern p = Pattern.compile("^text:p$|^text:h$|^text:list$|^text:list-item$|^text:line-break$|^text:span$|^text:tab$|^text:s$"); //le node qui peuvent rechercher par le contenu textuel ArrayList listTextesInPage = new ArrayList(); for(int i = 0 ; i < nod.getNodes().size();i++) { Matcher m = p.matcher(nod.getNodes().get(i).getNomElt());