From a6808b2add6df431f78ef6a5cd84af653a3cc700 Mon Sep 17 00:00:00 2001 From: Ryan Prather Date: Tue, 6 Nov 2018 15:42:59 -0500 Subject: [PATCH] Database_Baseline.zip - updated sagacity_routines.sql to support removing findings.id field database.inc - uncomment code block in post_Processing --- Database_Baseline.zip | Bin 1192408 -> 1192414 bytes inc/database.inc | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Database_Baseline.zip b/Database_Baseline.zip index 59a6c07e6483b3b70343e875b96434fa7ac192bf..575cd5f5631d8bd83d7148938f73099052a3e404 100644 GIT binary patch delta 2342 zcmV+>3EB48<4E4)NPvU^gaU*Egam{Iga(8Mgb0KQgbIWUgbaiYgbsucgb;)gv=UYV zf8tqYO{Cm#=6?tP0QNQj02KfL0CQnyVPk1@d0%pGb#!TNWpgfbacu1yS&x%I_}NYN zKg@$k+oT%TJ6^H2tfE~|XuVzlDXl~bwb0d#@xS}c4Gge!-FhyG?i}AWGv75colP2` z)LVFdn4R3;-@9@J9i7;(#%Q)#uF%1?f2#*K5E_MPwhlj_TUYN~J-E|H^JIY+wzB6U}m<$r+Ay&6qrV{J5(5el41%f7#RV z#HM&^djZiLj|UUoG@xV{+7K53ud11$8G|FuMw@JYH&173=&z<4$e|5iV8(@d9~HZ= z z0){!!umHRae0hp)uabGGC(C zy7mU?he&&?+Y>tv2DFEkHkfE=Fn(%U`sCTs!>KXS4s}Bt0X8XE58W@p2lui2?IURI zcNYtXY;8CN_;-lG?C)VNdD>`T@9$x??%LWIRue&ueeP{0O!HRuVj0o&Dh{Je6;bc|9!t`~!96t7zfr}nI;ym<$F>nmr z*drM7D`1rRRAjd0t--*WV(z3MB56?JmYz?*NI~uPBQH(EdFXo? zWCsMY)K)+eoaLBtwc3cgcuZC1%4K#*f!V4${|`yGv{sc65rH^{A{EliX>bbLX*$*^ zm;h%U#xsZmEy8IIe|lF@HP1pSyQ=H{$4^4nNsVZx3g9QP1R*sQC_7mN5(w86jYzX_ z!3}{_lql|l#{vAn|KtD{2(2_ZK&7?<(lMYMFH=q!mle9R5VQXX!NSSHETV$u8w%jr zA`{a>YJ#2wUm(BHLj7#*C2T4triD7F(`yxKnRuKyOe64X8+VCh*+Rt4xvY}dN&xT* z2mo2_6{kmzfA1`FGy)%^8vw`ZFkRd(`>1oJ(?_y}FhAEh%*&2zZKn?)bF)KyfHFUl zc1<40KI$e&h^KBzfUq#Yl7Ku|=ChE1OII-#lLQw{5-aEU(rrA1cCHomK?x61 zisD2`@@cbj$qX=(Y%&B)QL+Zg!udmy(E>$nnCQx!e{fz7TjLkkbMP!f|< z=VhwN(oj(h-Zdj>BC<%L*(^*y0i9z`=lBeC$fCjN3!IF&q{fIbA6rXGm@9hnE+2XO zrP$angcpiuS|iN@JO%Vn*T$o6J_45=_0o$sUeqZ!hu-m0X6@CJogw;PWJssa(SM&I zDGAc=&r95S+aTOB^O~QYcwOWvYM#<`)QL}WNtV&-yp!kAtxr0uvhvo>CG$_sQhC~S z=1l88Nm{hAexy&J`|@Rxmegb*hf{;xNg?+sf4&a`NXTB^Ir_-$_K>Abrj}tNI9cr; z9Ds~Zw5PhUzen5AV_3Cdk*rUEGceYS5#}ek|D-UJfdzkBib7YWMvyI&K^)tOQYM=? zJ3ST5gYV)@SmDu>24?k_OT|1#$#G84aE9j8kfEt;k_1V}Sm)bwUhxcj-n{jw{`+Tx ze*$+0Z5;B??N@7pK&@L7i$jr0rrK592WPOQ;*$l~O7{uI?$w{Lxv+r$-2y0rj1A|d z`)t~ArAg%rfIHCi9QB5aKQcga-PdsS=X-fw$92A|Jr_$!zhDu*I53&w7Y0eHP>7P; zEu5$o!PI?e%l#5eSNe(Ox^k!7HjNXQf31_Z0<)Y2dYdd^9degLTDQ7G_(Mhmhj7YZ zaO2-NmKp3Rl);eJzi~A46;1*VlmV4GDx;1XbkrSTGS9wv>%hgv&D=WSo3J06Fr#nW zR0ib0hNr2+g%5`J-6cT6eu`KQk&e`%#D zSCT10@i?<7Tl$yNrIKjXi4tL5edPEnuD8x>AA1=mjfY`LpVS>3(;1uF5DYUsc%h9;c9yZB0IE80A_ep2f ztDc%?K@6ev(nvl&DuPu$q^f;lC6UzUQWUG{B~{gHDT>wbj!Hf&Dn349aRZI;YYa9& zS+1fW3ugO!KLEG*3KEbc4dPj5O{Cm#=6?tP0QQ%aFA_Eu0*Zg%>vhxt<_`KP4R+K4 z0*Zg%>vfmmFA^*P{+A9g5@rEQmvt}_K>=%*w=fb$0bG~D1ONa4 delta 2337 zcmV++3EuYJ<4D-!NPvU^gaU*Egam{Iga(8Mgb0KQgbIWUgbaiYgbsucgb;)gv=UYV z6V|3uO#s3`ka-9I0JJs$02KfLm#;4p7JuyhK|nc zS7S6=FP3QU#`V2h2#vxtTZJFco$L3m@7?R8d9p%p!ualO)ctb*u5|6U3-J{1Ejsx?SF}#2Lswe zOB+lyG#DS6mOgoQv_CaQ+JSCpBfusFYv27Gd~lz*Uq6D@esi&K$kv8afPaS=%#nVhVKoud*yk>nY2;pa!#H!o8HPl>+%G}_5C^F2#H>g+DOCZik}M$* ztk_q@h`?@xIE;@eoUBS%n18-*m&3>2B5={8$DD^gFb0l+8+!ypeg%wDpNdSlOHh^Z z2QQ9;m0&Ges`<)pwO8U&wyaV+;v@@TMRgk)CRpQiJT7xALRNJ0KFW`kDcFH!9!UgX ziuK1K%jKlt!9pKEDG>=a)($4Fz0|~^()PyGcD#Q@t2zY8Nd>m>k9gqA5#)x7^B}~~ur(px{0#@N< z-U=+7FmLiP3h)*@O^HK;zag-~laLy5H3~p_27edaC9!G^Xb40EU|2^nIQ1eY%{=a< zWW5eJh$&H7lYm4d=6_BKB9aCbZsGX^j1<&vKl0KvoQJ-bL3ThOOKk-t!C8(OSF4S< zi^o)Du3To96qv25^S@8JrM0SrhzP_n6seGAPJ>g}Ow+MW!2~$-FrGmiXc10x(A$ct zc@|RHRbBT#o(NqhHKLg+fS<$?gw#}^>}(lGAY4;4BF(~MZhr`*qC{~YJPzOo{)q!z zAhgot0F~MbNT+~ux=1-;Tvq7LLd^an1Pdn%vxo|sZzzCg$C;QGQWNwf08?-YLTV}y zUJ6EumsQCq0I8J$=9C8QXKRYrw+JL6rVN-08%YNjO5t0#ais1NN?dcW^U2m^GRq;n zVkZQKP&F=yPD%$YAKj$Vp?o+%iC3(*aLV|ADfZgzdt zxz_0;*+SOrLZ>J%JFc~z9V`;pYqU>HoHfY#k+f^lJb(64FF+zV^*RECd3hG&^I)0J zJU%X6$5>1fTofL^nvhG3nBg;frpSaCG5h+Mg9j-^aiSzSSub5O1B@h_3;|P=tbwxd z?NDU2Ko1)xx-#XP(;+YfIlkVH*m5(579LNbBqpcMiByxNk)RlxYev#U3=!skVS*T6*%~CNsSR>F0_`EFjw^ST|Th(OQEk{h#nNrv__f*cnau&u8l|C ze1I+c;e{8ky{J=e4!zTb(zr~b&_7d}KLoM=apA2_I-BM_$!hu0i#JGpD8jb0AIjx2 z0s0#fpx>E#v`fCqdDZ6GnVNi^Bl=$^K$i)Sl7IjF{JG31=fmI8Rlhqk;2F98( z!hifE_n#DIGO*xJOHt^`)CjU+u7^W6QOaZ;XFtyL^5EMz(N%afWqDcs)le~wQBs&6 zCon^EYRJ%3Hc5gcWUTY;Ij?w*Ep6U& zX6xjwz$|Bh-a1QIhur0m){Sle{*ckY8JjW~-1s++Wd?f+WiX`mZye2hiIc!RWq&}W zj>@Q`1|4-rn9Q@!-YRghaWl70_$KUUBFyL;HA8rj=eFrd4rQzP zNsiC&O;C!bbZG!TafIJX)}2C1eg5gAM_Oshm1K%gJgscXmj2~*sU%uWq9ju(3M}XG zSKMA*)IJ3Dr7}XLn(<~io7fg?>`xR3*01pkgw>^MxO5HwiEG$sgSG{y0E2I`e*&-t zQwOSwRc~_lrrei;VI0ETHC}zbKC%Uf{Asehfx|1Yr`WE}4YnTXCPykF3e0BgTbD%& z5-xwOqu^q1PB~FrYC9VM**F{aaPZQx)}>4N7zeu`P1jQ04O-Plb>X1m9_f5{Ux3)O z&tZbOP~a5e4Jov_Im^*_$etz17c_-OHV;W>)tj7}M?DOo^iD`V9V&uVK7*=#ASIF1 z$4(Th=^a$nTPKRu@Cr&k3MxJwVsQhF@LLQtKUplJAPZ)@JKq7f{t6P1Bn{T4QcVED zK#+L|006X?n=cYJ7L_~help->execute(); -# Commented out 3 Nov 18 to fix #62 - Jeff Odegard -# $this->help->sql = "INSERT IGNORE INTO findings (tgt_id,pdi_id,findings_status_id) " . -# "SELECT {$id},pcl.pdi_id,1 " . -# "FROM target_checklist tc " . -# "JOIN pdi_checklist_lookup pcl ON pcl.checklist_id = tc.chk_id " . -# "WHERE tc.tgt_id = {$id}"; -# $this->help->execute(); + $this->help->query_type = db_helper::INSERT; + $this->help->sql = "INSERT IGNORE INTO findings (tgt_id,pdi_id,findings_status_id) " . + "SELECT {$id},pcl.pdi_id,1 " . + "FROM target_checklist tc " . + "JOIN pdi_checklist_lookup pcl ON pcl.checklist_id = tc.chk_id " . + "WHERE tc.tgt_id = {$id}"; + $this->help->execute(); $this->update_Target_Counts($id); }