From fe73c608a36850e43fd89701e559ac4e94e643df Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Sat, 16 Feb 2008 22:32:30 +0000 Subject: [PATCH] =?UTF-8?q?YACOSTest:=20Correction=20du=20=C3=A0=20l'ajout?= =?UTF-8?q?=20de=20abstractText=20dans=20article=20YACOSWeb:=20Modificatio?= =?UTF-8?q?n=20d'un=20article=20qui=20marche=20(r=C3=A9envoie=20d'un=20fic?= =?UTF-8?q?hier=20ou=20pas)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebContent/WEB-INF/jsp/manageArticle.jsp | 2 +- .../WEB-INF/jsp/submissionArticle.jsp | 140 ++++++------ .../WebContent/images/cc-kedit-128x128.png | Bin 0 -> 10025 bytes .../author/controller/SArticleController.java | 177 ++++++++++------ .../controller/AddConferenceController.java | 199 +++++++++--------- 5 files changed, 285 insertions(+), 233 deletions(-) create mode 100644 YACOSWeb/WebContent/images/cc-kedit-128x128.png diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp index ed1c8b4..1261e7f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp @@ -33,7 +33,7 @@ ">Download - ">Modify + ">Modify Delete diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index e9cf92e..06f82cc 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -1,75 +1,79 @@ -<%@ include file="/WEB-INF/decorators/include.jsp"%> - - - - - - - - - - -

- +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + + + + + + + + +

- -

- - -
- -

- -

- -

- -

- -
-
- -

- : ${currentUser.firstName} ${currentUser.lastName} -

- - - "> - -
-
- -
- - -
${secAuthor}
- - -
- "/> - -

-
-
-
-
-
- File - - -

- "/> - "/>

-
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:${currentUser.firstName} ${currentUser.lastName}
+ "> + +
+
+ + +
${secAuthor}
+ + +
+ " />
File
 " /> + " />
+ - -">Home - - - - + +">Home + + + + diff --git a/YACOSWeb/WebContent/images/cc-kedit-128x128.png b/YACOSWeb/WebContent/images/cc-kedit-128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..e2f2cc2445b72cbafe3056e56f8fa3ccd52e5674 GIT binary patch literal 10025 zcmW++1ymGW8y=PgmR=g9mJTWDW+^E_K#(qJq@=qA2`Oo55Tv^s1nHKL?r!P&_xtCZ znS17*xp$r$@B6%Q!&Oz}urXd>004lkATOhiC+4-9d{k>FF+W6sbU{AA z4hqxz*m`hKQ(raPQfYYdqN1x06_cDe3a^mCL?KCz0)H~wG{33hcu(lAy`_0{IO>t^ zWl42&Nl8g_i7xx%$;H51i`TDvZzHb_TRrelO8!x&gFNSq@LcY55v?T`dF*8pEY{_>7O$Vjx zEp}1Bj=RIMXBJhFo}4X4K6*dfw`AiNv1zEOp+^ho+UwC-j~gAWx$W&wdpnul90SG7 z9@5`1Jp51oDji?^RAf36Bn@T1kK+gEua>wfA87h2ym23crN39So)0brcda&L`aj*u z@Rw=AT9Fix2w!Fpn{mg!kz~U$-MDgQwOjdSt$ssl)0Fg1Y=@Mb+|qEzzmpQ?BP3>RVecg7ELwd%#pkR99uu z*@^3dc8m4P;$qs6&YcT2Ev>NPVn9fx(qW~2fl&5#REe{#79&UiS`>ie(J}3ixni$O z@Afmit=45cnb^mmexe!C_*fDmDV$;90syXa=e{WniJ6#&xH%zr!lSh=(g}|s{rdC$o>gkae7ZY!RzkU10?%+A3XFtVj zmq^em+5c*rdEWAJq366i^-^nPdAgZ#xBp(7?X|nRz;^+M*HgUeMTGC(y^|FR%w=Yu zHS&M7llr0wZAI$08~HYG8K+X%B1Sbf(q*g~)BAx!*yW3u_f@v_UkVi{1Pnn9wn|I- zP6-ADCLOrVo;)tD_-}mNoW*`GSqV}YS^jZ=Pe4HMEnH?@hBmHo@8)dd?yJD^m+}LY zbhxHwenQmOuXy1yr}vM*&7)tv!%=?E%}NIDlAp^|Vf)}lX^?U6q%9yw$-v0OREUO# z_V#eDYNPM&?oKGZlUI2(LqzV~I|8bhFk`MS#l_QMnzV!HGP@WLf5)T4mfbA=>*G40 z^s8s$d;FsE9U(g2Zv$_bz76~b2UUQH3oAHJE@pCmK74FP8Y0P>NXvgmH#7an88TF?+R#N|3vE$Fxk=r!2? zC@;qe&|vMoX|kLXzs1uy`M63A{#2F$-}Um@A0K6dP+4jcmNKVd1AEOo!mJ1|j0iBD zmk9ZY@VnhgCJ2`SU|49rfFH68JQ5gXT+?z1CzG)$G^M7zI{)1B%WNfbX3J37? z?QBXxU}<$+>mK+@E?~H_yj(6a)irmUb$V6smf*Daq9YR!6@!w3t6>nM9mgO|XelfW z7f=O*Q{Pxjaz%Y>E;p*MP8^RVc(E~3iFAF*xpisOjk^_d4HiH3Cwv944|F9JAL zomMUD%eLB&$0kM2JvVzhWZeAmJ@;ec&ir5N#t<2vGppmQ&~Ek9sYm-r55_qtc-@Ua%=;y;ma~-D-A3i(`FlDty^mT*=}xb?GoPxWK63_BXVUpn>OPmXvbJskpeyL_6h}1L4o)21M~xC@q8a=M89Bf z_Xfa=Dk}V~K70s5=maj(Mc<1N0g=qf#3bdt{e3Sj7<7&@vKP>9aXX@J9(?aC(4xql z@|GfsqN9-ul23=@1iQhy2SR?(txoKn#fvXX^7%)-A+_Qi+gy?}k z)ogqjDm(kBWgiJ!GKKkwkt1c3d(iPac`*Z4yFbYjA$O?~g9Tw80lUq5$7Fs99jTd_ zR~EiFcv8lsp|9KHhRo|gs_SQsNpBeOy6uM!#olavWdqm~713E3a3J{MAu-)*dMaKZ zRplv-cSX}a<|R!Hm+JTpKrlBv+jF%$Tn845!*qkx-_eH}h+>C3KJ7YW;Ba);{WxI8 zO(K?|BBE&3OACvW|9R%ItZuDCJeRj3ZO*0#3=R)R#k&S0BUr$jIbmT71Xp1EhGNcx z)nibfcG9lP+DwcFnvGf+3|w`n{1J&_M{O~5=eRqPVFa=j_~#h ztJ4QFRGKIPJVZI-2h7TC=W8j9XVQxk6>eeUYu!aneY7Ryo8!2FWAg(F1iBL7qM9#L z)UZTFAy3Uk69l%QYA)p|q^U{Pk2;8r#5UB;g;i)9`J$*u1B1o9+{fO&a*p?9j!kYU zEmU8WPwUliAlyPS0KKdu)FR#V-F_DkX$!Ti70#&FKv)g0u#l&C5fiPX$QdUusK^m& zGK>lzDf(+$zzt0g(eQZ>LX7blvbhq!0k-StE4Z{fcV7)0rD=A7R$#z~|Y2o4F49R8q#h=qz$idC-#E|Os&f&n-lYV8q1;4}* z5&P!H?uJ`J&(9@n(EKTDU0q!#su4OmI;G-lXiz}`V`ymT?$MC}H!xFfFm!Vx*w)rI zgcG1UNQ%;uM?t56JljEKl1C>uPiaYO+DL|b6Mc(F5>lcCMQ!NIvhOv~{~oAjU5#V`;3Hw6Th`xUme`Tne_ zasDup#&?DoZBVrW3sb%Ayc0C3J*b$SFA#ro8!RO3hbQj5d(8RpWG5%Swq?cfu+E}= z0744ze4&vk%Zuy-#E#!drp2BtfAl$CqPz5eUk$7|rZ@_|;UYEr@BuW%yLWJq*U^y` z<9leD(oBepp*X`F!&2|g*dOP<9RX(CrxN-8}p=!uy zseE-71bl>{B6`}1oW+(WXlTJc#TjZN_9ulMr;nVjIQ4HN^*U4GtNX6`bW{ao&FT?w{R@2E=+NYLrU8$UizE6cBPW-h zb!|1|9J@alwAr1foHO;@jb_;0+w0<0PD@J@EU@`S^yBbf`pf7+Yw4}^-pDs9D)<(8SfEX! z2J$^noL+AZ_pzT8svH$sKQwIHZO-D0Q;F~m_xD2(oY8x7O@I@2o5gg$8&`jz&X94n z!T}bX^^Q(9@*@ktCg(qWnAi|~?a}o*C1XZ_N%|rGo)#ekh!vZfoD8x~dst3zm*m1w zmfdBIHSEEk!A`o+CZXYFU=?Mh$tscZ3Yjaf$QeZgS(1^VfhAC>7#k86&;5dIB)*zb zbN)5{-byC^*Z#x;;dUVmNxiHGM)Jfry}7HnkCsifED_deDFxvxCxsjOxLV5C8ov~P zWuov;vv;U$L$nzxd6w=UI*#=GTa0zJ947Ioi1;S`FmKJzBQoS|ioneZNW6azbeLQc z*|BdwCs07#{J%EO9`}mGYhm51^!!y`P5nXI9ix_pbc{@2yZF{|*M#&@(DbXnVeF?2 zn<~qp*BmR&MXW?RD}Ouh8rof#PZ9yve8uwiyM5V2>7N)ov2+B@w4d5a&Y}@zfA$9?TcpjRs110*TSH2qFVU_ z6^!IuEqZ`3gdwE7n!gpErx-rn{p;Gtmjlv_*&7IsdS{H?2COS>3Q7)f57Q9`KEI-$?Bb_oc#!ZU`qqPu4B^e# zaJ{gIqc9di1T}Iz#7uHZ4(;E~jUT4XHnEH$Im4)-S#Xr`pVm0N#$HDhX4zlRi0k{ z57C%wLG^uuI>%homU@-O)$lGwR^=(L!(UMzEnH?y-ysx0_U6DX7vljb@y_e*#Fw<3 zwLd7AYHeId6Y}eW4y*pR9Hbl|kdb)#CwvW@Z2loOhzv3KIi@*v#jJXZbDMKF{eAiL zP>E=962~MIAA&s|EQ#Sxkcb^%K7|xg03&Rqjn6b{M-QB?U3YpL8QZ%4-D-p*qZ1i< zDb}e>K+zVOA}xV*me`t+ecN^;q-1uJL&WeqIex635h*P~ccnVKmB3oow^<)hCCqa0 zMrz2QWEqMtbM$x$oubPxe<0Sq7zOn@X8%Ttct0d2k96pc*tL+UuB5&cI#R8ls} zoE57D<3(9J6QaoePY@0PDa{_{%09~xJsoq40trpk2r5S|-51Ik?u2TPQtsyMKJqjm>S z=p@OwQoc+A0M8Np65rJPMNm)=9Wn}~ymL*MEkfSOQyi?Un;=HMYhL=OQv|@PLR5{F z#+eOh;HbfvOxi$@LtZjS(k(Pe2z`58Df@v(2+F$@Y@bfU{SWqMe{74G+9V796T?P2 znH(^`{#b@&tcUdduLB`%mR?cBka1-->Li_6ISWoudM}rfGduuA**(u(g@DY5>m#l% zRlQ-EPyHVyRiXs>gBRN>C?xsjNPsp7Ne}dT;I%p$>Um!RhP(|P_pA?E+Ycx>xUJ?_ zV8}2!SC}E{)`91BH5;T`y2Fr|N&8sMa3907h61)YK1gc;8Zv>XYh-m0Af=gbiN~?L zPyph{g5M0o#NVb*wh_Q>Jwuu|TO7T~aj&F4l6dI%P|`iq%OHI|fo}Ls`QpV^t7!S)R#KeydsFPuQuPE=w&+DFm2{GP-cVK*8TB z^k{OoS?>QnHU|BkRv=;U!C5BU23=Ni_BrljP)AgZY13(!p_PH9Gin$&6L8CI6A3=x zfJ<$(sL4^&Oh3QM{39XVS2+u!5b5A8Yb{%;?sRDv8Y}1GX%Vjk{e-efQO6z~L%iI-=iO0lyAA+tr|WP91Y zTn#c;WbE3|Y4-U;m*U+Kx$LBqqvAL^gT5Hd?F$;t(SqNiHqA?J82sEL2)UC8&7C%k z=9D#p?BVD9eVNu?a%^2F<$UV&2AL>~#(<1N3|m9)_27cGkxI{=TIs>l4?&29-FBU% zBQ(Jwj)z>J9h1*Dy}3Q69AaKEUB}LfR~+R2xMdHNV&RNm75R5ysr_sjUeKQ3nzG?# z4H(bsKcMQJ(uD-&%)?@1#c{S*B~=YzRvt_?`=qXq)GS5*9KWNoHNCiHJ_?+X-D$r@hI1*OA3ID<@2HB~#5 z?N`hn#WnE39O9}MYKAQ6G*-Css)W;beB}ROPy*&KjB7tJb)$BsL&{Or3krt}(XiM}(ZU2Bf;$bG5lr*#lBp8bNS-Lz6^WZbh?c0%*BFEi1djWC! z;QaA``MUqN)ujiSJmz$B0ffjgKo=RV=F%n&5xlgO$YY?8`WxM$=;#r_^UQDj+^9|g z2~;K2BU8_40c0haLDPqAt3qGepN!`0mV`*aN7*gJvFg78Pe>UN*KwsJv=NKp=|%gp z(N@#VGfhSn#tfFz0l50gVk36X1itIRf3k!uD!HcNxEyK}T?YWm-g0^aUy3WJwibE6 zuQV4_V^pNBfE!9OZFQvnSJi{nS8>1j$jbi^6@@F59;@{fo z+WNNptL|tBm;9f@iSZ7l*r^b>?J`m!;>lY>FV6pxF)m3H3c-MN4R9!41xr6N~bHC_U9=MvME z93+*hz3~bm?#J_j=H~Bzye9G@JW_r;iXxeX3D#NS@WhJhqRX~;CehQCf2Jzf6dyLT zRWR1aszalPSU8aQ`w9iDU%Dab6S4S4Wk5j_D_Q>KT@X$YySIdo+l8m~N14=Moxwo( zJyjB66vNer@i#UPw3E8Ve_K+j6B~s=O(EGJJvh5i0Q^sPQ}SowO02QeEhq}Gi}&w) z78^#;d|@|ZjAV01a$LAdw}As~s|C+%Rux8mUEf!l7yyUm{`gW>a}f7PR~-@3@~TQe z-7kH2pb41`kAV||0{DuguvpLW9)c}gC3`< zs4c)zyTM?b(5TT?4{j#}cT;V+SL~}BsE)P!Q5Yf1Q*55MuO=!Wp-BN&s66Gte_$rP zG<(e%OR?LRl1jhWPBzpZOWLAJ{)%tR)tX-KaE3iubvsv;{RoISy{V^*tN=@`rE5jS zES&I>9x1KEGMSh4GNnW>-tYSJk%$WK(oMPHo=b7Q&kO9&uZ-eNitC%5l&!4Fxbcuk zog>XuH6^l%E4-ZGLH2g#wa;_MdU*YZ9~=F)J4$rHyptY!%}^;QwRjj+6fI%h_T@ZPqA1dr z<{9M#Ph*)80NQkaou`ttrJ*aIDp6(nifrZuvlrn>+1qb^cROTzMsNGZt3qHxj;N_e z9^}9t8!7jV6!tIE4f@xk1hz}6YHpE5Z|8!`kgdF8xsyMCL=EWt>V5>8+vFo7H#%kZ zlVXV^mE833`t+SSq+g3?!6Vm7`$@>3iF!p=ZKX8cBR6E_3JaT4qU*GZIe$;@(|&WpFMRKG8(~QJ_5mT!CW?niMI&ay3^6<$4>l04k`Qn$k z=HTXKxif>@)xAZP^FM_O|1zX35IKnS&Z))ly^_4=e=O1en%FYAIF& zi&j~Mb*TH(1T8t>W6PRYn>T^CZx zgd+u}19aD)fh0v5N=5?wR+F9G#(17U-A{n*?$fA#rxdnf*FOh_AeoCh>yCA|T*~B0 ze=CW>asfI^MtQ0yB<`2Qtq~D(jbU?efw)nnkMEBuv4bp`=)E=y=DooYqhK3GP{{h8 zOm`i2jrizPWo}zrF@L}oDB^n%`$6NT<+16_O$^zI*qf#A%hCncTmx(Z&_J%UC>it$ z8p80Id@K{(`posO%?*)b2c+sefOY`wQ3HwyT`Jh$Z)*2o!t+o5w%shAK|^q$^cXC` z;7fEFeTG0)@U*9BAkht#4XYlvjouPoo>a+G}aGaI~>gG+owJ_`)`xxYv-ehE(* z{kS4&`!hMmbj&HoTEPFRS59Xt(?Xco5)r1-cm1Pj&ToB7cm~O5z|$R{=P;ZkR(;8! z8iy}4gVp*)S^~JIu8ROM-s=}n5tIA3JJj@8SXhu!QpzfZmmh$GB@uz|E@Nm6lRv(V zff7kzDBnX*hi?#xk>6+R4FW`93=yJF)^|dmuyU2{inc&u3m*rWBV`juO46RMYBeA7 z1z`AXy|nDLGFNB(X5!r^C$-JL3E<);jHtvhu|2 z?C-s)LLrY+SfNVBhoK~P(X(F!t=DZQTiu^AMX%;e)5W~&i#<=QCJqxdr=;xWt5)64 z(sluwMY+7b5v0wzLwmF)Q zZIwpf4uHU!U9m-~=x2G8!ULWWY5kuiB|RtC8`t;q)#jM@S4SlZ;Jis$7l}*cIM~r(GU?B~O_myWJME1pw6P|IPwTZm8&|ir6VB zo|`mT&YpZ?u@<~O)T=Lcx*|#SA1d5=ut@4oeuu;2@%snw--`JW*t{|#pq`9KEUxVQ zKDi)b4h2%NqQ1_T%jQ%@musrMu*5A%E{W*byBoYg4;f13juEU z?TL%x*?=CBq^gn!6f3Qq6ENMBlcqktNleL}9ZDeMNHgW>C=ySpW)-=<1@f_=# zJHW)X{{=TzWSbpP^ivkC^td9-dM;QM-N8x!SEM~ri7=3VT$ZfEUdyIv7ISem<{xs% zs;MGiivv?82%HrXw)YeaD3+a7=*h1se}gkVtF=X2if?=Xgnk~^b65Mos;vyn9m?L! z3`EJwH38Z`(#ElqQM)RSh!V7kO8EiA83VjYF1xV=C+oyVt*mOfKg^2L2w|OmmA?w|OTkU?bJSZ|(~8{Nm=hU=94ki?Tr5sV;2RN6*94*FW4X zG0DWFR#>PI&DQE|mB>nGozfrmIoDyqbYAZF$S1stJKccclv)8B7kBsM%i#V_z(#mP zJM~Pf$mj1ktB`ZwuWF4Q=$_C4lI9lhr1!MOm|A5u{?6RH8A4N;J0Z~e@%Xf2?C#||R=5fsJjod-{KO3JO5UrRLj4JL6o+suMYFt$_CH86oI*6jEGslzF) zUcx?hRM*! z5!Z%E#{8&?Eiv&ZItHw6}5XxLd+emDL z6sb_e-CH=!b4&(ah;3l>T#j5GiW0kcG~vsQ`X(Ja3X#xHQgT@KR_S-R2lw7qbRBYY z6om6u@8DQ!X=M<#FV@s-$7h`Ew2xpsKV2)I9lq;zN7wv@3^6@TWis>`xRCoDZGJdW z%933KF&JpWR31Uj?)N^{*<5P;RXXbax~U}(GXM!CBZi#0+}(Z6*`&I1ETeKUFP&)n z*eb%s>lIA<*kSUiX23RVTV!^)gZ$XNW_2m^;CmBG*0A831%G+=&hRPL&>B8t-FAPb zk^n7l;CKz?!M;Zh%PMMc8p@Y~#^suo41$gw(>>Yai|8j>+D_#fq}67k_F+`1I2HE} zPI@XQrbv;zc}EEnG`NXnOJMBL>99Tw(nId!`m?ebN7Ma7w%4 z?YBY)KCEb2f1(eGm4aYieAWs?hhdWr2U*nhg#w~*;0s83-kX`+@C_0k;17tjLMa2G zE@P1c=-uvB%qs->?;En40o6*$RiuYG;XvH+RDb7nwmLf^Kr{dFc`>eQ8#J0Y5UTW( z14xh7s0z&fwvwP~?3+fk^2lEDvI3Nik?@Dn8P;!H^QgZgeR*lhr2JW`qVnQ|%Pp#K5)!{ONg literal 0 HcmV?d00001 diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index 22ac994..9638dd9 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -41,9 +41,10 @@ public class SArticleController extends SimpleFormController { Conference conf = SessionService.getInstance().getCurrentConference(); // Fetching user User user = SessionService.getInstance().getCurrentUser(); - + String title = ((FormSubmission) command).getTitle(); String theme = ((FormSubmission) command).getTheme(); + String abstractText = ((FormSubmission) command).getAbstractText(); ArrayList listSecondaryAuthor = new ArrayList(); // Removes null entries from the list @@ -52,63 +53,114 @@ public class SArticleController extends SimpleFormController { listSecondaryAuthor.add(sAuthor); } } - - String nomFile=""; - - try { - MultipartFile file = ((FormSubmission) command).getFile(); - if (file == null || file.isEmpty()) { - errors.rejectValue("file", "form.submitArticle.noFile"); - try { - return showForm(request, response, errors); - } catch (Exception e) { - e.printStackTrace(); - } - } - else { - - // Creates the article - Article newArticle = articleManager.addArticle( - title, theme, nomFile, user.getLogin(), - listSecondaryAuthor, Article.State.SUBMITED, conf.getId()); - - if(newArticle==null){ - errors.reject("article.errors.didNotSave"); + + String action = request.getParameter("action"); + if (action == null || action.equals("")) + { + + String nomFile=""; + + try { + MultipartFile file = ((FormSubmission) command).getFile(); + if (file == null || file.isEmpty()) { + errors.rejectValue("file", "form.submitArticle.noFile"); try { return showForm(request, response, errors); } catch (Exception e) { e.printStackTrace(); } } - - byte b[] = file.getBytes(); - - String path = "conference"+conf.getId()+"/"; - (new File(downloadDirPath+path)).mkdirs(); - path += newArticle.getId()+"_"+file.getOriginalFilename(); - File uploadedFile = new File(downloadDirPath+path); - - FileOutputStream fos = new FileOutputStream(uploadedFile); + else { - fos.write(b); - fos.close(); - - newArticle.setURL_article(path); - articleManager.updateArticle(newArticle); + // Creates the article + Article newArticle = articleManager.addArticle( + title, theme, abstractText, nomFile, user.getLogin(), + listSecondaryAuthor, Article.State.SUBMITED, conf.getId()); + + if(newArticle==null){ + errors.reject("article.errors.didNotSave"); + try { + return showForm(request, response, errors); + } catch (Exception e) { + e.printStackTrace(); + } + } + + byte b[] = file.getBytes(); + + String path = "conference"+conf.getId()+"/"; + (new File(downloadDirPath+path)).mkdirs(); + path += newArticle.getId()+"_"+file.getOriginalFilename(); + File uploadedFile = new File(downloadDirPath+path); + + FileOutputStream fos = new FileOutputStream(uploadedFile); + + fos.write(b); + fos.close(); + + newArticle.setURL_article(path); + articleManager.updateArticle(newArticle); + } } + catch (FileNotFoundException e) { + System.out.println(e); + } catch (IOException e) { + System.out.println(e); + } + + // The role author might have been added, refresh the credentials + SessionService.getInstance().refreshAuthentication(); } - catch (FileNotFoundException e) { - System.out.println(e); - } catch (IOException e) { - System.out.println(e); + else if (action.equals("modify")) { + String articleID = request.getParameter("articleID"); + + try { + Integer id = new Integer(articleID); + + // TODO : vérifier que l'id de l'article appartient à l'auteur... vive les GET... + + Article old = articleManager.getArticle(id); + old.setTitle(title); + old.setTopic(theme); + old.setSecondaryAuthors(listSecondaryAuthor); + old.setAbstractText(abstractText); + + MultipartFile file = ((FormSubmission) command).getFile(); + if (file == null || file.isEmpty()) { + articleManager.updateArticle(old); + } + else { + byte b[] = file.getBytes(); + + String path = "conference"+conf.getId()+"/"; + (new File(downloadDirPath+path)).mkdirs(); + path += old.getId()+"_"+file.getOriginalFilename(); + File uploadedFile = new File(downloadDirPath+path); + + FileOutputStream fos = new FileOutputStream(uploadedFile); + + fos.write(b); + fos.close(); + + old.setURL_article(path); + articleManager.updateArticle(old); + } + } catch (NumberFormatException e) { + throw new ModelAndViewDefiningException(new ModelAndView("404error")); + } catch (FileNotFoundException e) { + System.out.println(e); + } catch (IOException e) { + System.out.println(e); + } + } - - // The role author might have been added, refresh the credentials - SessionService.getInstance().refreshAuthentication(); - + else { + throw new ModelAndViewDefiningException(new ModelAndView("404error")); + } + return new ModelAndView(new RedirectView(getSuccessView())); } - + protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { String action = request.getParameter("action"); if (action == null || action.equals("")) @@ -117,44 +169,41 @@ public class SArticleController extends SimpleFormController { return myArticle; } else if (action.equals("modify")) { - + String articleID = request.getParameter("articleID"); - + try { Integer id = new Integer(articleID); - + // TODO : vérifier que l'id de l'article appartient à l'auteur... vive les GET... - + Article a = articleManager.getArticle(id); - + if (a == null) throw new ModelAndViewDefiningException(new ModelAndView("denied", "message", getMessageSourceAccessor().getMessage("submission.modify.denied"))); + + FormSubmission myArticle = new FormSubmission(); - FormSubmission myArticle = new FormSubmission(); - - - // FIXME : stocker l'abstract texte ds la BDD... et le récup après... - //myArticle.setAbstractText(); - + myArticle.setAbstractText(a.getAbstractText()); myArticle.setTitle(a.getTitle()); myArticle.setListe(a.getSecondaryAuthors()); myArticle.setTheme(a.getTopic()); - + request.getSession().setAttribute("listSecondaryAuthors", a.getSecondaryAuthors()); - + return myArticle; - + } catch (NumberFormatException e) { throw new ModelAndViewDefiningException(new ModelAndView("404error")); } - + } else { throw new ModelAndViewDefiningException(new ModelAndView("404error")); } - + } public IArticleManager getArticleManager() { @@ -164,11 +213,11 @@ public class SArticleController extends SimpleFormController { public void setArticleManager(IArticleManager articleManager) { this.articleManager = articleManager; } - + public String getDownloadDirPath() { return downloadDirPath; } - + public void setDownloadDirPath(String downloadDirPath) { this.downloadDirPath = downloadDirPath; } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index b6a23bc..791087f 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -41,7 +41,7 @@ public class AddConferenceController extends AbstractWizardFormController { private IConferenceManager conferenceManager; private IUserManager userManager; - + private IEvaluationManager evaluationManager; public IEvaluationManager getEvaluationManager() { @@ -139,7 +139,7 @@ public class AddConferenceController extends AbstractWizardFormController { public List getUsersAdded() { return listPersonAdded; } - + public List getInvitation(){ return listInvitations; } @@ -148,16 +148,16 @@ public class AddConferenceController extends AbstractWizardFormController { email = email.toLowerCase(); Pattern emailPattern = Pattern.compile("^[a-z0-9._-]+@[a-z0-9._-]{2,}[.][a-z]{2,4}$"); // Regex Matcher emailMatcher = emailPattern.matcher(email); - + if(!emailMatcher.matches()){ return false; } - + listInvitations.add(email); - + return true; } - + public void removeInvitations(List emailList){ for(String email : emailList){ listInvitations.remove(email); @@ -172,7 +172,7 @@ public class AddConferenceController extends AbstractWizardFormController { private Set criteria; private Set criteriaAll; - + public Set getCriteriaAll() { return criteriaAll; } @@ -180,7 +180,7 @@ public class AddConferenceController extends AbstractWizardFormController { public Set getCriteriaAdded() { return criteria; } - + public CriterionBean getTrueCriteria(int id) { for (CriterionBean cb : criteriaAll) { if (cb.getId() == id){ @@ -193,15 +193,15 @@ public class AddConferenceController extends AbstractWizardFormController { return cb; } } - + return null; } - + public void setCriterionClick(CriterionBean c) { if (c.getId() == -1) { c.setId(getNextId()); } - + criteria.remove(c); criteria.add(c); } @@ -212,18 +212,18 @@ public class AddConferenceController extends AbstractWizardFormController { } CriterionBean trueCriteria = getTrueCriteria(c.getId()); - + criteria.remove(trueCriteria); criteria.add(trueCriteria); criteriaAll.remove(trueCriteria); } public void deleteCriterion(CriterionBean c) { - + CriterionBean trueCriteria = getTrueCriteria(c.getId()); - - - + + + criteria.remove(trueCriteria); criteriaAll.add(trueCriteria); } @@ -243,28 +243,28 @@ public class AddConferenceController extends AbstractWizardFormController { protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { logger.info(this.getClass().toString() + " dans le formBackingObject"); - + FormConference conference = new FormConference(); - + String action = request.getParameter("action"); if (action == null || action.equals("")) { // TODO : tester ici si le gars a le droit d'�tre ici // a-t-il le droit de cr�er une conf�rence ? - + criteria = new HashSet(); criteriaAll = new HashSet(); List listCriterion = evaluationManager.getCriterions(); - - + + int maxNext = 0; for (Criterion crit : listCriterion) { if (maxNext <= crit.getId()) maxNext = crit.getId(); } - + nextId = maxNext + 1; - + for (Criterion crit : listCriterion) { CriterionBean cb = new CriterionBean(); cb.setId(crit.getId()); @@ -274,7 +274,7 @@ public class AddConferenceController extends AbstractWizardFormController { criteriaAll.add(cb); getNextId(); } - + listPersonBean = new ArrayList(); listPersonAdded = new ArrayList(); listInvitations = new ArrayList(); @@ -288,26 +288,26 @@ public class AddConferenceController extends AbstractWizardFormController { pb.setLogin(user.getLogin()); listPersonBean.add(pb); } - + return conference; } else if (action.equals("modify")) { Conference conf = SessionService.getInstance().getCurrentConference(); - + criteria = new HashSet(); criteriaAll = new HashSet(); List listCriterionForConf = evaluationManager.getCriterions(conf.getId()); List listCriterion = evaluationManager.getCriterions(); - + int maxNext = 0; for (Criterion crit : listCriterion) { if (maxNext <= crit.getId()) maxNext = crit.getId(); } - + nextId = maxNext + 1; - + for (Criterion crit : listCriterionForConf) { CriterionBean cb = new CriterionBean(); cb.setId(crit.getId()); @@ -369,7 +369,7 @@ public class AddConferenceController extends AbstractWizardFormController { listPersonBean.remove(person); DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - + conference.setTitle(conf.getTitle()); conference.setDateArticleParsed(conf.getDateArticle()); conference.setDateArticle(format.format(conf.getDateArticle())); @@ -381,7 +381,7 @@ public class AddConferenceController extends AbstractWizardFormController { conference.setDateStart(format.format(conf.getDateStart())); conference.setDescription(conf.getDescription()); conference.setOtherInformations(conf.getOtherInformations()); - + // TODO : ajouter ca ds conf ejb... /*conference.setPageNumber(pageNumber); conference.setSendInfo(sendInfo); @@ -389,18 +389,18 @@ public class AddConferenceController extends AbstractWizardFormController { conference.setTypeODT(typeODT); conference.setTypePDF(typePDF); conference.setTypeWord(typeWord);*/ - + return conference; - + } else { throw new ModelAndViewDefiningException(new ModelAndView("404error")); } - + } - - + + protected void validatePage(Object command, Errors errors, int page) { FormConference conference = (FormConference) command; ConferenceValidator conferenceValidator = (ConferenceValidator) getValidator(); @@ -424,67 +424,66 @@ public class AddConferenceController extends AbstractWizardFormController { String action = request.getParameter("action"); if (action == null || action.equals("")) { - - Conference conf = null; - - try { - conf = conferenceManager.addConference( - conference.getTitle(), - SessionService.getInstance().getCurrentUserLogin(), - conference.getDescription(), - conference.getOtherInformations(), - conference.getDateArticleParsed(), - conference.getDateArticleParsed(), - conference.getDateEvaluationParsed(), - conference.getDateStartParsed(), - conference.getDateEndParsed()); - } catch (NoConferenceCreationTokenLeftException e1) { - return new ModelAndView("denied","message",getMessageSourceAccessor().getMessage("conference.error.noTokenLeft")); - } - - conference.setConferenceId(conf.getId()); - SessionService.getInstance().setCurrentConference(conf); - - for(CriterionBean criterion : criteria){ - conferenceManager.addCriterionToConference( - conf.getId(), - criterion.getLabel(), - criterion.getMin(), - criterion.getMax()); - } - - for(PersonBean personBean : listPersonAdded){ - conferenceManager.addPCMemberToConference( - conf.getId(), - personBean.getLogin()); - } - - String mailSubject = "YACOS "+conf.getTitle()+" invitation"; - String mailBody = "Greetings,\n"; - mailBody += "You've been invited to join the program comity of the conference :\n"; - mailBody += conf.getTitle()+"/n"; - mailBody += "You can register on this page : \n"; - String baseUrl = request.getSession().getServletContext().getContextPath(); - mailBody += baseUrl+"/registerUser.htm /n"; - mailBody += "Please note that you MUST use this eMail address in the registration form in order to get the appropriate credentials."; - // TODO : use a template - for(String invitationEmail : listInvitations){ + Conference conf = null; + try { - conferenceManager.addInvitationToken(invitationEmail, RoleType.PCMEMBER, conf.getId()); - MailSenderService.getInstance().sendEMail(invitationEmail, mailSubject , mailBody); - } catch (ConferenceDoesntExistException e) { - // Should never happen - e.printStackTrace(); - } catch (MailSendException e) { - // TODO : see what we can do about this - e.printStackTrace(); + conf = conferenceManager.addConference( + conference.getTitle(), + SessionService.getInstance().getCurrentUserLogin(), + conference.getDescription(), + conference.getOtherInformations(), + conference.getDateArticleParsed(), + conference.getDateArticleParsed(), + conference.getDateEvaluationParsed(), + conference.getDateStartParsed(), + conference.getDateEndParsed()); + } catch (NoConferenceCreationTokenLeftException e1) { + return new ModelAndView("denied","message",getMessageSourceAccessor().getMessage("conference.error.noTokenLeft")); } - } - - conferenceManager.addRole(RoleType.CHAIRMAN, SessionService.getInstance().getCurrentUserLogin(), conf.getId()); - // Refresh the roles to take into account the chairman credentials - SessionService.getInstance().refreshAuthentication(); - } else { + + conference.setConferenceId(conf.getId()); + SessionService.getInstance().setCurrentConference(conf); + + for(CriterionBean criterion : criteria){ + conferenceManager.addCriterionToConference( + conf.getId(), + criterion.getLabel(), + criterion.getMin(), + criterion.getMax()); + } + + for(PersonBean personBean : listPersonAdded){ + conferenceManager.addPCMemberToConference( + conf.getId(), + personBean.getLogin()); + } + + String mailSubject = "YACOS "+conf.getTitle()+" invitation"; + String mailBody = "Greetings,\n"; + mailBody += "You've been invited to join the program comity of the conference :\n"; + mailBody += conf.getTitle()+"/n"; + mailBody += "You can register on this page : \n"; + String baseUrl = request.getSession().getServletContext().getContextPath(); + mailBody += baseUrl+"/registerUser.htm /n"; + mailBody += "Please note that you MUST use this eMail address in the registration form in order to get the appropriate credentials."; + // TODO : use a template + for(String invitationEmail : listInvitations){ + try { + conferenceManager.addInvitationToken(invitationEmail, RoleType.PCMEMBER, conf.getId()); + MailSenderService.getInstance().sendEMail(invitationEmail, mailSubject , mailBody); + } catch (ConferenceDoesntExistException e) { + // Should never happen + e.printStackTrace(); + } catch (MailSendException e) { + // TODO : see what we can do about this + e.printStackTrace(); + } + } + + conferenceManager.addRole(RoleType.CHAIRMAN, SessionService.getInstance().getCurrentUserLogin(), conf.getId()); + // Refresh the roles to take into account the chairman credentials + SessionService.getInstance().refreshAuthentication(); + } else if (action.equals("modify")) { Conference conf = SessionService.getInstance().getCurrentConference(); conf.setTitle(conference.getTitle()); conf.setDescription(conference.getDescription()); @@ -494,11 +493,11 @@ public class AddConferenceController extends AbstractWizardFormController { conf.setDateEnd(conference.getDateEndParsed()); conf.setDateStart(conference.getDateStartParsed()); conf.setDateEvaluation(conference.getDateEvaluationParsed()); - + conferenceManager.update(conf); - + conferenceManager.removeCriterionToConference(conf.getId()); - + for(CriterionBean criterion : criteria){ conferenceManager.addCriterionToConference( conf.getId(), @@ -506,7 +505,7 @@ public class AddConferenceController extends AbstractWizardFormController { criterion.getMin(), criterion.getMax()); } - + conferenceManager.removePCMemberForConf(conf.getId()); for(PersonBean personBean : listPersonAdded){ @@ -515,7 +514,7 @@ public class AddConferenceController extends AbstractWizardFormController { personBean.getLogin()); } } - + return new ModelAndView("main"); }