diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar index 0410b9e37b8fedf3956c870e2faf7aa9e8ab89b6..77b988f95baa69b04c7fa4fa6f9737335eef2711 100644 Binary files a/dbrepo-auth-service/listeners/target/create-event-listener.jar and b/dbrepo-auth-service/listeners/target/create-event-listener.jar differ diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index 0410b9e37b8fedf3956c870e2faf7aa9e8ab89b6..77b988f95baa69b04c7fa4fa6f9737335eef2711 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ diff --git a/lib/python/coverage.xml b/lib/python/coverage.xml index ac21b0bc1ed6b9f659ba578333c89e481c34ca8f..b23a031c5fe13102ab04331b3ef60329ee9353c0 100644 --- a/lib/python/coverage.xml +++ b/lib/python/coverage.xml @@ -1,41 +1,41 @@ <?xml version="1.0" ?> -<coverage version="7.6.10" timestamp="1740478405603" lines-valid="1820" lines-covered="1743" line-rate="0.9577" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0"> +<coverage version="7.6.10" timestamp="1741253336897" lines-valid="1941" lines-covered="1818" line-rate="0.9366" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0"> <!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.6.10 --> <!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd --> <sources> <source>/home/mweise/Projects/fda-services/lib/python</source> </sources> <packages> - <package name="dbrepo" line-rate="0.9134" branch-rate="0" complexity="0"> + <package name="dbrepo" line-rate="0.9102" branch-rate="0" complexity="0"> <classes> - <class name="RestClient.py" filename="dbrepo/RestClient.py" complexity="0" line-rate="0.9248" branch-rate="0"> + <class name="RestClient.py" filename="dbrepo/RestClient.py" complexity="0" line-rate="0.9102" branch-rate="0"> <methods/> <lines> <line number="1" hits="1"/> <line number="2" hits="1"/> <line number="3" hits="1"/> - <line number="5" hits="1"/> + <line number="4" hits="1"/> <line number="6" hits="1"/> <line number="7" hits="1"/> - <line number="9" hits="1"/> + <line number="8" hits="1"/> <line number="10" hits="1"/> <line number="11" hits="1"/> - <line number="15" hits="1"/> - <line number="19" hits="1"/> - <line number="31" hits="1"/> + <line number="14" hits="1"/> + <line number="16" hits="1"/> + <line number="20" hits="1"/> <line number="32" hits="1"/> <line number="33" hits="1"/> <line number="34" hits="1"/> - <line number="36" hits="1"/> - <line number="41" hits="1"/> + <line number="35" hits="1"/> + <line number="37" hits="1"/> <line number="42" hits="1"/> <line number="43" hits="1"/> <line number="44" hits="1"/> <line number="45" hits="1"/> - <line number="47" hits="1"/> + <line number="46" hits="1"/> <line number="48" hits="1"/> - <line number="51" hits="1"/> - <line number="53" hits="1"/> + <line number="49" hits="1"/> + <line number="52" hits="1"/> <line number="54" hits="1"/> <line number="55" hits="1"/> <line number="56" hits="1"/> @@ -46,7 +46,7 @@ <line number="61" hits="1"/> <line number="62" hits="1"/> <line number="63" hits="1"/> - <line number="64" hits="1"/> + <line number="65" hits="1"/> <line number="66" hits="1"/> <line number="67" hits="1"/> <line number="68" hits="1"/> @@ -58,28 +58,28 @@ <line number="74" hits="1"/> <line number="75" hits="1"/> <line number="76" hits="1"/> - <line number="77" hits="1"/> - <line number="80" hits="1"/> + <line number="79" hits="1"/> + <line number="85" hits="1"/> <line number="86" hits="1"/> <line number="87" hits="1"/> <line number="88" hits="1"/> <line number="89" hits="1"/> - <line number="90" hits="1"/> - <line number="92" hits="1"/> + <line number="91" hits="1"/> + <line number="99" hits="1"/> <line number="100" hits="1"/> <line number="101" hits="1"/> <line number="102" hits="1"/> <line number="103" hits="1"/> <line number="104" hits="1"/> - <line number="105" hits="1"/> - <line number="108" hits="1"/> + <line number="107" hits="1"/> + <line number="115" hits="1"/> <line number="116" hits="1"/> <line number="117" hits="1"/> <line number="118" hits="1"/> <line number="119" hits="1"/> <line number="120" hits="1"/> - <line number="121" hits="1"/> - <line number="124" hits="1"/> + <line number="123" hits="1"/> + <line number="133" hits="1"/> <line number="134" hits="1"/> <line number="135" hits="1"/> <line number="136" hits="1"/> @@ -89,10 +89,10 @@ <line number="140" hits="1"/> <line number="141" hits="1"/> <line number="142" hits="1"/> - <line number="143" hits="1"/> - <line number="146" hits="1"/> + <line number="145" hits="1"/> + <line number="165" hits="1"/> <line number="166" hits="1"/> - <line number="167" hits="1"/> + <line number="169" hits="1"/> <line number="170" hits="1"/> <line number="171" hits="1"/> <line number="172" hits="1"/> @@ -102,15 +102,15 @@ <line number="176" hits="1"/> <line number="177" hits="1"/> <line number="178" hits="1"/> - <line number="179" hits="1"/> - <line number="182" hits="1"/> + <line number="181" hits="1"/> + <line number="189" hits="1"/> <line number="190" hits="1"/> <line number="191" hits="1"/> <line number="192" hits="1"/> <line number="193" hits="1"/> <line number="194" hits="1"/> - <line number="195" hits="1"/> - <line number="198" hits="1"/> + <line number="197" hits="1"/> + <line number="206" hits="1"/> <line number="207" hits="1"/> <line number="208" hits="1"/> <line number="209" hits="1"/> @@ -118,21 +118,21 @@ <line number="211" hits="1"/> <line number="212" hits="1"/> <line number="213" hits="1"/> - <line number="214" hits="1"/> - <line number="217" hits="1"/> + <line number="216" hits="1"/> + <line number="224" hits="1"/> <line number="225" hits="1"/> <line number="226" hits="1"/> <line number="227" hits="1"/> <line number="228" hits="1"/> <line number="229" hits="1"/> - <line number="230" hits="1"/> - <line number="233" hits="1"/> + <line number="232" hits="1"/> + <line number="239" hits="1"/> <line number="240" hits="1"/> <line number="241" hits="1"/> <line number="242" hits="1"/> <line number="243" hits="1"/> - <line number="244" hits="1"/> - <line number="247" hits="1"/> + <line number="246" hits="1"/> + <line number="257" hits="1"/> <line number="258" hits="1"/> <line number="259" hits="1"/> <line number="260" hits="1"/> @@ -142,10 +142,10 @@ <line number="264" hits="1"/> <line number="265" hits="1"/> <line number="266" hits="1"/> - <line number="267" hits="1"/> - <line number="270" hits="1"/> + <line number="269" hits="1"/> + <line number="289" hits="1"/> <line number="290" hits="1"/> - <line number="291" hits="1"/> + <line number="293" hits="1"/> <line number="294" hits="1"/> <line number="295" hits="1"/> <line number="296" hits="1"/> @@ -161,10 +161,10 @@ <line number="306" hits="1"/> <line number="307" hits="1"/> <line number="308" hits="1"/> - <line number="309" hits="1"/> - <line number="312" hits="1"/> + <line number="311" hits="1"/> + <line number="335" hits="1"/> <line number="336" hits="1"/> - <line number="337" hits="1"/> + <line number="341" hits="1"/> <line number="342" hits="1"/> <line number="343" hits="1"/> <line number="344" hits="1"/> @@ -176,10 +176,10 @@ <line number="350" hits="1"/> <line number="351" hits="1"/> <line number="352" hits="1"/> - <line number="353" hits="1"/> - <line number="356" hits="1"/> + <line number="355" hits="1"/> + <line number="372" hits="1"/> <line number="373" hits="1"/> - <line number="374" hits="1"/> + <line number="375" hits="1"/> <line number="376" hits="1"/> <line number="377" hits="1"/> <line number="378" hits="1"/> @@ -190,11 +190,11 @@ <line number="383" hits="1"/> <line number="384" hits="1"/> <line number="385" hits="1"/> - <line number="386" hits="1"/> + <line number="387" hits="1"/> <line number="388" hits="1"/> <line number="389" hits="1"/> - <line number="390" hits="1"/> - <line number="393" hits="1"/> + <line number="392" hits="1"/> + <line number="408" hits="1"/> <line number="409" hits="1"/> <line number="410" hits="1"/> <line number="411" hits="1"/> @@ -207,11 +207,11 @@ <line number="418" hits="1"/> <line number="419" hits="1"/> <line number="420" hits="1"/> - <line number="421" hits="1"/> + <line number="422" hits="1"/> <line number="423" hits="1"/> - <line number="424" hits="1"/> - <line number="426" hits="1"/> - <line number="429" hits="1"/> + <line number="425" hits="1"/> + <line number="428" hits="1"/> + <line number="443" hits="1"/> <line number="444" hits="1"/> <line number="445" hits="1"/> <line number="446" hits="1"/> @@ -228,19 +228,18 @@ <line number="457" hits="1"/> <line number="458" hits="1"/> <line number="459" hits="1"/> - <line number="460" hits="1"/> + <line number="461" hits="1"/> <line number="462" hits="1"/> <line number="463" hits="1"/> - <line number="464" hits="1"/> - <line number="467" hits="1"/> + <line number="466" hits="1"/> + <line number="489" hits="1"/> + <line number="490" hits="1"/> <line number="491" hits="1"/> - <line number="492" hits="1"/> + <line number="494" hits="1"/> <line number="495" hits="1"/> <line number="496" hits="1"/> <line number="497" hits="1"/> - <line number="498" hits="1"/> - <line number="499" hits="1"/> - <line number="500" hits="1"/> + <line number="498" hits="0"/> <line number="501" hits="1"/> <line number="502" hits="1"/> <line number="503" hits="1"/> @@ -251,33 +250,33 @@ <line number="508" hits="1"/> <line number="509" hits="1"/> <line number="510" hits="1"/> + <line number="511" hits="1"/> + <line number="512" hits="1"/> <line number="513" hits="1"/> - <line number="525" hits="1"/> - <line number="526" hits="1"/> - <line number="527" hits="1"/> - <line number="528" hits="1"/> + <line number="514" hits="1"/> + <line number="517" hits="1"/> <line number="529" hits="1"/> <line number="530" hits="1"/> <line number="531" hits="1"/> <line number="532" hits="1"/> <line number="533" hits="1"/> <line number="534" hits="1"/> + <line number="535" hits="1"/> + <line number="536" hits="1"/> <line number="537" hits="1"/> - <line number="550" hits="1"/> - <line number="551" hits="1"/> - <line number="552" hits="1"/> - <line number="553" hits="1"/> + <line number="538" hits="1"/> + <line number="541" hits="1"/> <line number="554" hits="1"/> <line number="555" hits="1"/> <line number="556" hits="1"/> <line number="557" hits="1"/> <line number="558" hits="1"/> <line number="559" hits="1"/> + <line number="560" hits="1"/> + <line number="561" hits="1"/> <line number="562" hits="1"/> - <line number="576" hits="1"/> - <line number="577" hits="1"/> - <line number="578" hits="1"/> - <line number="579" hits="1"/> + <line number="563" hits="1"/> + <line number="566" hits="1"/> <line number="580" hits="1"/> <line number="581" hits="1"/> <line number="582" hits="1"/> @@ -289,11 +288,11 @@ <line number="588" hits="1"/> <line number="589" hits="1"/> <line number="590" hits="1"/> + <line number="591" hits="1"/> + <line number="592" hits="1"/> <line number="593" hits="1"/> - <line number="606" hits="1"/> - <line number="607" hits="1"/> - <line number="608" hits="1"/> - <line number="609" hits="1"/> + <line number="594" hits="1"/> + <line number="597" hits="1"/> <line number="610" hits="1"/> <line number="611" hits="1"/> <line number="612" hits="1"/> @@ -301,11 +300,11 @@ <line number="614" hits="1"/> <line number="615" hits="1"/> <line number="616" hits="1"/> + <line number="617" hits="1"/> + <line number="618" hits="1"/> <line number="619" hits="1"/> - <line number="633" hits="1"/> - <line number="634" hits="1"/> - <line number="635" hits="1"/> - <line number="636" hits="1"/> + <line number="620" hits="1"/> + <line number="623" hits="1"/> <line number="637" hits="1"/> <line number="638" hits="1"/> <line number="639" hits="1"/> @@ -316,47 +315,46 @@ <line number="644" hits="1"/> <line number="645" hits="1"/> <line number="646" hits="1"/> + <line number="647" hits="1"/> + <line number="648" hits="1"/> <line number="649" hits="1"/> - <line number="660" hits="1"/> - <line number="661" hits="1"/> - <line number="662" hits="1"/> - <line number="663" hits="1"/> + <line number="650" hits="1"/> + <line number="653" hits="1"/> <line number="664" hits="1"/> <line number="665" hits="1"/> <line number="666" hits="1"/> <line number="667" hits="1"/> + <line number="668" hits="1"/> + <line number="669" hits="1"/> <line number="670" hits="1"/> - <line number="683" hits="1"/> - <line number="684" hits="1"/> - <line number="685" hits="1"/> - <line number="686" hits="1"/> + <line number="671" hits="1"/> + <line number="674" hits="1"/> <line number="687" hits="1"/> <line number="688" hits="1"/> <line number="689" hits="1"/> <line number="690" hits="1"/> <line number="691" hits="1"/> <line number="692" hits="1"/> + <line number="693" hits="1"/> + <line number="694" hits="1"/> <line number="695" hits="1"/> - <line number="710" hits="1"/> - <line number="711" hits="1"/> - <line number="713" hits="1"/> + <line number="696" hits="1"/> + <line number="699" hits="1"/> <line number="714" hits="1"/> <line number="715" hits="1"/> - <line number="716" hits="1"/> <line number="717" hits="1"/> <line number="718" hits="1"/> <line number="719" hits="1"/> <line number="720" hits="1"/> + <line number="721" hits="1"/> + <line number="722" hits="1"/> <line number="723" hits="1"/> - <line number="743" hits="1"/> - <line number="744" hits="1"/> - <line number="747" hits="1"/> + <line number="724" hits="1"/> + <line number="727" hits="1"/> <line number="748" hits="1"/> <line number="749" hits="1"/> <line number="750" hits="1"/> <line number="751" hits="1"/> - <line number="752" hits="1"/> - <line number="753" hits="1"/> <line number="754" hits="1"/> <line number="755" hits="1"/> <line number="756" hits="1"/> @@ -366,14 +364,14 @@ <line number="760" hits="1"/> <line number="761" hits="1"/> <line number="762" hits="1"/> + <line number="763" hits="1"/> + <line number="764" hits="1"/> <line number="765" hits="1"/> - <line number="780" hits="1"/> - <line number="781" hits="1"/> - <line number="782" hits="1"/> - <line number="783" hits="1"/> - <line number="784" hits="1"/> - <line number="785" hits="1"/> - <line number="786" hits="1"/> + <line number="766" hits="1"/> + <line number="767" hits="1"/> + <line number="768" hits="1"/> + <line number="769" hits="1"/> + <line number="772" hits="1"/> <line number="787" hits="1"/> <line number="788" hits="1"/> <line number="789" hits="1"/> @@ -384,14 +382,14 @@ <line number="794" hits="1"/> <line number="795" hits="1"/> <line number="796" hits="1"/> + <line number="797" hits="1"/> + <line number="798" hits="1"/> <line number="799" hits="1"/> - <line number="817" hits="1"/> - <line number="818" hits="1"/> - <line number="819" hits="1"/> - <line number="820" hits="1"/> - <line number="821" hits="1"/> - <line number="822" hits="1"/> - <line number="823" hits="1"/> + <line number="800" hits="1"/> + <line number="801" hits="1"/> + <line number="802" hits="1"/> + <line number="803" hits="1"/> + <line number="806" hits="1"/> <line number="824" hits="1"/> <line number="825" hits="1"/> <line number="826" hits="1"/> @@ -403,15 +401,15 @@ <line number="832" hits="1"/> <line number="833" hits="1"/> <line number="834" hits="1"/> + <line number="835" hits="1"/> <line number="836" hits="1"/> + <line number="837" hits="1"/> + <line number="838" hits="1"/> <line number="839" hits="1"/> - <line number="858" hits="1"/> - <line number="859" hits="1"/> - <line number="860" hits="1"/> - <line number="861" hits="1"/> - <line number="862" hits="1"/> - <line number="863" hits="1"/> - <line number="864" hits="1"/> + <line number="840" hits="1"/> + <line number="841" hits="1"/> + <line number="843" hits="1"/> + <line number="846" hits="1"/> <line number="865" hits="1"/> <line number="866" hits="1"/> <line number="867" hits="1"/> @@ -423,144 +421,145 @@ <line number="873" hits="1"/> <line number="874" hits="1"/> <line number="875" hits="1"/> + <line number="876" hits="1"/> <line number="877" hits="1"/> + <line number="878" hits="1"/> + <line number="879" hits="1"/> <line number="880" hits="1"/> - <line number="894" hits="1"/> - <line number="895" hits="1"/> - <line number="896" hits="1"/> - <line number="897" hits="1"/> - <line number="898" hits="1"/> - <line number="899" hits="1"/> - <line number="900" hits="1"/> + <line number="881" hits="1"/> + <line number="882" hits="1"/> + <line number="884" hits="1"/> + <line number="887" hits="1"/> <line number="901" hits="1"/> <line number="902" hits="1"/> <line number="903" hits="1"/> <line number="904" hits="1"/> <line number="905" hits="1"/> + <line number="906" hits="1"/> <line number="907" hits="1"/> + <line number="908" hits="1"/> + <line number="909" hits="1"/> <line number="910" hits="1"/> - <line number="926" hits="0"/> + <line number="911" hits="1"/> + <line number="912" hits="1"/> + <line number="914" hits="1"/> + <line number="917" hits="1"/> <line number="927" hits="0"/> <line number="928" hits="0"/> <line number="929" hits="0"/> + <line number="930" hits="0"/> <line number="932" hits="0"/> <line number="933" hits="0"/> <line number="934" hits="0"/> <line number="935" hits="0"/> - <line number="936" hits="0"/> - <line number="937" hits="0"/> - <line number="938" hits="0"/> - <line number="939" hits="0"/> - <line number="940" hits="0"/> - <line number="941" hits="0"/> - <line number="943" hits="0"/> - <line number="946" hits="1"/> + <line number="938" hits="1"/> + <line number="955" hits="0"/> + <line number="956" hits="0"/> + <line number="959" hits="0"/> <line number="960" hits="0"/> <line number="961" hits="0"/> <line number="962" hits="0"/> + <line number="963" hits="0"/> + <line number="964" hits="0"/> + <line number="965" hits="0"/> + <line number="966" hits="0"/> + <line number="967" hits="0"/> <line number="968" hits="0"/> - <line number="969" hits="0"/> <line number="970" hits="0"/> - <line number="971" hits="0"/> - <line number="972" hits="0"/> - <line number="973" hits="0"/> - <line number="974" hits="0"/> - <line number="975" hits="0"/> - <line number="976" hits="0"/> - <line number="977" hits="0"/> - <line number="980" hits="1"/> - <line number="992" hits="0"/> + <line number="973" hits="1"/> + <line number="987" hits="0"/> <line number="993" hits="0"/> <line number="994" hits="0"/> + <line number="995" hits="0"/> + <line number="996" hits="0"/> + <line number="997" hits="0"/> <line number="998" hits="0"/> <line number="999" hits="0"/> <line number="1000" hits="0"/> <line number="1001" hits="0"/> <line number="1002" hits="0"/> - <line number="1003" hits="0"/> - <line number="1004" hits="0"/> - <line number="1005" hits="0"/> - <line number="1006" hits="0"/> - <line number="1007" hits="0"/> - <line number="1010" hits="1"/> - <line number="1025" hits="1"/> - <line number="1026" hits="1"/> - <line number="1027" hits="1"/> - <line number="1028" hits="1"/> - <line number="1029" hits="1"/> - <line number="1030" hits="1"/> - <line number="1031" hits="1"/> - <line number="1032" hits="1"/> + <line number="1005" hits="1"/> + <line number="1017" hits="0"/> + <line number="1021" hits="0"/> + <line number="1022" hits="0"/> + <line number="1023" hits="0"/> + <line number="1024" hits="0"/> + <line number="1025" hits="0"/> + <line number="1026" hits="0"/> + <line number="1027" hits="0"/> + <line number="1028" hits="0"/> + <line number="1029" hits="0"/> + <line number="1030" hits="0"/> <line number="1033" hits="1"/> - <line number="1034" hits="1"/> - <line number="1035" hits="1"/> - <line number="1037" hits="1"/> - <line number="1038" hits="1"/> - <line number="1039" hits="1"/> - <line number="1042" hits="1"/> + <line number="1048" hits="1"/> + <line number="1049" hits="1"/> + <line number="1050" hits="1"/> + <line number="1051" hits="1"/> + <line number="1052" hits="1"/> + <line number="1053" hits="1"/> + <line number="1054" hits="1"/> + <line number="1055" hits="1"/> + <line number="1056" hits="1"/> <line number="1057" hits="1"/> <line number="1058" hits="1"/> - <line number="1059" hits="1"/> <line number="1060" hits="1"/> <line number="1061" hits="1"/> <line number="1062" hits="1"/> - <line number="1063" hits="1"/> - <line number="1064" hits="1"/> <line number="1065" hits="1"/> - <line number="1066" hits="1"/> - <line number="1067" hits="1"/> - <line number="1068" hits="1"/> - <line number="1070" hits="1"/> - <line number="1073" hits="1"/> + <line number="1080" hits="1"/> + <line number="1081" hits="1"/> + <line number="1082" hits="1"/> + <line number="1083" hits="1"/> + <line number="1084" hits="1"/> + <line number="1085" hits="1"/> + <line number="1086" hits="1"/> <line number="1087" hits="1"/> <line number="1088" hits="1"/> <line number="1089" hits="1"/> <line number="1090" hits="1"/> <line number="1091" hits="1"/> - <line number="1092" hits="1"/> <line number="1093" hits="1"/> - <line number="1094" hits="1"/> - <line number="1095" hits="1"/> <line number="1096" hits="1"/> - <line number="1097" hits="1"/> - <line number="1098" hits="1"/> - <line number="1100" hits="1"/> - <line number="1103" hits="1"/> + <line number="1110" hits="1"/> + <line number="1111" hits="1"/> + <line number="1112" hits="1"/> + <line number="1113" hits="1"/> + <line number="1114" hits="1"/> + <line number="1115" hits="1"/> + <line number="1116" hits="1"/> + <line number="1117" hits="1"/> + <line number="1118" hits="1"/> + <line number="1119" hits="1"/> <line number="1120" hits="1"/> <line number="1121" hits="1"/> - <line number="1122" hits="1"/> <line number="1123" hits="1"/> - <line number="1124" hits="1"/> - <line number="1125" hits="1"/> <line number="1126" hits="1"/> - <line number="1127" hits="1"/> - <line number="1128" hits="1"/> - <line number="1129" hits="1"/> - <line number="1130" hits="1"/> - <line number="1131" hits="1"/> - <line number="1132" hits="1"/> - <line number="1133" hits="1"/> - <line number="1134" hits="1"/> - <line number="1135" hits="1"/> - <line number="1136" hits="1"/> - <line number="1138" hits="1"/> - <line number="1141" hits="1"/> + <line number="1143" hits="1"/> + <line number="1144" hits="1"/> + <line number="1145" hits="1"/> + <line number="1146" hits="1"/> + <line number="1147" hits="1"/> + <line number="1148" hits="1"/> + <line number="1149" hits="1"/> + <line number="1150" hits="1"/> + <line number="1151" hits="1"/> + <line number="1152" hits="1"/> + <line number="1153" hits="1"/> + <line number="1154" hits="1"/> + <line number="1155" hits="1"/> + <line number="1156" hits="1"/> <line number="1157" hits="1"/> <line number="1158" hits="1"/> <line number="1159" hits="1"/> - <line number="1160" hits="1"/> <line number="1161" hits="1"/> - <line number="1162" hits="1"/> - <line number="1163" hits="1"/> <line number="1164" hits="1"/> - <line number="1165" hits="1"/> - <line number="1166" hits="1"/> - <line number="1167" hits="1"/> - <line number="1168" hits="1"/> - <line number="1169" hits="1"/> - <line number="1170" hits="1"/> - <line number="1172" hits="1"/> - <line number="1175" hits="1"/> + <line number="1180" hits="1"/> + <line number="1181" hits="1"/> + <line number="1182" hits="1"/> + <line number="1183" hits="1"/> + <line number="1184" hits="1"/> + <line number="1185" hits="1"/> + <line number="1186" hits="1"/> <line number="1187" hits="1"/> <line number="1188" hits="1"/> <line number="1189" hits="1"/> @@ -568,102 +567,104 @@ <line number="1191" hits="1"/> <line number="1192" hits="1"/> <line number="1193" hits="1"/> - <line number="1194" hits="1"/> <line number="1195" hits="1"/> - <line number="1196" hits="1"/> - <line number="1199" hits="1"/> + <line number="1198" hits="1"/> + <line number="1210" hits="1"/> + <line number="1211" hits="1"/> + <line number="1212" hits="1"/> + <line number="1213" hits="1"/> + <line number="1214" hits="1"/> + <line number="1215" hits="1"/> <line number="1216" hits="1"/> <line number="1217" hits="1"/> <line number="1218" hits="1"/> <line number="1219" hits="1"/> - <line number="1220" hits="1"/> - <line number="1221" hits="1"/> <line number="1222" hits="1"/> - <line number="1223" hits="1"/> - <line number="1224" hits="1"/> - <line number="1225" hits="1"/> - <line number="1226" hits="1"/> - <line number="1227" hits="1"/> - <line number="1228" hits="1"/> - <line number="1230" hits="1"/> - <line number="1231" hits="1"/> - <line number="1232" hits="1"/> - <line number="1235" hits="1"/> - <line number="1252" hits="1"/> + <line number="1239" hits="1"/> + <line number="1240" hits="1"/> + <line number="1241" hits="1"/> + <line number="1242" hits="1"/> + <line number="1243" hits="1"/> + <line number="1244" hits="1"/> + <line number="1245" hits="1"/> + <line number="1246" hits="1"/> + <line number="1247" hits="1"/> + <line number="1248" hits="1"/> + <line number="1249" hits="1"/> + <line number="1250" hits="1"/> + <line number="1251" hits="1"/> <line number="1253" hits="1"/> <line number="1254" hits="1"/> <line number="1255" hits="1"/> - <line number="1256" hits="1"/> - <line number="1257" hits="1"/> <line number="1258" hits="1"/> - <line number="1259" hits="1"/> - <line number="1260" hits="1"/> - <line number="1261" hits="1"/> - <line number="1262" hits="1"/> - <line number="1263" hits="1"/> - <line number="1264" hits="1"/> - <line number="1266" hits="1"/> - <line number="1267" hits="1"/> - <line number="1268" hits="1"/> - <line number="1271" hits="1"/> + <line number="1275" hits="1"/> + <line number="1276" hits="1"/> + <line number="1277" hits="1"/> + <line number="1278" hits="1"/> + <line number="1279" hits="1"/> + <line number="1280" hits="1"/> + <line number="1281" hits="1"/> + <line number="1282" hits="1"/> + <line number="1283" hits="1"/> + <line number="1284" hits="1"/> <line number="1285" hits="1"/> <line number="1286" hits="1"/> <line number="1287" hits="1"/> - <line number="1288" hits="1"/> <line number="1289" hits="1"/> <line number="1290" hits="1"/> <line number="1291" hits="1"/> - <line number="1292" hits="1"/> - <line number="1293" hits="1"/> <line number="1294" hits="1"/> - <line number="1295" hits="1"/> - <line number="1296" hits="1"/> - <line number="1298" hits="1"/> - <line number="1299" hits="1"/> - <line number="1300" hits="1"/> - <line number="1303" hits="1"/> + <line number="1308" hits="1"/> + <line number="1309" hits="1"/> + <line number="1310" hits="1"/> + <line number="1311" hits="1"/> + <line number="1312" hits="1"/> + <line number="1313" hits="1"/> + <line number="1314" hits="1"/> + <line number="1315" hits="1"/> + <line number="1316" hits="1"/> + <line number="1317" hits="1"/> + <line number="1318" hits="1"/> + <line number="1319" hits="1"/> + <line number="1321" hits="1"/> + <line number="1322" hits="1"/> + <line number="1323" hits="1"/> <line number="1326" hits="1"/> - <line number="1327" hits="1"/> - <line number="1328" hits="1"/> - <line number="1329" hits="1"/> - <line number="1330" hits="1"/> - <line number="1331" hits="1"/> - <line number="1332" hits="1"/> - <line number="1333" hits="1"/> - <line number="1335" hits="1"/> - <line number="1336" hits="1"/> - <line number="1337" hits="1"/> - <line number="1338" hits="1"/> - <line number="1339" hits="1"/> - <line number="1340" hits="1"/> - <line number="1341" hits="1"/> - <line number="1342" hits="1"/> - <line number="1343" hits="1"/> - <line number="1344" hits="1"/> - <line number="1345" hits="1"/> - <line number="1346" hits="1"/> - <line number="1347" hits="1"/> - <line number="1348" hits="1"/> <line number="1349" hits="1"/> <line number="1350" hits="1"/> + <line number="1351" hits="1"/> + <line number="1352" hits="1"/> <line number="1353" hits="1"/> + <line number="1354" hits="1"/> + <line number="1355" hits="1"/> + <line number="1356" hits="1"/> + <line number="1357" hits="1"/> + <line number="1358" hits="1"/> + <line number="1360" hits="1"/> + <line number="1361" hits="1"/> + <line number="1362" hits="1"/> + <line number="1363" hits="1"/> + <line number="1364" hits="1"/> + <line number="1365" hits="1"/> + <line number="1366" hits="1"/> + <line number="1367" hits="1"/> + <line number="1368" hits="1"/> + <line number="1369" hits="1"/> + <line number="1370" hits="1"/> <line number="1371" hits="1"/> <line number="1372" hits="1"/> <line number="1373" hits="1"/> <line number="1374" hits="1"/> <line number="1375" hits="1"/> - <line number="1376" hits="1"/> - <line number="1377" hits="1"/> <line number="1378" hits="1"/> - <line number="1379" hits="1"/> - <line number="1380" hits="1"/> - <line number="1381" hits="1"/> - <line number="1382" hits="1"/> - <line number="1383" hits="1"/> - <line number="1384" hits="1"/> - <line number="1385" hits="1"/> - <line number="1386" hits="1"/> - <line number="1389" hits="1"/> + <line number="1396" hits="1"/> + <line number="1397" hits="1"/> + <line number="1398" hits="1"/> + <line number="1399" hits="1"/> + <line number="1400" hits="1"/> + <line number="1401" hits="1"/> + <line number="1402" hits="1"/> + <line number="1403" hits="1"/> <line number="1404" hits="1"/> <line number="1405" hits="1"/> <line number="1406" hits="1"/> @@ -671,13 +672,13 @@ <line number="1408" hits="1"/> <line number="1409" hits="1"/> <line number="1410" hits="1"/> - <line number="1411" hits="1"/> - <line number="1412" hits="1"/> <line number="1413" hits="1"/> - <line number="1414" hits="1"/> - <line number="1415" hits="1"/> - <line number="1416" hits="1"/> - <line number="1419" hits="1"/> + <line number="1428" hits="1"/> + <line number="1429" hits="1"/> + <line number="1430" hits="1"/> + <line number="1431" hits="1"/> + <line number="1432" hits="1"/> + <line number="1433" hits="1"/> <line number="1434" hits="1"/> <line number="1435" hits="1"/> <line number="1436" hits="1"/> @@ -685,14 +686,12 @@ <line number="1438" hits="1"/> <line number="1439" hits="1"/> <line number="1440" hits="1"/> - <line number="1441" hits="1"/> - <line number="1442" hits="1"/> <line number="1443" hits="1"/> - <line number="1444" hits="1"/> - <line number="1445" hits="1"/> - <line number="1446" hits="1"/> - <line number="1447" hits="1"/> - <line number="1450" hits="1"/> + <line number="1458" hits="1"/> + <line number="1459" hits="1"/> + <line number="1460" hits="1"/> + <line number="1461" hits="1"/> + <line number="1462" hits="1"/> <line number="1463" hits="1"/> <line number="1464" hits="1"/> <line number="1465" hits="1"/> @@ -702,209 +701,207 @@ <line number="1469" hits="1"/> <line number="1470" hits="1"/> <line number="1471" hits="1"/> - <line number="1472" hits="1"/> - <line number="1473" hits="1"/> <line number="1474" hits="1"/> - <line number="1477" hits="1"/> + <line number="1487" hits="1"/> + <line number="1488" hits="1"/> + <line number="1489" hits="1"/> + <line number="1490" hits="1"/> + <line number="1491" hits="1"/> + <line number="1492" hits="1"/> + <line number="1493" hits="1"/> + <line number="1494" hits="1"/> <line number="1495" hits="1"/> <line number="1496" hits="1"/> <line number="1497" hits="1"/> <line number="1498" hits="1"/> - <line number="1499" hits="1"/> - <line number="1500" hits="1"/> <line number="1501" hits="1"/> - <line number="1502" hits="1"/> - <line number="1503" hits="1"/> - <line number="1504" hits="1"/> - <line number="1505" hits="1"/> - <line number="1506" hits="1"/> - <line number="1507" hits="1"/> - <line number="1508" hits="1"/> - <line number="1509" hits="1"/> - <line number="1510" hits="1"/> - <line number="1513" hits="1"/> - <line number="1549" hits="1"/> - <line number="1550" hits="1"/> - <line number="1555" hits="1"/> - <line number="1556" hits="1"/> - <line number="1557" hits="1"/> - <line number="1558" hits="1"/> - <line number="1559" hits="1"/> - <line number="1560" hits="1"/> - <line number="1561" hits="1"/> - <line number="1562" hits="1"/> - <line number="1563" hits="1"/> - <line number="1564" hits="1"/> - <line number="1565" hits="1"/> - <line number="1566" hits="1"/> - <line number="1568" hits="1"/> - <line number="1569" hits="1"/> - <line number="1570" hits="1"/> + <line number="1519" hits="1"/> + <line number="1520" hits="1"/> + <line number="1521" hits="1"/> + <line number="1522" hits="1"/> + <line number="1523" hits="1"/> + <line number="1524" hits="1"/> + <line number="1525" hits="1"/> + <line number="1526" hits="1"/> + <line number="1527" hits="1"/> + <line number="1528" hits="1"/> + <line number="1529" hits="1"/> + <line number="1530" hits="1"/> + <line number="1531" hits="1"/> + <line number="1532" hits="1"/> + <line number="1533" hits="1"/> + <line number="1534" hits="1"/> + <line number="1537" hits="1"/> <line number="1573" hits="1"/> - <line number="1610" hits="1"/> - <line number="1611" hits="1"/> - <line number="1617" hits="1"/> - <line number="1618" hits="1"/> - <line number="1619" hits="1"/> - <line number="1620" hits="1"/> - <line number="1621" hits="1"/> - <line number="1622" hits="1"/> - <line number="1623" hits="1"/> - <line number="1624" hits="1"/> - <line number="1625" hits="1"/> - <line number="1626" hits="1"/> - <line number="1627" hits="1"/> - <line number="1628" hits="1"/> - <line number="1630" hits="1"/> - <line number="1631" hits="1"/> - <line number="1632" hits="1"/> + <line number="1574" hits="1"/> + <line number="1579" hits="1"/> + <line number="1580" hits="1"/> + <line number="1581" hits="1"/> + <line number="1582" hits="1"/> + <line number="1583" hits="1"/> + <line number="1584" hits="1"/> + <line number="1585" hits="1"/> + <line number="1586" hits="1"/> + <line number="1587" hits="1"/> + <line number="1588" hits="1"/> + <line number="1589" hits="1"/> + <line number="1590" hits="1"/> + <line number="1592" hits="1"/> + <line number="1593" hits="1"/> + <line number="1594" hits="1"/> + <line number="1597" hits="1"/> + <line number="1634" hits="1"/> <line number="1635" hits="1"/> + <line number="1641" hits="1"/> + <line number="1642" hits="1"/> + <line number="1643" hits="1"/> + <line number="1644" hits="1"/> + <line number="1645" hits="1"/> + <line number="1646" hits="1"/> + <line number="1647" hits="1"/> + <line number="1648" hits="1"/> + <line number="1649" hits="1"/> <line number="1650" hits="1"/> <line number="1651" hits="1"/> <line number="1652" hits="1"/> - <line number="1653" hits="1"/> <line number="1654" hits="1"/> <line number="1655" hits="1"/> <line number="1656" hits="1"/> - <line number="1657" hits="1"/> - <line number="1658" hits="1"/> <line number="1659" hits="1"/> - <line number="1660" hits="1"/> - <line number="1661" hits="1"/> - <line number="1662" hits="1"/> - <line number="1664" hits="1"/> - <line number="1665" hits="1"/> - <line number="1666" hits="1"/> - <line number="1669" hits="1"/> + <line number="1674" hits="1"/> <line number="1675" hits="1"/> <line number="1676" hits="1"/> <line number="1677" hits="1"/> <line number="1678" hits="1"/> <line number="1679" hits="1"/> <line number="1680" hits="1"/> + <line number="1681" hits="1"/> + <line number="1682" hits="1"/> <line number="1683" hits="1"/> - <line number="1689" hits="0"/> - <line number="1690" hits="0"/> - <line number="1691" hits="0"/> - <line number="1692" hits="0"/> - <line number="1693" hits="0"/> - <line number="1694" hits="0"/> - <line number="1697" hits="1"/> + <line number="1684" hits="1"/> + <line number="1685" hits="1"/> + <line number="1686" hits="1"/> + <line number="1688" hits="1"/> + <line number="1689" hits="1"/> + <line number="1690" hits="1"/> + <line number="1693" hits="1"/> + <line number="1699" hits="1"/> + <line number="1700" hits="1"/> + <line number="1701" hits="1"/> + <line number="1702" hits="1"/> <line number="1703" hits="1"/> <line number="1704" hits="1"/> - <line number="1705" hits="1"/> - <line number="1706" hits="1"/> <line number="1707" hits="1"/> - <line number="1708" hits="1"/> - <line number="1711" hits="1"/> + <line number="1713" hits="0"/> + <line number="1714" hits="0"/> + <line number="1715" hits="0"/> + <line number="1716" hits="0"/> + <line number="1717" hits="0"/> + <line number="1718" hits="0"/> + <line number="1721" hits="1"/> + <line number="1727" hits="1"/> + <line number="1728" hits="1"/> + <line number="1729" hits="1"/> <line number="1730" hits="1"/> <line number="1731" hits="1"/> <line number="1732" hits="1"/> - <line number="1733" hits="1"/> - <line number="1734" hits="1"/> <line number="1735" hits="1"/> - <line number="1736" hits="1"/> - <line number="1737" hits="1"/> - <line number="1738" hits="1"/> - <line number="1739" hits="1"/> - <line number="1740" hits="1"/> - <line number="1741" hits="1"/> - <line number="1742" hits="1"/> - <line number="1743" hits="1"/> - <line number="1744" hits="1"/> - <line number="1745" hits="1"/> - <line number="1746" hits="1"/> - <line number="1747" hits="1"/> - <line number="1748" hits="1"/> - <line number="1749" hits="1"/> - <line number="1750" hits="1"/> - <line number="1751" hits="1"/> - <line number="1752" hits="1"/> - <line number="1753" hits="1"/> <line number="1754" hits="1"/> <line number="1755" hits="1"/> <line number="1756" hits="1"/> <line number="1757" hits="1"/> + <line number="1758" hits="1"/> <line number="1759" hits="1"/> + <line number="1760" hits="1"/> + <line number="1761" hits="1"/> <line number="1762" hits="1"/> - <line number="1773" hits="0"/> - <line number="1774" hits="0"/> - <line number="1775" hits="0"/> - <line number="1776" hits="0"/> - <line number="1777" hits="0"/> - <line number="1778" hits="0"/> - <line number="1779" hits="0"/> - <line number="1780" hits="0"/> + <line number="1763" hits="1"/> + <line number="1764" hits="1"/> + <line number="1765" hits="1"/> + <line number="1766" hits="1"/> + <line number="1767" hits="1"/> + <line number="1768" hits="1"/> + <line number="1769" hits="1"/> + <line number="1770" hits="1"/> + <line number="1771" hits="1"/> + <line number="1772" hits="1"/> + <line number="1773" hits="1"/> + <line number="1774" hits="1"/> + <line number="1775" hits="1"/> + <line number="1776" hits="1"/> + <line number="1777" hits="1"/> + <line number="1778" hits="1"/> + <line number="1779" hits="1"/> + <line number="1780" hits="1"/> + <line number="1781" hits="1"/> <line number="1783" hits="1"/> - <line number="1794" hits="0"/> - <line number="1795" hits="0"/> - <line number="1796" hits="0"/> + <line number="1786" hits="1"/> <line number="1797" hits="0"/> <line number="1798" hits="0"/> <line number="1799" hits="0"/> <line number="1800" hits="0"/> <line number="1801" hits="0"/> - <line number="1804" hits="1"/> - <line number="1810" hits="1"/> - <line number="1811" hits="1"/> - <line number="1812" hits="1"/> - <line number="1813" hits="1"/> - <line number="1814" hits="1"/> - <line number="1815" hits="0"/> - <line number="1818" hits="1"/> - <line number="1824" hits="1"/> - <line number="1825" hits="1"/> - <line number="1826" hits="1"/> - <line number="1827" hits="1"/> - <line number="1828" hits="1"/> + <line number="1802" hits="0"/> + <line number="1803" hits="0"/> + <line number="1804" hits="0"/> + <line number="1807" hits="1"/> + <line number="1818" hits="0"/> + <line number="1819" hits="0"/> + <line number="1820" hits="0"/> + <line number="1821" hits="0"/> + <line number="1822" hits="0"/> + <line number="1823" hits="0"/> + <line number="1824" hits="0"/> + <line number="1826" hits="0"/> + <line number="1827" hits="0"/> <line number="1829" hits="0"/> - <line number="1833" hits="1"/> + <line number="1830" hits="0"/> + <line number="1832" hits="0"/> + <line number="1833" hits="0"/> + <line number="1834" hits="0"/> + <line number="1835" hits="0"/> + <line number="1836" hits="0"/> + <line number="1837" hits="0"/> + <line number="1840" hits="1"/> + <line number="1851" hits="1"/> + <line number="1852" hits="1"/> <line number="1853" hits="1"/> <line number="1854" hits="1"/> - <line number="1856" hits="1"/> - <line number="1857" hits="1"/> - <line number="1858" hits="1"/> - <line number="1859" hits="1"/> - <line number="1860" hits="1"/> + <line number="1855" hits="1"/> + <line number="1856" hits="0"/> + <line number="1857" hits="0"/> + <line number="1858" hits="0"/> <line number="1861" hits="1"/> - <line number="1862" hits="1"/> - <line number="1863" hits="1"/> - <line number="1864" hits="1"/> - <line number="1865" hits="1"/> - <line number="1866" hits="1"/> <line number="1867" hits="1"/> <line number="1868" hits="1"/> <line number="1869" hits="1"/> - </lines> - </class> - <class name="UploadClient.py" filename="dbrepo/UploadClient.py" complexity="0" line-rate="0.52" branch-rate="0"> - <methods/> - <lines> - <line number="1" hits="1"/> - <line number="2" hits="1"/> - <line number="3" hits="1"/> - <line number="4" hits="1"/> - <line number="5" hits="1"/> - <line number="7" hits="1"/> - <line number="8" hits="1"/> - <line number="10" hits="1"/> - <line number="12" hits="1"/> - <line number="16" hits="1"/> - <line number="24" hits="1"/> - <line number="26" hits="1"/> - <line number="27" hits="0"/> - <line number="29" hits="1"/> - <line number="30" hits="0"/> - <line number="31" hits="0"/> - <line number="32" hits="0"/> - <line number="33" hits="0"/> - <line number="34" hits="0"/> - <line number="35" hits="0"/> - <line number="36" hits="0"/> - <line number="37" hits="0"/> - <line number="38" hits="0"/> - <line number="39" hits="0"/> - <line number="40" hits="0"/> + <line number="1870" hits="1"/> + <line number="1871" hits="1"/> + <line number="1872" hits="0"/> + <line number="1875" hits="1"/> + <line number="1881" hits="1"/> + <line number="1882" hits="1"/> + <line number="1883" hits="1"/> + <line number="1884" hits="1"/> + <line number="1885" hits="1"/> + <line number="1886" hits="0"/> + <line number="1889" hits="1"/> + <line number="1909" hits="1"/> + <line number="1910" hits="1"/> + <line number="1912" hits="1"/> + <line number="1913" hits="1"/> + <line number="1914" hits="1"/> + <line number="1915" hits="1"/> + <line number="1916" hits="1"/> + <line number="1917" hits="1"/> + <line number="1918" hits="1"/> + <line number="1919" hits="1"/> + <line number="1920" hits="1"/> + <line number="1921" hits="1"/> + <line number="1922" hits="1"/> + <line number="1923" hits="1"/> + <line number="1924" hits="1"/> + <line number="1925" hits="1"/> </lines> </class> <class name="__init__.py" filename="dbrepo/__init__.py" complexity="0" line-rate="1" branch-rate="0"> @@ -913,7 +910,7 @@ </class> </classes> </package> - <package name="dbrepo.api" line-rate="1" branch-rate="0" complexity="0"> + <package name="dbrepo.api" line-rate="0.959" branch-rate="0" complexity="0"> <classes> <class name="__init__.py" filename="dbrepo/api/__init__.py" complexity="0" line-rate="1" branch-rate="0"> <methods/> @@ -941,81 +938,79 @@ <line number="26" hits="1"/> <line number="27" hits="1"/> <line number="28" hits="1"/> - <line number="29" hits="1"/> - <line number="30" hits="1"/> <line number="31" hits="1"/> <line number="32" hits="1"/> <line number="33" hits="1"/> - <line number="36" hits="1"/> - <line number="37" hits="1"/> + <line number="34" hits="1"/> + <line number="35" hits="1"/> <line number="38" hits="1"/> <line number="39" hits="1"/> <line number="40" hits="1"/> - <line number="43" hits="1"/> - <line number="44" hits="1"/> + <line number="41" hits="1"/> + <line number="42" hits="1"/> <line number="45" hits="1"/> <line number="46" hits="1"/> <line number="47" hits="1"/> <line number="50" hits="1"/> <line number="51" hits="1"/> <line number="52" hits="1"/> + <line number="53" hits="1"/> + <line number="54" hits="1"/> <line number="55" hits="1"/> <line number="56" hits="1"/> <line number="57" hits="1"/> <line number="58" hits="1"/> - <line number="59" hits="1"/> - <line number="60" hits="1"/> <line number="61" hits="1"/> <line number="62" hits="1"/> <line number="63" hits="1"/> - <line number="66" hits="1"/> + <line number="64" hits="1"/> <line number="67" hits="1"/> <line number="68" hits="1"/> <line number="69" hits="1"/> + <line number="70" hits="1"/> + <line number="71" hits="1"/> <line number="72" hits="1"/> <line number="73" hits="1"/> - <line number="74" hits="1"/> - <line number="75" hits="1"/> <line number="76" hits="1"/> <line number="77" hits="1"/> <line number="78" hits="1"/> + <line number="79" hits="1"/> + <line number="80" hits="1"/> <line number="81" hits="1"/> <line number="82" hits="1"/> <line number="83" hits="1"/> - <line number="84" hits="1"/> - <line number="85" hits="1"/> <line number="86" hits="1"/> <line number="87" hits="1"/> <line number="88" hits="1"/> + <line number="89" hits="1"/> + <line number="90" hits="1"/> <line number="91" hits="1"/> <line number="92" hits="1"/> - <line number="93" hits="1"/> - <line number="94" hits="1"/> <line number="95" hits="1"/> <line number="96" hits="1"/> <line number="97" hits="1"/> <line number="98" hits="1"/> <line number="99" hits="1"/> - <line number="102" hits="1"/> - <line number="103" hits="1"/> + <line number="100" hits="1"/> + <line number="101" hits="1"/> <line number="104" hits="1"/> <line number="105" hits="1"/> <line number="106" hits="1"/> <line number="107" hits="1"/> <line number="108" hits="1"/> + <line number="109" hits="1"/> + <line number="110" hits="1"/> <line number="111" hits="1"/> - <line number="112" hits="1"/> - <line number="113" hits="1"/> <line number="114" hits="1"/> <line number="115" hits="1"/> <line number="116" hits="1"/> <line number="117" hits="1"/> <line number="118" hits="1"/> + <line number="119" hits="1"/> + <line number="120" hits="1"/> <line number="121" hits="1"/> <line number="122" hits="1"/> <line number="123" hits="1"/> - <line number="124" hits="1"/> - <line number="125" hits="1"/> <line number="126" hits="1"/> <line number="127" hits="1"/> <line number="128" hits="1"/> @@ -1026,26 +1021,28 @@ <line number="135" hits="1"/> <line number="136" hits="1"/> <line number="137" hits="1"/> + <line number="138" hits="1"/> + <line number="139" hits="1"/> <line number="140" hits="1"/> - <line number="141" hits="1"/> - <line number="142" hits="1"/> <line number="143" hits="1"/> <line number="144" hits="1"/> - <line number="145" hits="1"/> - <line number="146" hits="1"/> <line number="147" hits="1"/> - <line number="150" hits="1"/> + <line number="148" hits="1"/> <line number="151" hits="1"/> - <line number="154" hits="1"/> <line number="155" hits="1"/> + <line number="156" hits="1"/> <line number="158" hits="1"/> + <line number="159" hits="1"/> + <line number="161" hits="1"/> <line number="162" hits="1"/> - <line number="163" hits="1"/> <line number="165" hits="1"/> - <line number="166" hits="1"/> - <line number="168" hits="1"/> <line number="169" hits="1"/> + <line number="170" hits="1"/> + <line number="171" hits="1"/> <line number="172" hits="1"/> + <line number="173" hits="1"/> + <line number="174" hits="1"/> + <line number="175" hits="1"/> <line number="176" hits="1"/> <line number="177" hits="1"/> <line number="178" hits="1"/> @@ -1069,14 +1066,14 @@ <line number="196" hits="1"/> <line number="197" hits="1"/> <line number="198" hits="1"/> - <line number="199" hits="1"/> - <line number="200" hits="1"/> <line number="201" hits="1"/> - <line number="202" hits="1"/> - <line number="203" hits="1"/> - <line number="204" hits="1"/> <line number="205" hits="1"/> + <line number="206" hits="1"/> + <line number="207" hits="1"/> <line number="208" hits="1"/> + <line number="209" hits="1"/> + <line number="210" hits="1"/> + <line number="211" hits="1"/> <line number="212" hits="1"/> <line number="213" hits="1"/> <line number="214" hits="1"/> @@ -1254,171 +1251,171 @@ <line number="386" hits="1"/> <line number="387" hits="1"/> <line number="388" hits="1"/> - <line number="389" hits="1"/> - <line number="390" hits="1"/> <line number="391" hits="1"/> <line number="392" hits="1"/> <line number="393" hits="1"/> - <line number="394" hits="1"/> - <line number="395" hits="1"/> - <line number="398" hits="1"/> - <line number="399" hits="1"/> + <line number="396" hits="1"/> + <line number="397" hits="1"/> <line number="400" hits="1"/> - <line number="403" hits="1"/> + <line number="401" hits="1"/> <line number="404" hits="1"/> - <line number="407" hits="1"/> <line number="408" hits="1"/> + <line number="409" hits="1"/> + <line number="410" hits="1"/> <line number="411" hits="1"/> + <line number="414" hits="1"/> <line number="415" hits="1"/> <line number="416" hits="1"/> <line number="417" hits="1"/> - <line number="418" hits="1"/> + <line number="420" hits="1"/> <line number="421" hits="1"/> - <line number="422" hits="1"/> - <line number="423" hits="1"/> <line number="424" hits="1"/> + <line number="425" hits="1"/> + <line number="426" hits="1"/> <line number="427" hits="1"/> <line number="428" hits="1"/> <line number="431" hits="1"/> <line number="432" hits="1"/> <line number="433" hits="1"/> <line number="434" hits="1"/> - <line number="435" hits="1"/> + <line number="437" hits="1"/> <line number="438" hits="1"/> - <line number="439" hits="1"/> - <line number="440" hits="1"/> <line number="441" hits="1"/> + <line number="442" hits="1"/> + <line number="443" hits="1"/> <line number="444" hits="1"/> <line number="445" hits="1"/> + <line number="446" hits="1"/> + <line number="447" hits="1"/> <line number="448" hits="1"/> - <line number="449" hits="1"/> - <line number="450" hits="1"/> <line number="451" hits="1"/> <line number="452" hits="1"/> <line number="453" hits="1"/> <line number="454" hits="1"/> <line number="455" hits="1"/> - <line number="458" hits="1"/> - <line number="459" hits="1"/> + <line number="456" hits="1"/> + <line number="457" hits="1"/> <line number="460" hits="1"/> <line number="461" hits="1"/> - <line number="462" hits="1"/> - <line number="463" hits="1"/> <line number="464" hits="1"/> + <line number="465" hits="1"/> + <line number="466" hits="1"/> <line number="467" hits="1"/> - <line number="468" hits="1"/> + <line number="470" hits="1"/> <line number="471" hits="1"/> <line number="472" hits="1"/> <line number="473" hits="1"/> <line number="474" hits="1"/> - <line number="477" hits="1"/> - <line number="478" hits="1"/> + <line number="475" hits="1"/> + <line number="476" hits="1"/> <line number="479" hits="1"/> <line number="480" hits="1"/> - <line number="481" hits="1"/> - <line number="482" hits="1"/> <line number="483" hits="1"/> - <line number="486" hits="1"/> - <line number="487" hits="1"/> - <line number="490" hits="1"/> - <line number="491" hits="1"/> + <line number="484" hits="1"/> + <line number="485" hits="1"/> + <line number="488" hits="1"/> + <line number="489" hits="1"/> <line number="492" hits="1"/> + <line number="493" hits="1"/> + <line number="494" hits="1"/> <line number="495" hits="1"/> <line number="496" hits="1"/> - <line number="499" hits="1"/> + <line number="497" hits="1"/> <line number="500" hits="1"/> <line number="501" hits="1"/> <line number="502" hits="1"/> - <line number="503" hits="1"/> - <line number="504" hits="1"/> + <line number="505" hits="1"/> + <line number="506" hits="1"/> <line number="507" hits="1"/> - <line number="508" hits="1"/> - <line number="509" hits="1"/> - <line number="512" hits="1"/> - <line number="513" hits="1"/> + <line number="510" hits="1"/> + <line number="511" hits="1"/> <line number="514" hits="1"/> + <line number="515" hits="1"/> + <line number="516" hits="1"/> <line number="517" hits="1"/> <line number="518" hits="1"/> - <line number="521" hits="1"/> - <line number="522" hits="1"/> + <line number="519" hits="1"/> + <line number="520" hits="1"/> <line number="523" hits="1"/> <line number="524" hits="1"/> <line number="525" hits="1"/> <line number="526" hits="1"/> <line number="527" hits="1"/> + <line number="528" hits="1"/> + <line number="529" hits="1"/> <line number="530" hits="1"/> <line number="531" hits="1"/> <line number="532" hits="1"/> <line number="533" hits="1"/> <line number="534" hits="1"/> - <line number="535" hits="1"/> - <line number="536" hits="1"/> <line number="537" hits="1"/> <line number="538" hits="1"/> <line number="539" hits="1"/> <line number="540" hits="1"/> <line number="541" hits="1"/> <line number="544" hits="1"/> - <line number="545" hits="1"/> - <line number="546" hits="1"/> - <line number="547" hits="1"/> <line number="548" hits="1"/> + <line number="549" hits="1"/> + <line number="550" hits="1"/> <line number="551" hits="1"/> - <line number="555" hits="1"/> - <line number="556" hits="1"/> - <line number="557" hits="1"/> + <line number="554" hits="1"/> <line number="558" hits="1"/> - <line number="561" hits="1"/> + <line number="559" hits="1"/> + <line number="560" hits="1"/> + <line number="563" hits="1"/> + <line number="564" hits="1"/> <line number="565" hits="1"/> <line number="566" hits="1"/> <line number="567" hits="1"/> + <line number="568" hits="1"/> + <line number="569" hits="1"/> <line number="570" hits="1"/> <line number="571" hits="1"/> <line number="572" hits="1"/> <line number="573" hits="1"/> <line number="574" hits="1"/> <line number="575" hits="1"/> - <line number="576" hits="1"/> - <line number="577" hits="1"/> <line number="578" hits="1"/> <line number="579" hits="1"/> <line number="580" hits="1"/> <line number="581" hits="1"/> <line number="582" hits="1"/> + <line number="583" hits="1"/> + <line number="584" hits="1"/> <line number="585" hits="1"/> <line number="586" hits="1"/> - <line number="587" hits="1"/> - <line number="588" hits="1"/> <line number="589" hits="1"/> <line number="590" hits="1"/> <line number="591" hits="1"/> <line number="592" hits="1"/> <line number="593" hits="1"/> + <line number="594" hits="1"/> + <line number="595" hits="1"/> <line number="596" hits="1"/> <line number="597" hits="1"/> <line number="598" hits="1"/> <line number="599" hits="1"/> <line number="600" hits="1"/> - <line number="601" hits="1"/> - <line number="602" hits="1"/> <line number="603" hits="1"/> <line number="604" hits="1"/> - <line number="605" hits="1"/> - <line number="606" hits="1"/> <line number="607" hits="1"/> + <line number="608" hits="1"/> + <line number="609" hits="1"/> <line number="610" hits="1"/> <line number="611" hits="1"/> <line number="614" hits="1"/> <line number="615" hits="1"/> <line number="616" hits="1"/> <line number="617" hits="1"/> - <line number="618" hits="1"/> + <line number="620" hits="1"/> <line number="621" hits="1"/> - <line number="622" hits="1"/> - <line number="623" hits="1"/> <line number="624" hits="1"/> + <line number="625" hits="1"/> + <line number="626" hits="1"/> <line number="627" hits="1"/> <line number="628" hits="1"/> + <line number="629" hits="1"/> + <line number="630" hits="1"/> <line number="631" hits="1"/> <line number="632" hits="1"/> <line number="633" hits="1"/> @@ -1435,15 +1432,15 @@ <line number="644" hits="1"/> <line number="645" hits="1"/> <line number="646" hits="1"/> - <line number="647" hits="1"/> - <line number="648" hits="1"/> <line number="649" hits="1"/> <line number="650" hits="1"/> - <line number="651" hits="1"/> - <line number="652" hits="1"/> <line number="653" hits="1"/> + <line number="654" hits="1"/> + <line number="655" hits="1"/> <line number="656" hits="1"/> <line number="657" hits="1"/> + <line number="658" hits="1"/> + <line number="659" hits="1"/> <line number="660" hits="1"/> <line number="661" hits="1"/> <line number="662" hits="1"/> @@ -1464,19 +1461,19 @@ <line number="677" hits="1"/> <line number="678" hits="1"/> <line number="679" hits="1"/> - <line number="680" hits="1"/> - <line number="681" hits="1"/> <line number="682" hits="1"/> <line number="683" hits="1"/> <line number="684" hits="1"/> <line number="685" hits="1"/> + <line number="686" hits="1"/> + <line number="687" hits="1"/> <line number="688" hits="1"/> - <line number="689" hits="1"/> - <line number="690" hits="1"/> <line number="691" hits="1"/> <line number="692" hits="1"/> <line number="693" hits="1"/> <line number="694" hits="1"/> + <line number="695" hits="1"/> + <line number="696" hits="1"/> <line number="697" hits="1"/> <line number="698" hits="1"/> <line number="699" hits="1"/> @@ -1484,12 +1481,12 @@ <line number="701" hits="1"/> <line number="702" hits="1"/> <line number="703" hits="1"/> - <line number="704" hits="1"/> - <line number="705" hits="1"/> <line number="706" hits="1"/> <line number="707" hits="1"/> <line number="708" hits="1"/> <line number="709" hits="1"/> + <line number="710" hits="1"/> + <line number="711" hits="1"/> <line number="712" hits="1"/> <line number="713" hits="1"/> <line number="714" hits="1"/> @@ -1497,13 +1494,11 @@ <line number="716" hits="1"/> <line number="717" hits="1"/> <line number="718" hits="1"/> - <line number="719" hits="1"/> - <line number="720" hits="1"/> <line number="721" hits="1"/> <line number="722" hits="1"/> <line number="723" hits="1"/> <line number="724" hits="1"/> - <line number="727" hits="1"/> + <line number="725" hits="1"/> <line number="728" hits="1"/> <line number="729" hits="1"/> <line number="730" hits="1"/> @@ -1512,96 +1507,83 @@ <line number="735" hits="1"/> <line number="736" hits="1"/> <line number="737" hits="1"/> + <line number="738" hits="1"/> + <line number="739" hits="1"/> <line number="740" hits="1"/> <line number="741" hits="1"/> <line number="742" hits="1"/> <line number="743" hits="1"/> <line number="744" hits="1"/> - <line number="745" hits="1"/> - <line number="746" hits="1"/> <line number="747" hits="1"/> <line number="748" hits="1"/> <line number="749" hits="1"/> <line number="750" hits="1"/> - <line number="753" hits="1"/> + <line number="751" hits="1"/> <line number="754" hits="1"/> <line number="755" hits="1"/> <line number="756" hits="1"/> <line number="757" hits="1"/> <line number="760" hits="1"/> <line number="761" hits="1"/> - <line number="762" hits="1"/> - <line number="763" hits="1"/> + <line number="764" hits="1"/> + <line number="765" hits="1"/> <line number="766" hits="1"/> <line number="767" hits="1"/> - <line number="770" hits="1"/> - <line number="771" hits="1"/> + <line number="768" hits="1"/> + <line number="769" hits="1"/> <line number="772" hits="1"/> <line number="773" hits="1"/> <line number="774" hits="1"/> <line number="775" hits="1"/> <line number="778" hits="1"/> <line number="779" hits="1"/> - <line number="780" hits="1"/> - <line number="781" hits="1"/> + <line number="782" hits="1"/> + <line number="783" hits="1"/> <line number="784" hits="1"/> <line number="785" hits="1"/> - <line number="788" hits="1"/> + <line number="786" hits="1"/> <line number="789" hits="1"/> - <line number="790" hits="1"/> - <line number="791" hits="1"/> - <line number="792" hits="1"/> + <line number="793" hits="1"/> + <line number="794" hits="1"/> <line number="795" hits="1"/> - <line number="796" hits="1"/> - <line number="799" hits="1"/> + <line number="798" hits="1"/> + <line number="802" hits="1"/> <line number="803" hits="1"/> - <line number="804" hits="1"/> - <line number="805" hits="1"/> <line number="806" hits="1"/> + <line number="807" hits="1"/> + <line number="808" hits="1"/> <line number="809" hits="1"/> + <line number="810" hits="1"/> <line number="813" hits="1"/> <line number="814" hits="1"/> + <line number="815" hits="1"/> + <line number="816" hits="1"/> <line number="817" hits="1"/> + <line number="820" hits="1"/> <line number="821" hits="1"/> <line number="822" hits="1"/> - <line number="823" hits="1"/> - <line number="824" hits="1"/> <line number="825" hits="1"/> <line number="826" hits="1"/> <line number="827" hits="1"/> - <line number="828" hits="1"/> - <line number="829" hits="1"/> <line number="830" hits="1"/> <line number="831" hits="1"/> <line number="832" hits="1"/> <line number="833" hits="1"/> <line number="834" hits="1"/> - <line number="835" hits="1"/> - <line number="836" hits="1"/> <line number="837" hits="1"/> <line number="838" hits="1"/> + <line number="839" hits="1"/> + <line number="840" hits="1"/> <line number="841" hits="1"/> - <line number="845" hits="1"/> - <line number="846" hits="1"/> - <line number="847" hits="1"/> + <line number="844" hits="1"/> <line number="848" hits="1"/> <line number="849" hits="1"/> <line number="850" hits="1"/> <line number="851" hits="1"/> - <line number="852" hits="1"/> - <line number="853" hits="1"/> <line number="854" hits="1"/> - <line number="855" hits="1"/> - <line number="856" hits="1"/> - <line number="857" hits="1"/> <line number="858" hits="1"/> <line number="859" hits="1"/> - <line number="860" hits="1"/> - <line number="861" hits="1"/> <line number="862" hits="1"/> - <line number="863" hits="1"/> - <line number="864" hits="1"/> - <line number="865" hits="1"/> <line number="866" hits="1"/> <line number="867" hits="1"/> <line number="868" hits="1"/> @@ -1615,62 +1597,73 @@ <line number="876" hits="1"/> <line number="877" hits="1"/> <line number="878" hits="1"/> + <line number="879" hits="1"/> + <line number="880" hits="1"/> <line number="881" hits="1"/> - <line number="885" hits="1"/> + <line number="882" hits="1"/> + <line number="883" hits="1"/> <line number="886" hits="1"/> - <line number="887" hits="1"/> - <line number="888" hits="1"/> - <line number="889" hits="1"/> <line number="890" hits="1"/> + <line number="891" hits="1"/> + <line number="892" hits="1"/> <line number="893" hits="1"/> + <line number="894" hits="1"/> + <line number="895" hits="1"/> + <line number="896" hits="1"/> <line number="897" hits="1"/> <line number="898" hits="1"/> + <line number="899" hits="1"/> <line number="900" hits="1"/> <line number="901" hits="1"/> + <line number="902" hits="1"/> + <line number="903" hits="1"/> <line number="904" hits="1"/> + <line number="905" hits="1"/> + <line number="906" hits="1"/> + <line number="907" hits="1"/> <line number="908" hits="1"/> <line number="909" hits="1"/> + <line number="910" hits="1"/> <line number="911" hits="1"/> <line number="912" hits="1"/> + <line number="913" hits="1"/> <line number="914" hits="1"/> <line number="915" hits="1"/> + <line number="916" hits="1"/> <line number="917" hits="1"/> <line number="918" hits="1"/> + <line number="919" hits="1"/> + <line number="920" hits="1"/> <line number="921" hits="1"/> - <line number="925" hits="1"/> + <line number="922" hits="1"/> + <line number="923" hits="1"/> <line number="926" hits="1"/> - <line number="928" hits="1"/> - <line number="929" hits="1"/> + <line number="930" hits="1"/> + <line number="931" hits="1"/> <line number="932" hits="1"/> - <line number="936" hits="1"/> - <line number="937" hits="1"/> - <line number="939" hits="1"/> - <line number="940" hits="1"/> + <line number="933" hits="1"/> + <line number="934" hits="1"/> + <line number="935" hits="1"/> + <line number="938" hits="1"/> <line number="942" hits="1"/> <line number="943" hits="1"/> <line number="945" hits="1"/> <line number="946" hits="1"/> <line number="949" hits="1"/> - <line number="950" hits="1"/> - <line number="951" hits="1"/> - <line number="952" hits="1"/> <line number="953" hits="1"/> <line number="954" hits="1"/> - <line number="955" hits="1"/> <line number="956" hits="1"/> <line number="957" hits="1"/> - <line number="958" hits="1"/> <line number="959" hits="1"/> <line number="960" hits="1"/> - <line number="961" hits="1"/> - <line number="964" hits="1"/> - <line number="965" hits="1"/> - <line number="968" hits="1"/> - <line number="969" hits="1"/> + <line number="962" hits="1"/> + <line number="963" hits="1"/> + <line number="966" hits="1"/> <line number="970" hits="1"/> + <line number="971" hits="1"/> <line number="973" hits="1"/> <line number="974" hits="1"/> - <line number="975" hits="1"/> + <line number="977" hits="1"/> <line number="978" hits="1"/> <line number="979" hits="1"/> <line number="980" hits="1"/> @@ -1683,30 +1676,20 @@ <line number="987" hits="1"/> <line number="988" hits="1"/> <line number="989" hits="1"/> - <line number="990" hits="1"/> - <line number="991" hits="1"/> <line number="992" hits="1"/> <line number="993" hits="1"/> <line number="994" hits="1"/> - <line number="997" hits="1"/> + <line number="995" hits="1"/> <line number="998" hits="1"/> <line number="999" hits="1"/> - <line number="1000" hits="1"/> - <line number="1001" hits="1"/> <line number="1002" hits="1"/> <line number="1003" hits="1"/> <line number="1004" hits="1"/> - <line number="1005" hits="1"/> - <line number="1006" hits="1"/> <line number="1007" hits="1"/> <line number="1008" hits="1"/> <line number="1009" hits="1"/> - <line number="1010" hits="1"/> - <line number="1011" hits="1"/> <line number="1012" hits="1"/> <line number="1013" hits="1"/> - <line number="1014" hits="1"/> - <line number="1015" hits="1"/> <line number="1016" hits="1"/> <line number="1017" hits="1"/> <line number="1018" hits="1"/> @@ -1715,6 +1698,8 @@ <line number="1021" hits="1"/> <line number="1022" hits="1"/> <line number="1023" hits="1"/> + <line number="1024" hits="1"/> + <line number="1025" hits="1"/> <line number="1026" hits="1"/> <line number="1027" hits="1"/> <line number="1028" hits="1"/> @@ -1722,8 +1707,6 @@ <line number="1030" hits="1"/> <line number="1031" hits="1"/> <line number="1032" hits="1"/> - <line number="1033" hits="1"/> - <line number="1034" hits="1"/> <line number="1035" hits="1"/> <line number="1036" hits="1"/> <line number="1037" hits="1"/> @@ -1732,6 +1715,8 @@ <line number="1040" hits="1"/> <line number="1041" hits="1"/> <line number="1042" hits="1"/> + <line number="1043" hits="1"/> + <line number="1044" hits="1"/> <line number="1045" hits="1"/> <line number="1046" hits="1"/> <line number="1047" hits="1"/> @@ -1749,9 +1734,9 @@ <line number="1059" hits="1"/> <line number="1060" hits="1"/> <line number="1061" hits="1"/> - <line number="1062" hits="1"/> - <line number="1063" hits="1"/> <line number="1064" hits="1"/> + <line number="1065" hits="1"/> + <line number="1066" hits="1"/> <line number="1067" hits="1"/> <line number="1068" hits="1"/> <line number="1069" hits="1"/> @@ -1763,9 +1748,9 @@ <line number="1075" hits="1"/> <line number="1076" hits="1"/> <line number="1077" hits="1"/> + <line number="1078" hits="1"/> + <line number="1079" hits="1"/> <line number="1080" hits="1"/> - <line number="1081" hits="1"/> - <line number="1082" hits="1"/> <line number="1083" hits="1"/> <line number="1084" hits="1"/> <line number="1085" hits="1"/> @@ -1781,23 +1766,32 @@ <line number="1095" hits="1"/> <line number="1096" hits="1"/> <line number="1097" hits="1"/> + <line number="1098" hits="1"/> + <line number="1099" hits="1"/> <line number="1100" hits="1"/> <line number="1101" hits="1"/> <line number="1102" hits="1"/> - <line number="1103" hits="1"/> + <line number="1105" hits="1"/> <line number="1106" hits="1"/> <line number="1107" hits="1"/> <line number="1108" hits="1"/> <line number="1109" hits="1"/> <line number="1110" hits="1"/> + <line number="1111" hits="1"/> + <line number="1112" hits="1"/> <line number="1113" hits="1"/> - <line number="1117" hits="1"/> + <line number="1114" hits="1"/> + <line number="1115" hits="1"/> <line number="1118" hits="1"/> <line number="1119" hits="1"/> <line number="1120" hits="1"/> <line number="1121" hits="1"/> + <line number="1122" hits="1"/> + <line number="1123" hits="1"/> <line number="1124" hits="1"/> <line number="1125" hits="1"/> + <line number="1126" hits="1"/> + <line number="1127" hits="1"/> <line number="1128" hits="1"/> <line number="1129" hits="1"/> <line number="1130" hits="1"/> @@ -1810,17 +1804,42 @@ <line number="1139" hits="1"/> <line number="1140" hits="1"/> <line number="1141" hits="1"/> - <line number="1142" hits="1"/> - <line number="1143" hits="1"/> + <line number="1144" hits="1"/> + <line number="1145" hits="1"/> <line number="1146" hits="1"/> <line number="1147" hits="1"/> <line number="1148" hits="1"/> - <line number="1149" hits="1"/> - <line number="1152" hits="1"/> - <line number="1153" hits="1"/> - <line number="1154" hits="1"/> + <line number="1151" hits="1"/> <line number="1155" hits="1"/> <line number="1156" hits="1"/> + <line number="1157" hits="1"/> + <line number="1158" hits="1"/> + <line number="1159" hits="1"/> + <line number="1162" hits="1"/> + <line number="1163" hits="1"/> + <line number="1166" hits="1"/> + <line number="1167" hits="1"/> + <line number="1168" hits="1"/> + <line number="1169" hits="1"/> + <line number="1170" hits="1"/> + <line number="1171" hits="1"/> + <line number="1172" hits="1"/> + <line number="1173" hits="1"/> + <line number="1176" hits="1"/> + <line number="1177" hits="1"/> + <line number="1178" hits="1"/> + <line number="1179" hits="1"/> + <line number="1180" hits="1"/> + <line number="1181" hits="1"/> + <line number="1184" hits="1"/> + <line number="1185" hits="1"/> + <line number="1186" hits="1"/> + <line number="1187" hits="1"/> + <line number="1190" hits="1"/> + <line number="1191" hits="1"/> + <line number="1192" hits="1"/> + <line number="1193" hits="1"/> + <line number="1194" hits="1"/> </lines> </class> <class name="exceptions.py" filename="dbrepo/api/exceptions.py" complexity="0" line-rate="1" branch-rate="0"> @@ -1860,6 +1879,108 @@ <line number="110" hits="1"/> </lines> </class> + <class name="mapper.py" filename="dbrepo/api/mapper.py" complexity="0" line-rate="0.5567" branch-rate="0"> + <methods/> + <lines> + <line number="1" hits="1"/> + <line number="3" hits="1"/> + <line number="4" hits="1"/> + <line number="5" hits="1"/> + <line number="7" hits="1"/> + <line number="9" hits="1"/> + <line number="12" hits="1"/> + <line number="13" hits="1"/> + <line number="14" hits="0"/> + <line number="15" hits="1"/> + <line number="16" hits="1"/> + <line number="17" hits="0"/> + <line number="18" hits="1"/> + <line number="20" hits="1"/> + <line number="21" hits="0"/> + <line number="22" hits="1"/> + <line number="23" hits="1"/> + <line number="24" hits="1"/> + <line number="26" hits="1"/> + <line number="28" hits="1"/> + <line number="29" hits="0"/> + <line number="31" hits="1"/> + <line number="32" hits="1"/> + <line number="33" hits="0"/> + <line number="34" hits="1"/> + <line number="38" hits="1"/> + <line number="39" hits="1"/> + <line number="40" hits="0"/> + <line number="42" hits="0"/> + <line number="44" hits="0"/> + <line number="45" hits="0"/> + <line number="46" hits="0"/> + <line number="47" hits="1"/> + <line number="50" hits="1"/> + <line number="51" hits="1"/> + <line number="52" hits="1"/> + <line number="53" hits="1"/> + <line number="57" hits="1"/> + <line number="58" hits="1"/> + <line number="59" hits="1"/> + <line number="60" hits="1"/> + <line number="63" hits="1"/> + <line number="64" hits="0"/> + <line number="65" hits="0"/> + <line number="66" hits="0"/> + <line number="67" hits="0"/> + <line number="68" hits="0"/> + <line number="70" hits="0"/> + <line number="71" hits="0"/> + <line number="72" hits="1"/> + <line number="73" hits="1"/> + <line number="74" hits="1"/> + <line number="75" hits="1"/> + <line number="76" hits="0"/> + <line number="77" hits="0"/> + <line number="78" hits="0"/> + <line number="79" hits="0"/> + <line number="80" hits="1"/> + <line number="81" hits="1"/> + <line number="82" hits="1"/> + <line number="83" hits="1"/> + <line number="84" hits="1"/> + <line number="85" hits="0"/> + <line number="86" hits="0"/> + <line number="87" hits="0"/> + <line number="88" hits="0"/> + <line number="89" hits="0"/> + <line number="90" hits="0"/> + <line number="91" hits="0"/> + <line number="92" hits="0"/> + <line number="93" hits="0"/> + <line number="94" hits="1"/> + <line number="95" hits="1"/> + <line number="96" hits="1"/> + <line number="97" hits="1"/> + <line number="98" hits="0"/> + <line number="99" hits="0"/> + <line number="100" hits="0"/> + <line number="101" hits="1"/> + <line number="102" hits="1"/> + <line number="103" hits="1"/> + <line number="104" hits="1"/> + <line number="106" hits="0"/> + <line number="107" hits="0"/> + <line number="108" hits="0"/> + <line number="109" hits="0"/> + <line number="110" hits="0"/> + <line number="111" hits="0"/> + <line number="112" hits="0"/> + <line number="113" hits="0"/> + <line number="115" hits="0"/> + <line number="116" hits="1"/> + <line number="117" hits="1"/> + <line number="119" hits="1"/> + <line number="120" hits="1"/> + <line number="121" hits="0"/> + <line number="122" hits="1"/> + </lines> + </class> </classes> </package> </packages> diff --git a/lib/python/tests/test_unit_identifier.py b/lib/python/tests/test_unit_identifier.py index 9ac386437c29f4c65f6879d1a1f0c98641652652..137a513d4666ad097094f67d6fd4dcff80fc1d3b 100644 --- a/lib/python/tests/test_unit_identifier.py +++ b/lib/python/tests/test_unit_identifier.py @@ -7,7 +7,7 @@ from dbrepo.api.dto import Identifier, IdentifierType, SaveIdentifierTitle, Crea IdentifierDescription, SaveIdentifierDescription, Language, SaveIdentifierFunder, SaveRelatedIdentifier, \ RelatedIdentifierRelation, RelatedIdentifierType, IdentifierFunder, RelatedIdentifier, UserBrief, \ IdentifierStatusType, CreateIdentifierCreator, CreateIdentifierTitle, CreateIdentifierFunder, \ - CreateRelatedIdentifier, CreateIdentifierDescription, SaveIdentifierCreator + CreateRelatedIdentifier, CreateIdentifierDescription, SaveIdentifierCreator, Links from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, AuthenticationError, \ ServiceConnectionError, ServiceError, ResponseCodeError, FormatNotAvailable, RequestError @@ -19,6 +19,9 @@ class IdentifierUnitTest(unittest.TestCase): exp = Identifier(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", database_id="6bd39359-b154-456d-b9c2-caa516a45732", view_id="e5229d24-584a-43e8-b9f6-d349c3053f9c", + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), publication_year=2024, publisher='TU Wien', type=IdentifierType.VIEW, @@ -172,6 +175,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", @@ -275,6 +281,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", @@ -517,6 +526,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -530,7 +542,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=202) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=202) # test client = RestClient(username="a", password="b") response = client.publish_identifier(identifier_id="f6171539-a479-4829-9b9b-a6b474e1c7d3") @@ -545,6 +558,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -558,7 +574,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=400) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=400) # test try: RestClient(username="a", password="b").publish_identifier( @@ -575,6 +592,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -588,7 +608,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=403) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=403) # test try: RestClient(username="a", password="b").publish_identifier( @@ -605,6 +626,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -618,7 +642,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=404) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=404) # test try: RestClient(username="a", password="b").publish_identifier( @@ -635,6 +660,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -648,7 +676,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=502) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=502) # test try: RestClient(username="a", password="b").publish_identifier( @@ -665,6 +694,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -678,7 +710,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=503) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=503) # test try: RestClient(username="a", password="b").publish_identifier( @@ -695,6 +728,9 @@ class IdentifierUnitTest(unittest.TestCase): publisher='TU Wien', type=IdentifierType.VIEW, language=Language.EN, + links=Links(self="/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3", + self_html="/pid/f6171539-a479-4829-9b9b-a6b474e1c7d3", + data="/api/database/6bd39359-b154-456d-b9c2-caa516a45732/view/e5229d24-584a-43e8-b9f6-d349c3053f9c/data"), descriptions=[IdentifierDescription(id="d8bdc933-655c-46bd-9903-ede3928a304b", description='Test Description')], titles=[IdentifierTitle(id="f6171539-a479-4829-9b9b-a6b474e1c7d3", title='Test Title')], @@ -708,7 +744,8 @@ class IdentifierUnitTest(unittest.TestCase): status=IdentifierStatusType.PUBLISHED, owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise')) # mock - mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), status_code=200) + mock.put('/api/identifier/f6171539-a479-4829-9b9b-a6b474e1c7d3/publish', json=exp.model_dump(), + status_code=200) # test try: RestClient(username="a", password="b").publish_identifier(