From 3f3ef5566c34849c15541ff15cbaa9b4e20d0fb6 Mon Sep 17 00:00:00 2001 From: Normen Hansen Date: Wed, 28 Jan 2015 18:13:15 +0100 Subject: [PATCH] - fix wiki download ant scripts --- sdk/ant-jme/src/com/jme/ant/FixWikiLinks.java | 18 +++++++++--------- .../src/com/jme/ant/LoadWikiImages.java | 9 +++++---- sdk/ant-lib/ant-jme.jar | Bin 21331 -> 21400 bytes 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/sdk/ant-jme/src/com/jme/ant/FixWikiLinks.java b/sdk/ant-jme/src/com/jme/ant/FixWikiLinks.java index 24b7e55c7..a2de023ef 100644 --- a/sdk/ant-jme/src/com/jme/ant/FixWikiLinks.java +++ b/sdk/ant-jme/src/com/jme/ant/FixWikiLinks.java @@ -31,16 +31,16 @@ public class FixWikiLinks extends Task { String line = rdr.readLine(); while (line != null) { //internal links - line = line.replaceAll("wiki/doku\\.php/([^>]*):([^>]*):([^>]*):([^>]*)\\?do=export_xhtmlbody", helpPath + "$1/$2/$3/$4.html"); - line = line.replaceAll("wiki/doku\\.php/([^>]*):([^>]*):([^>]*)\\?do=export_xhtmlbody", helpPath + "$1/$2/$3.html"); - line = line.replaceAll("wiki/doku\\.php/([^>]*):([^>]*)\\?do=export_xhtmlbody", helpPath + "$1/$2.html"); - line = line.replaceAll("wiki/doku\\.php/([^>]*)\\?do=export_xhtmlbody", helpPath + "$1.html"); + line = line.replaceAll("doku\\.php/([^>]*):([^>]*):([^>]*):([^>]*)\\?do=export_xhtmlbody", helpPath + "$1/$2/$3/$4.html"); + line = line.replaceAll("doku\\.php/([^>]*):([^>]*):([^>]*)\\?do=export_xhtmlbody", helpPath + "$1/$2/$3.html"); + line = line.replaceAll("doku\\.php/([^>]*):([^>]*)\\?do=export_xhtmlbody", helpPath + "$1/$2.html"); + line = line.replaceAll("doku\\.php/([^>]*)\\?do=export_xhtmlbody", helpPath + "$1.html"); //images - line = line.replaceAll("/wiki/lib/exe/fetch\\.php/([^>]*):([^>]*):([^>]*):([^>]*)\"", "nbdocs:/" + helpPath + "$1/$2/$3/$4\""); - line = line.replaceAll("/wiki/lib/exe/fetch\\.php/([^>]*):([^>]*):([^>]*)\"", "nbdocs:/" + helpPath + "$1/$2/$3\""); - line = line.replaceAll("/wiki/lib/exe/fetch\\.php/([^>]*):([^>]*)\"", "nbdocs:/" + helpPath + "$1/$2\""); - line = line.replaceAll("/wiki/lib/exe/fetch\\.php/([^>]*)\"", "nbdocs:/" + helpPath + "$1\""); -// line = line.replaceAll("/wiki/lib/exe/fetch\\.php?([^>]*)\"", "nbdocs:/" + helpPath + "external/$1\"").replaceAll("[_[^\\w\\däüö:ÄÜÖ\\/\\+\\-\\. ]]", "_"); + line = line.replaceAll("/lib/exe/fetch\\.php/([^>]*):([^>]*):([^>]*):([^>]*)\"", "nbdocs:/" + helpPath + "$1/$2/$3/$4\""); + line = line.replaceAll("/lib/exe/fetch\\.php/([^>]*):([^>]*):([^>]*)\"", "nbdocs:/" + helpPath + "$1/$2/$3\""); + line = line.replaceAll("/lib/exe/fetch\\.php/([^>]*):([^>]*)\"", "nbdocs:/" + helpPath + "$1/$2\""); + line = line.replaceAll("/lib/exe/fetch\\.php/([^>]*)\"", "nbdocs:/" + helpPath + "$1\""); +// line = line.replaceAll("/lib/exe/fetch\\.php?([^>]*)\"", "nbdocs:/" + helpPath + "external/$1\"").replaceAll("[_[^\\w\\däüö:ÄÜÖ\\/\\+\\-\\. ]]", "_"); line = line.replaceAll("]*)>]*)>", ""); line = line.replaceAll("]*)\\?([^>]*)\">", ""); diff --git a/sdk/ant-jme/src/com/jme/ant/LoadWikiImages.java b/sdk/ant-jme/src/com/jme/ant/LoadWikiImages.java index 834d2205e..12f824bbc 100644 --- a/sdk/ant-jme/src/com/jme/ant/LoadWikiImages.java +++ b/sdk/ant-jme/src/com/jme/ant/LoadWikiImages.java @@ -37,11 +37,12 @@ public class LoadWikiImages extends Task { int endIdx = line.indexOf("\"", idx + 10); if (endIdx >= 0) { String link = line.substring(idx + 10, endIdx); - int wikidx = link.indexOf("/wiki/lib/exe/fetch.php/"); - //int extidx = link.indexOf("/wiki/lib/exe/fetch.php?"); + link = link.replace("&", "&"); + int wikidx = link.indexOf("/lib/exe/fetch.php/"); + //int extidx = link.indexOf("/lib/exe/fetch.php?"); int extidx = -1; if (wikidx >= 0) { - String name = link.replaceAll("/wiki/lib/exe/fetch\\.php/", ""); + String name = link.replaceAll("/lib/exe/fetch\\.php/", ""); int markIdx = name.indexOf("?"); if (markIdx >= 0) { name = name.substring(0, markIdx); @@ -75,7 +76,7 @@ public class LoadWikiImages extends Task { } } } else if (extidx >= 0) { - String name = link.replaceAll("/wiki/lib/exe/fetch\\.php\\?([^>]*);media=([^>]*)\"", ""); + String name = link.replaceAll("/lib/exe/fetch\\.php\\?([^>]*);media=([^>]*)\"", ""); int markIdx = name.indexOf("?"); if (markIdx >= 0) { name = name.substring(0, markIdx); diff --git a/sdk/ant-lib/ant-jme.jar b/sdk/ant-lib/ant-jme.jar index 449997c07676b8b54bce47963977677c0dae7a63..9998d4a789828595ba7c2630a6d9df59761fb130 100644 GIT binary patch delta 2827 zcmb_edvH|M8ULNLue&#Alg*k<*gVL?H6_WCg+v1^%km6S^I!?`h={NxOR|s`VL_~w ztze}UEtuODYA8Nx-BOAbVs60DQm_pcTg6i9Yla!e8OIszO#gB8AEy1z-3@8%F#V_Z zkMDfvd!6t5opZi(ufEKVB$*@JXfmsS0$e&2e8w@uG=3;}YHlfWh=al9efjei)n@_q z!&}&56ANi4&5yG>qNUm~OPW&_r2&6({_e59ft+f^*XfDJorh}((X zsltq1Dol7tlHDpE#tP*!n!4awcse)&v z=a3X0mE>nO98*y(bA1laOYQ~9y(qaCZTPv0JMof&UnqE4K~ljl6&#lpk?vP2f;cf< z!LKDlX_Vrmf>-4D8wIc0aLR_$!(mq$R~peI5JQvJWS-T&91Q}E*e1!az-t(>K^GXs z2*DqW^>mi(7-(N0a0X`?SeayA7Z}4i21|LQr++?4%LRUm-!a_g?~ZNuM|Vg4TcYvy zuIm1-em_IbpfyKffWUeDUMq9YN!*Kj1TNsBz#ABm3-<{80e@r=TO+$7{#c)Xd8|7s zFpf($yeaS}Bbm)RW8EFqyL-9?F3SLS;~s{rhG;w<>+LLw^+YRKA;*EC^#IjSQ`1%h61tBjihW#FVR@$uCZP;?rSo_PJCY8KI&f{+7=rik#{u z9gaG)+dRZi`sCDY){z;ocr30gms3Z!!Mez&&dTd-ZtD=+NV?lxIXc_{#iO`#rOxiQ z55eJ4Om4e$m-0N8c)DARGf%WEt}4ySPkQ3_Fhb3)5ZGsNzRfZqx@D$@a6Gg9WM6%#279ThkAl_c^w zbW~9)B$uo&km~!0s@pt{QTQpf3>~xTvfNqxIplbRJ4?sxv@H3rFFYCJP~^16 zBgV1BBXraz5ePVBxVt8`390s`)rA4)q(&+fL*a3rPqGTPZHRdZVyLk-3HXkimHi`x3Pto<5eU8Q10qUf3 zJWdzo02?&M#rot!*B&A;8KppM?-)^;p0f5n^kwkZr&s){ez&E0(Z08rZ|Qo9)59 zY#$mavt{gQ)U!d7A13)xlD~k)1f|x%UM0Z@30^0|i)dk&v4UMgm|e$8_6b_qKd_ps zSi>u@me0aE9!DG3a6dnR_53s*;AgObzkvt&Wo+bEu!+Bi2>%%E{8M!B&(X=hL>K=W zF@6JEsSj;4nbAv7bej|;dQ5Kg$v(rJD4@!Ej4tJ%y8Kv0{VJ2H%ENtFjV#LFf;CtR z2jZ*+>!^FtD@&Gbq_sn50{3G*RC-eEcmNxaL3?4vgV+ecuCd&d2fNN3DGw^=Vj|^2 zRgI-wsJ4fU6a-Z^&q%>RwaqZXWKxBtsbtX1k6{y~V4+%{q%B-c&9H;-$7bSe2=cRN zC(aBXf0s6QH8tQu{u!d=!KrSCQ3ywZx@Wqx=J9`G3p&9F5tic6CC?4bf<)xT zThsRP*^$o?J@e?MO-~gTA{*&tt*jbB`D8w+SbHhfzFWkSPnwL?D`T}7C`}1g_|0HX zP_X^C2qxb}8LW>|;piWJr*yp9ME{}Mk?>skBdT2ue?0X^RJ*WpVe!=eMxcb;C%%^+ ryP_4hHuIb^t+#a@ZwP7ALlxT5R;QL+;mnw{x~>(jnr(eMEG7R2DknuI delta 2849 zcmb_eeQ;FO760A4yKmpV+)b7xyU7bACLvhaEZGn=A4>>d5!1PsBX zwz_~~jKymDS}TTPYSpz;NMmppo7SkUQK&6#>2w^O&a}>SMjboT=}c$Jj0`>Zy=+44 zIQ^$Pv*(_BzV11{d+)jLnHanJ5*xUYHIOyOR<^Hfq&$zMm+vd9zUce-Tt^xp|2Y7R zAuV(C1k1N6t9l{_A|Yd;BhR>GZ&H>dr)!nPNme(WbQCCs*7Sm-M5zc#-uOp)y0JmY zFm@;@Mz)frEV@~ItFqwcX__~mK`B@iDkvc)Z%Q?qQ08f=GQ~d*T-$ld1Dx_0pLjyi zs~T3KQ^N`zbmEW`_qmAe(qPA74K{R3azw-Z=uy!t$FHk+K#t##D zaZJT=6%RY{h!ZC?WS~>VdsK3Ll02rtkA6uWcj8+bqAPGx!xQ+niYHwJ*;CSdKqIbS z#dl;{hKlb>&+kd$(~^AOiDxtv$^=j0S;-Ab?zH4iJMjYzi*QE8b1H^Z{7}X7Dt;u( zAl(ZZD)6F;m*hxkh-G zxx1;g=uqpS5QCoFBHfn2MMLy&dfWZ_5CyQO%IHrn$R2(%F(5>1b?e4(AH|5^W6j%?Bm_ zI({Ya4kiTN#e0;c72dd1=)J>-`?2S5?bBc)O@Hra15oJ1k>B+5Zm z)2M(^!Rv_LMY9l%j7CQw0XAZqt)Dak(y@VfVHuzXwKQY6o1D3HcJx!QS+rJ4APznT zTf-Ra#)m>g3*%60f)o6MU>vTRpjV3{r7C-nzZvw3Y>&1l4tJ^DXCLIx2j$dfk0Ukg z&>h}1GAvbisne$nvfU)`cxT1o4Xe89oh@}PpKB0qUA6gK(nreEy*|@q41P)=qalH4 zX5a$!II?sHkvQfgFgL8Ra0&|xopQ+zr;H(I(m0cnza@@bZ=SgnIlPK|q7-7@)P$Dt znPP7;U_sa&uvW|T&bQ2`R*ce;aojqk{~GCacO17_a>*_Tr|PM31h$Q#ut9ex5Tw*n z;#gRk=1b$xAzc?f0;6bB7Q6Aeo-zSdPD8qwz)D@jQ5-`!?3Uq5W@w`*m{iXVduC`T zg7nip<1x0t=Nx1Ogz@74fpN0T+hrN5_YQ9<;cej%R;N*)2A%4kLjC`Tx0u4SjN*T3 zhiAYo*OzrB@g{bGh0`S7LgJk|6Ytdj!dpU3dsIy4H`^}HY*p;~O7m#Pt_Nr=k6~8L z7%Ccq@(3jm9v^`NBP>$Hj#7gphMl1cbCmU&;~6$2N7(r_{srkd=%%qEtT)PY7Dl%s zfCg%>_acZ07NQG9=%MR*j4V&01ZT0B8shEL49jp4<@f>>Y!1R~F_y3}D%o-@W$RJJ z>amP%$8xqCD_DdYR43N3!_+`}aTjH^iXF$DtdHa;Nj^aGr%8SW)lv2$30@(=FbNW< zVdJP}mvJ|{iaPcIHnNYgncct^o`bD?KDO})w)4l(z=v=Tk6{Nthn@T)cJXoC%iqCn z{yz5bKVdKb2u=Ji*v~&h3;#P>`9Bfi|3VwTh7N+^0KblQ8@*DUvez&V=1^rFX6tfO zT_My_6HBG4GO!W#NTd86*o4h+Bf@I2g<6`5F18w5N$bK{Ca?|Lq2WAp5uW!Th4w+g z4(x(&tYlEb4eX*6 z9E8c^v~~5=5F2UNujaM?f+wYqBt{~MaH z4~!sT7KdheW@uJHlwL~WWaECylmWGL5ghNrEzhBMNdlGQQV_?|XHg(!$;(@1-5Js> zOWsb?be`qAp~1UcI!`|VIaC2~AJHyq^4+vCM^I_v(o0Xl12;VlwNp<+3tDA*MsZ$7 zR6Zjb9dh77!sj8=-fzy8NqhMg$u~;AKoPV}7FIxzJ__z`B<@zQLN)%5lg;v zGS&eZtKLLuMlk)$!A?-HN53MNd@Nwa YH+rgkrm}id7CU7$Zd#=D*GZ%Q0DhoR^#A|>