From fd8bc529a67e541846f2e8fde438140bdd82b872 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mikko=20Kein=C3=A4nen?= Date: Sat, 23 Oct 2010 01:55:44 +0300 Subject: [PATCH] Removed two triggers that couldn't be used after enabling multiple instances of media images and media image containers. --- doc/er.dia | Bin 4485 -> 4871 bytes src/db/dbcreator.cpp | 28 +++++++++++++++++++--------- src/db/dbmediaimagecontainer.cpp | 1 - 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/er.dia b/doc/er.dia index 400ce37530ad13365ad9505d7dbb1a7f5a0d0c9b..d791b50aca53f3a11ae977a2c91feab7a9c10369 100644 GIT binary patch literal 4871 zcmV+i6Zq^OiwFP!000021MOW~Z{y05exF|<_`J$JeXG8NnF)d*i+xyNf#l?QKufgE z99;~Fo*BRFZ{Mn>obiRUWi{Kfq!!K`SaQ3IMHQ>Qy7r&{@^d~LeXmyQdb#*=CKx{( zRg1}TS}(4?oc-(f|2lVPfBE|9&(pg66aKqemGcq)#bQnGzMNe*&CQ=afBx~~2b!;D^;Re&PDe1G#r)ATu>WkZ^8ZF9s_2ulMocwXM zTHY?EXYH!Zy2*03T#de$voB}AU53}$=gl^sAMNwP-Z$k{b+M|-Kl-=k`0{?2t#7K; z({1NB%XN)Qn!B54OM3R9|36r>S+&MRi>t4{{Z;?gUee}+Uwd_3XfKgwUaqd{#dA7% zZ)WX{kjzOb@n(Q`o?C6j{XKa*xr_HDH+x@ltM?^WufN?aSIw%do984imdjaHE?TP1 z>bBaQ&U#YLP{dwhD}sy5x@nfLT>oV`TW`Za`|*FCwzodHSF3vZ@`L+mMb9oj>S=TR z?PsFf)$V?mX!q~+y1tlIT~}W(n!&ce8)o~b-%ilpzy3T@8rt1@&BN4HP{G^H!_{p) zt=6xI+2b`mJ6&&6f7VK4TX?Qsj+5iM{?Dyntz)tSBvM!U?`3P ziJ(B9b9JvgG}DeheCY^U*HwLW-SiU^% z-AxONSS>6ZlcXaPs$nD{NDnJ0q+$Yp)=VZ<#Boe*r-_|`hhMeKn)nnn@w~!!^k8OH ze4?uO9~By7)WPfP`ldr6%UFes%5rR(NvMw<<1jWGSj-V33xOISsX~roY8!p5n3vi= zc)5i7m`oXDjr=h*@;`5{r}5f&R$VsVCgp0{M@B@GSdmb@NMjLAqn=iX6ff@{M+65| z{HtYCHr4dS?H`9UvssBZD{26oZvb_0VxVu(ut>!Dk{OAHg)`4nBmEe*vT4btC7YIP zT23=~q@#_BLUlDpFT$n_;}exYq!5N#GAlaDm3ZB##Im)WSy3`akWSC2tgGhsCP$A> zPZ$3ab=nk7G-~AksTWm;K89$0%o*33@|@Z_pHL-x=Do6p0{Pw=R|wJo_}((Zx!Vzp zPnL_tw`wsB4DG^Z_e!uDuM2=1wd2!#JD=PvD)#sV)M7M_iyhj44z!jFfwdnWms}_9i1o9(jHO@F;W6!k&y6S z7ev>33R7x)-cyTkFPGg*g_U?=3iz&hv;E1ih>&5m9~rjMdRQ>UwWIjQ?nN5gVPnCh z(qfDXS$cyA8Kqe`8NjRMF0~@==cQ4#>AK*~xxyOCl@EyaC&b}TiF8xf?~>>LQ(pA@T)CdDB>@z;9>JA~K| zAjBqoUr8erNQ7u;D5PUXQG_CGsbMTz+e9cF*_4Mbn0N)L}Z+3Z9|R+2k_*ToMm*y0Zk9Es@aU&ZVgeK(mB9FdTY z&jXdhpbU-C)Z3)sD3Ysfun{>X84aBR8mgxm{bclWfNB31Ek|^jGPQ7^T9=fNPiQ=l z3~$L;C@gb2n3BZyBc8YI3IHIt@12ARq2FaAl8wmGxzN#7$%aX30X;^hJy?;@kQgQm zS`s8AozaCuyP~b9c5PvHEtS~Xh3;juvr|S{8@d;@ckPl ziPv`L>VYi<*+>s+d@dLlR+z#w<+xHL%988klHAMb^Tl{&g3BPwz;}(1?NOHHN0a5( zaeaIVnPr@}@tU+ny@q)Rbc75MO-F^j1oM-o&EmPs(V-0Ob95*J`(us{#TRi(CJm`s zlhlY189`($^&A3oWI{w*6B5r_4i04tl7mCph8%ft$PQ3nAtd^mf*EC#28WOm2e3#9 zjO9MKBf525W%^!#UOqdQ;tE5Ux{jKLo=HQ}#kGW_cnC#E2s!4= zTj6CpZ_QiP3bIdKNZre5$5OmfCtR2c$JOBpviWF&{5q)j@sp`S1U+@i*D-*$!rnq5 zC}1BtzQHD*P!-Eu4h&^jp94b~)E_gbmwbTMNL1);?Xr?0ZEK{WhC{``3B>d?)Psj2 zYU71X-x=A>X7{ua)TCjl7Khj0`!VaLdxzf0_>swyc^D&tO`IV^GJy)^$1KwbmhqFs zgOj6K%VX>_CVHu{?51q4^YojXbb79r2bi2}ASf?k)B306DH0jk`locrh>C1C*~UMO zWG?%sSr=#jH2bH=Y(vxl6D_qEOHIQW6OXhsL`G7K(~hM{UA7Rkt7ar0k&a_md=Dl&@kT4ITCG4F@ojB`bvpdIT+m+fLTnUkk>6Davn(i#4 zI|BqT;jCzLSvv7hQK6)3VUackzL$zRYl9D*yr{E}&z_~yZ^8j5Cdhjl@ht5Cjgpj- zMI{L)>F_tCBU{w%P!AUYgVTAssP_1-YHxcn?&h-FH4s9Cr5fP0gg9Lp!)vFFx&Z>7 zG|$*DlQ`Zf#;E5)C4-Paj;nyw0na$b^4W0NShjH4JYXsnB?|@^%Wn&X|>c3NRe-C(>kr3 zh8$8yBG*BVrBrfLl4;(-Y3<~*d#M6FZd)f$%xQJ+U$(5o07&1D&xK?zEzoz+QUN-y z(-BF|d}^p4#o2b1ab7(-48!N7)Ttz;a=mh{6nL(XeUH zIoCBGbv*Pn)8Yph^I%X78|D*Fc`#&N1ZCMwYhJWYJ>wycv20(meaZGE+n3Xgjq3P@ z1J1ZGVtlTd)sVD4&@*pDUUzm3=9NW0)q9UOu0%r3({4R|Zx(b5fdE z!@e?9I=TpkzBeFwN+`rcgCH;zpiq$LkV7q!mg+}xwM_&uWQpIaAJ;Nt9uZSHocJ-q ziSr8I)${VI!iT&mYr2@hjv0D2%D8xkDC0aw8FQ4e6G)i>y2TVnnB0#0NIb+)Dr?4w zWTcTI;3#9mj9KnQ`Wc4ZY<3$iE+k#2lJ2yonk0l#FLkHr=%O`E2Gfc$%9ghrl0qqt zZa_;)6RAQQn!-u&O5g`cyXuEwbGv>O_b55*P3~7Y1u%7cGes-j)VaAncdQ&CUWzU! z)pT^UHl*x@+I95uc6J6SNgBM&xK_T<8t<8O0Va(qI>RRv5H}rU=KXQkco2))dL}bA4<+Uuv0?fB=r-U{0UZ z)MxGAe^@R=SFN1`lL1NSq-V(^85O8VC@8c<2uYdZLn)yH0yD`vBZ+7y8`w;M8nI4$F$< z5$oBG9A$Jfy8WQ-F4T(7Fy)G;EH^?@#%SlrfJo4~py@(RYZ=Z@P2SSj&uPb6#VlxN z+X$9ExLh#A3@?N|H8nzX|3Sbf0`O~dOgojbC5%W}X$6r|4p5kZs_2ZQ4?t;^TAF)V z?GBQ9N0|g%tIWX#>_Hu(G)EUSqne_@0PXjtAZ3NlInv_XAcXWmfTi)epz;HugV1oP z6U%cyvz>Jjockd9O8CQ5&f;SxpkDM?qwAW_9kUb}1R5-uQj{HY6!_H4+cxkSj;D2r zJ=S>cw((dIL3wxxGgbCqPr-j(-h>A_yRg}XJvtZG4N%=6tTUR_yp^ERRyZKYx3)cr z-N@Fy7-K^Tf=>;S`Z?`%cew}G)?*x?2WvkZ=6@X|MVB%Y4hQWCz1XyHU+|WU0mS*B zsGOOG+$Y6I(ahzbeg;LqKv6#6E+e92L_~(iM~=X1Pq7q3hXp0g4>QRvjbSlNg7*by zMr*E23y73Y9yaRXv@5C1gmM($I#5L94-XNU_|j#x=ME@mbgYL$G9~bh zq;N}8NEFXqZh_AT=^d(>Gfv7l>7(JK_+o6yxD}M+3TghNKuIF{@F3gb2lToF96_Q% z`R}a#w+|ilvf7E1Bo`*sWjJBPNhR3Ko{&;>NvPJ$I7>rnnUzAN1WQCpZAe)pRRA#X zQjO6#OJ|}2Ft1Mz8idcSrZS@VLvH*!)zOQ&Xf)%dqr^?oMWdR!%7U_2o~P`H*A8{P z^GJ#tv@EV5%1#=Z9fZVFmyGuD*|E|w3t>tyXm1Yg3=E?Va(0l3uNd`=(+Sijb!$A* zG3}Y{5(=tB4(DGajxNPBw-rnZ1GC~$##WHYq1W_CXJ!QTfrnTB`YeyH&f}|(8B>`7 z#tbRK|H^hBofK)~Bz89;?WLtcmtX{FN-8tP`WGiW6h#96QdJqE-)0afyy+7^r* zPLKt{oU~0iBtgozv<%1~$=uT!!_pb<-%XOAa@sG-jwyZGl5E~7pz4O`u~*i*@wwzo zLekN1L`%yJEyckVC@@}8sp)xWzyX)K;eG&CxA7J%Q|?hNIuCL=G4~+HRdZbRD187w zz;H0`OhCMjYSeVv0bv3_%a)c`ntB=V#yQ#IZGhCLTE4(-XFG#4-uc#Pk^10{w=`}* z3^jNY^Y7Kq=7C6yjYwNQK#7I)Mj@~eObe0RuMMOm@D5J9OHKyld78EELnJo}>N z$aIZs+WYuqP0voPt$VcYX+isSHCp4^QLvSxU@Sk)%R3Z@@Ax6<^&4ciUaXPrNwxm; zqi(K8<*cDx<%SOX^!s(a9^rqq+x^nfr}a%WsW0nEyQtIrzHn={wFKSPU|lZO&kezU zSF`U`Q%}l=55n88;F&det3}v_=wq3Go80e0?R?Isf|U{{e6!$gVp{0RTkje#!s< literal 4485 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