@budibase/server 0.9.185-alpha.14 → 0.9.185-alpha.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (188) hide show
  1. package/Dockerfile +7 -1
  2. package/__mocks__/oracledb.ts +31 -0
  3. package/builder/assets/{index.8ed163fd.js → index.21479aff.js} +152 -152
  4. package/builder/assets/{index.4a7c5636.css → index.67ac3a72.css} +1 -1
  5. package/builder/assets/oracle.66592424.png +0 -0
  6. package/builder/index.html +2 -2
  7. package/coverage/clover.xml +84 -84
  8. package/coverage/coverage-final.json +4 -4
  9. package/coverage/lcov-report/api/controllers/analytics.js.html +1 -1
  10. package/coverage/lcov-report/api/controllers/apikeys.js.html +1 -1
  11. package/coverage/lcov-report/api/controllers/application.js.html +1 -1
  12. package/coverage/lcov-report/api/controllers/auth.js.html +1 -1
  13. package/coverage/lcov-report/api/controllers/automation.js.html +1 -1
  14. package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
  15. package/coverage/lcov-report/api/controllers/cloud.js.html +1 -1
  16. package/coverage/lcov-report/api/controllers/component.js.html +4 -4
  17. package/coverage/lcov-report/api/controllers/datasource.js.html +1 -1
  18. package/coverage/lcov-report/api/controllers/dev.js.html +1 -1
  19. package/coverage/lcov-report/api/controllers/hosting.js.html +1 -1
  20. package/coverage/lcov-report/api/controllers/index.html +1 -1
  21. package/coverage/lcov-report/api/controllers/integration.js.html +1 -1
  22. package/coverage/lcov-report/api/controllers/layout.js.html +1 -1
  23. package/coverage/lcov-report/api/controllers/metadata.js.html +1 -1
  24. package/coverage/lcov-report/api/controllers/permission.js.html +1 -1
  25. package/coverage/lcov-report/api/controllers/query.js.html +1 -1
  26. package/coverage/lcov-report/api/controllers/role.js.html +1 -1
  27. package/coverage/lcov-report/api/controllers/routing.js.html +1 -1
  28. package/coverage/lcov-report/api/controllers/row/external.js.html +1 -1
  29. package/coverage/lcov-report/api/controllers/row/index.html +1 -1
  30. package/coverage/lcov-report/api/controllers/row/index.js.html +1 -1
  31. package/coverage/lcov-report/api/controllers/row/internal.js.html +1 -1
  32. package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +1 -1
  33. package/coverage/lcov-report/api/controllers/row/utils.js.html +1 -1
  34. package/coverage/lcov-report/api/controllers/screen.js.html +1 -1
  35. package/coverage/lcov-report/api/controllers/script.js.html +1 -1
  36. package/coverage/lcov-report/api/controllers/table/external.js.html +1 -1
  37. package/coverage/lcov-report/api/controllers/table/index.html +1 -1
  38. package/coverage/lcov-report/api/controllers/table/index.js.html +1 -1
  39. package/coverage/lcov-report/api/controllers/table/internal.js.html +1 -1
  40. package/coverage/lcov-report/api/controllers/table/utils.js.html +1 -1
  41. package/coverage/lcov-report/api/controllers/templates.js.html +1 -1
  42. package/coverage/lcov-report/api/controllers/user.js.html +1 -1
  43. package/coverage/lcov-report/api/controllers/view/exporters.js.html +1 -1
  44. package/coverage/lcov-report/api/controllers/view/index.html +1 -1
  45. package/coverage/lcov-report/api/controllers/view/index.js.html +1 -1
  46. package/coverage/lcov-report/api/controllers/view/utils.js.html +1 -1
  47. package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +1 -1
  48. package/coverage/lcov-report/api/controllers/webhook.js.html +1 -1
  49. package/coverage/lcov-report/api/index.html +1 -1
  50. package/coverage/lcov-report/api/index.js.html +1 -1
  51. package/coverage/lcov-report/api/routes/analytics.js.html +1 -1
  52. package/coverage/lcov-report/api/routes/apikeys.js.html +1 -1
  53. package/coverage/lcov-report/api/routes/application.js.html +1 -1
  54. package/coverage/lcov-report/api/routes/auth.js.html +1 -1
  55. package/coverage/lcov-report/api/routes/automation.js.html +1 -1
  56. package/coverage/lcov-report/api/routes/backup.js.html +1 -1
  57. package/coverage/lcov-report/api/routes/cloud.js.html +1 -1
  58. package/coverage/lcov-report/api/routes/component.js.html +1 -1
  59. package/coverage/lcov-report/api/routes/datasource.js.html +1 -1
  60. package/coverage/lcov-report/api/routes/deploy.js.html +1 -1
  61. package/coverage/lcov-report/api/routes/dev.js.html +1 -1
  62. package/coverage/lcov-report/api/routes/hosting.js.html +1 -1
  63. package/coverage/lcov-report/api/routes/index.html +1 -1
  64. package/coverage/lcov-report/api/routes/index.js.html +1 -1
  65. package/coverage/lcov-report/api/routes/integration.js.html +1 -1
  66. package/coverage/lcov-report/api/routes/layout.js.html +1 -1
  67. package/coverage/lcov-report/api/routes/metadata.js.html +1 -1
  68. package/coverage/lcov-report/api/routes/permission.js.html +1 -1
  69. package/coverage/lcov-report/api/routes/query.js.html +1 -1
  70. package/coverage/lcov-report/api/routes/role.js.html +1 -1
  71. package/coverage/lcov-report/api/routes/routing.js.html +1 -1
  72. package/coverage/lcov-report/api/routes/row.js.html +1 -1
  73. package/coverage/lcov-report/api/routes/screen.js.html +1 -1
  74. package/coverage/lcov-report/api/routes/script.js.html +1 -1
  75. package/coverage/lcov-report/api/routes/static.js.html +1 -1
  76. package/coverage/lcov-report/api/routes/table.js.html +1 -1
  77. package/coverage/lcov-report/api/routes/templates.js.html +1 -1
  78. package/coverage/lcov-report/api/routes/user.js.html +1 -1
  79. package/coverage/lcov-report/api/routes/view.js.html +1 -1
  80. package/coverage/lcov-report/api/routes/webhook.js.html +1 -1
  81. package/coverage/lcov-report/automations/actions.js.html +1 -1
  82. package/coverage/lcov-report/automations/automationUtils.js.html +1 -1
  83. package/coverage/lcov-report/automations/bullboard.js.html +1 -1
  84. package/coverage/lcov-report/automations/index.html +1 -1
  85. package/coverage/lcov-report/automations/index.js.html +1 -1
  86. package/coverage/lcov-report/automations/steps/bash.js.html +1 -1
  87. package/coverage/lcov-report/automations/steps/createRow.js.html +1 -1
  88. package/coverage/lcov-report/automations/steps/delay.js.html +1 -1
  89. package/coverage/lcov-report/automations/steps/deleteRow.js.html +1 -1
  90. package/coverage/lcov-report/automations/steps/discord.js.html +1 -1
  91. package/coverage/lcov-report/automations/steps/executeQuery.js.html +1 -1
  92. package/coverage/lcov-report/automations/steps/executeScript.js.html +1 -1
  93. package/coverage/lcov-report/automations/steps/filter.js.html +1 -1
  94. package/coverage/lcov-report/automations/steps/index.html +1 -1
  95. package/coverage/lcov-report/automations/steps/integromat.js.html +1 -1
  96. package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +1 -1
  97. package/coverage/lcov-report/automations/steps/queryRows.js.html +1 -1
  98. package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +1 -1
  99. package/coverage/lcov-report/automations/steps/serverLog.js.html +1 -1
  100. package/coverage/lcov-report/automations/steps/slack.js.html +1 -1
  101. package/coverage/lcov-report/automations/steps/updateRow.js.html +1 -1
  102. package/coverage/lcov-report/automations/steps/utils.js.html +1 -1
  103. package/coverage/lcov-report/automations/steps/zapier.js.html +1 -1
  104. package/coverage/lcov-report/automations/triggerInfo/app.js.html +1 -1
  105. package/coverage/lcov-report/automations/triggerInfo/cron.js.html +1 -1
  106. package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
  107. package/coverage/lcov-report/automations/triggerInfo/index.js.html +1 -1
  108. package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +1 -1
  109. package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +1 -1
  110. package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +1 -1
  111. package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +1 -1
  112. package/coverage/lcov-report/automations/triggers.js.html +1 -1
  113. package/coverage/lcov-report/automations/utils.js.html +1 -1
  114. package/coverage/lcov-report/constants/index.html +1 -1
  115. package/coverage/lcov-report/constants/index.js.html +22 -22
  116. package/coverage/lcov-report/constants/layouts.js.html +1 -1
  117. package/coverage/lcov-report/constants/screens.js.html +1 -1
  118. package/coverage/lcov-report/db/client.js.html +1 -1
  119. package/coverage/lcov-report/db/inMemoryView.js.html +1 -1
  120. package/coverage/lcov-report/db/index.html +1 -1
  121. package/coverage/lcov-report/db/index.js.html +1 -1
  122. package/coverage/lcov-report/db/linkedRows/LinkController.js.html +1 -1
  123. package/coverage/lcov-report/db/linkedRows/index.html +1 -1
  124. package/coverage/lcov-report/db/linkedRows/index.js.html +1 -1
  125. package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +1 -1
  126. package/coverage/lcov-report/db/newid.js.html +3 -3
  127. package/coverage/lcov-report/db/utils.js.html +57 -57
  128. package/coverage/lcov-report/events/AutomationEmitter.js.html +1 -1
  129. package/coverage/lcov-report/events/index.html +1 -1
  130. package/coverage/lcov-report/events/index.js.html +1 -1
  131. package/coverage/lcov-report/events/utils.js.html +1 -1
  132. package/coverage/lcov-report/index.html +1 -1
  133. package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
  134. package/coverage/lcov-report/integrations/tests/index.html +1 -1
  135. package/coverage/lcov-report/middleware/appInfo.js.html +1 -1
  136. package/coverage/lcov-report/middleware/authorized.js.html +1 -1
  137. package/coverage/lcov-report/middleware/builder.js.html +1 -1
  138. package/coverage/lcov-report/middleware/currentapp.js.html +1 -1
  139. package/coverage/lcov-report/middleware/index.html +1 -1
  140. package/coverage/lcov-report/middleware/joi-validator.js.html +1 -1
  141. package/coverage/lcov-report/middleware/resourceId.js.html +1 -1
  142. package/coverage/lcov-report/middleware/selfhost.js.html +1 -1
  143. package/coverage/lcov-report/middleware/usageQuota.js.html +1 -1
  144. package/coverage/lcov-report/middleware/utils.js.html +1 -1
  145. package/coverage/lcov-report/threads/automation.js.html +1 -1
  146. package/coverage/lcov-report/threads/index.html +1 -1
  147. package/coverage/lcov-report/threads/index.js.html +1 -1
  148. package/coverage/lcov-report/threads/query.js.html +1 -1
  149. package/coverage/lcov-report/utilities/bcrypt.js.html +1 -1
  150. package/coverage/lcov-report/utilities/budibaseDir.js.html +1 -1
  151. package/coverage/lcov-report/utilities/centralPath.js.html +1 -1
  152. package/coverage/lcov-report/utilities/csvParser.js.html +1 -1
  153. package/coverage/lcov-report/utilities/global.js.html +1 -1
  154. package/coverage/lcov-report/utilities/index.html +1 -1
  155. package/coverage/lcov-report/utilities/index.js.html +1 -1
  156. package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +1 -1
  157. package/coverage/lcov-report/utilities/queue/index.html +1 -1
  158. package/coverage/lcov-report/utilities/routing/index.html +1 -1
  159. package/coverage/lcov-report/utilities/routing/index.js.html +1 -1
  160. package/coverage/lcov-report/utilities/rowProcessor/index.html +1 -1
  161. package/coverage/lcov-report/utilities/rowProcessor/index.js.html +1 -1
  162. package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +1 -1
  163. package/coverage/lcov-report/utilities/scriptRunner.js.html +1 -1
  164. package/coverage/lcov-report/utilities/security.js.html +1 -1
  165. package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
  166. package/coverage/lcov-report/utilities/users.js.html +1 -1
  167. package/coverage/lcov-report/utilities/workerRequests.js.html +1 -1
  168. package/coverage/lcov.info +83 -83
  169. package/dist/definitions/datasource.js +1 -0
  170. package/dist/integrations/base/sql.js +4 -0
  171. package/dist/integrations/index.js +6 -0
  172. package/dist/integrations/oracle.js +345 -0
  173. package/dist/integrations/utils.js +10 -1
  174. package/dist/package.json +8 -4
  175. package/dist/tsconfig.tsbuildinfo +1 -1
  176. package/package.json +9 -5
  177. package/scripts/integrations/oracle/docker-compose.yml +19 -0
  178. package/scripts/integrations/oracle/instantclient/linux/x86-64/basiclite-21.4.zip +0 -0
  179. package/scripts/integrations/oracle/instantclient/linux/x86-64/install.sh +23 -0
  180. package/scripts/integrations/oracle/oracle.md +90 -0
  181. package/scripts/integrations/postgres/docker-compose.yml +3 -3
  182. package/src/definitions/datasource.ts +1 -0
  183. package/src/integrations/base/IntegrationBase.ts +4 -4
  184. package/src/integrations/base/sql.ts +3 -0
  185. package/src/integrations/index.ts +7 -0
  186. package/src/integrations/oracle.ts +445 -0
  187. package/src/integrations/tests/oracle.spec.js +94 -0
  188. package/src/integrations/utils.ts +10 -1
package/builder/index.html CHANGED
@@ -10,10 +10,10 @@
10
10
  href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
11
11
  rel="stylesheet"
12
12
  />
13
- <script type="module" crossorigin src="/builder/assets/index.8ed163fd.js"></script>
13
+ <script type="module" crossorigin src="/builder/assets/index.21479aff.js"></script>
14
14
  <link rel="modulepreload" href="/builder/assets/vendor.470042a4.js">
15
15
  <link rel="stylesheet" href="/builder/assets/vendor.5e1fe644.css">
16
- <link rel="stylesheet" href="/builder/assets/index.4a7c5636.css">
16
+ <link rel="stylesheet" href="/builder/assets/index.67ac3a72.css">
17
17
  </head>
18
18
  <body id="app">
19
19
 
package/coverage/clover.xml CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1637604142890" clover="3.2.0">
3
- <project timestamp="1637604142890" name="All files">
2
+ <coverage generated="1637743564778" clover="3.2.0">
3
+ <project timestamp="1637743564778" name="All files">
4
4
  <metrics statements="4365" coveredstatements="3225" conditionals="1729" coveredconditionals="940" methods="618" coveredmethods="440" elements="6712" coveredelements="4605" complexity="0" loc="4365" ncloc="4365" packages="20" files="138" classes="138"/>
5
5
  <package name="api">
6
6
  <metrics statements="29" coveredstatements="27" conditionals="5" coveredconditionals="2" methods="5" coveredmethods="4"/>
@@ -479,10 +479,10 @@
479
479
  <line num="20" count="1" type="stmt"/>
480
480
  <line num="21" count="1" type="stmt"/>
481
481
  <line num="22" count="1" type="stmt"/>
482
- <line num="23" count="46" type="cond" truecount="2" falsecount="0"/>
482
+ <line num="23" count="47" type="cond" truecount="2" falsecount="0"/>
483
483
  <line num="24" count="1" type="stmt"/>
484
- <line num="26" count="45" type="stmt"/>
485
- <line num="27" count="45" type="stmt"/>
484
+ <line num="26" count="46" type="stmt"/>
485
+ <line num="27" count="46" type="stmt"/>
486
486
  <line num="34" count="1" type="stmt"/>
487
487
  </file>
488
488
  <file name="datasource.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/datasource.js">
@@ -3369,27 +3369,27 @@
3369
3369
  <metrics statements="28" coveredstatements="28" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1"/>
3370
3370
  <file name="index.js" path="/home/runner/work/budibase/budibase/packages/server/src/constants/index.js">
3371
3371
  <metrics statements="21" coveredstatements="21" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
3372
- <line num="1" count="40" type="stmt"/>
3373
- <line num="2" count="40" type="stmt"/>
3374
- <line num="3" count="40" type="stmt"/>
3375
- <line num="5" count="40" type="stmt"/>
3376
- <line num="9" count="40" type="stmt"/>
3377
- <line num="22" count="40" type="stmt"/>
3378
- <line num="23" count="40" type="stmt"/>
3379
- <line num="32" count="40" type="stmt"/>
3380
- <line num="48" count="40" type="stmt"/>
3381
- <line num="55" count="40" type="stmt"/>
3382
- <line num="61" count="40" type="stmt"/>
3383
- <line num="67" count="40" type="stmt"/>
3384
- <line num="78" count="40" type="stmt"/>
3385
- <line num="83" count="40" type="stmt"/>
3386
- <line num="145" count="40" type="stmt"/>
3387
- <line num="153" count="40" type="stmt"/>
3388
- <line num="154" count="40" type="stmt"/>
3389
- <line num="161" count="40" type="stmt"/>
3390
- <line num="166" count="40" type="stmt"/>
3391
- <line num="172" count="40" type="stmt"/>
3392
- <line num="178" count="40" type="stmt"/>
3372
+ <line num="1" count="41" type="stmt"/>
3373
+ <line num="2" count="41" type="stmt"/>
3374
+ <line num="3" count="41" type="stmt"/>
3375
+ <line num="5" count="41" type="stmt"/>
3376
+ <line num="9" count="41" type="stmt"/>
3377
+ <line num="22" count="41" type="stmt"/>
3378
+ <line num="23" count="41" type="stmt"/>
3379
+ <line num="32" count="41" type="stmt"/>
3380
+ <line num="48" count="41" type="stmt"/>
3381
+ <line num="55" count="41" type="stmt"/>
3382
+ <line num="61" count="41" type="stmt"/>
3383
+ <line num="67" count="41" type="stmt"/>
3384
+ <line num="78" count="41" type="stmt"/>
3385
+ <line num="83" count="41" type="stmt"/>
3386
+ <line num="145" count="41" type="stmt"/>
3387
+ <line num="153" count="41" type="stmt"/>
3388
+ <line num="154" count="41" type="stmt"/>
3389
+ <line num="161" count="41" type="stmt"/>
3390
+ <line num="166" count="41" type="stmt"/>
3391
+ <line num="172" count="41" type="stmt"/>
3392
+ <line num="178" count="41" type="stmt"/>
3393
3393
  </file>
3394
3394
  <file name="layouts.js" path="/home/runner/work/budibase/budibase/packages/server/src/constants/layouts.js">
3395
3395
  <metrics statements="4" coveredstatements="4" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
@@ -3460,119 +3460,119 @@
3460
3460
  </file>
3461
3461
  <file name="newid.js" path="/home/runner/work/budibase/budibase/packages/server/src/db/newid.js">
3462
3462
  <metrics statements="3" coveredstatements="3" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1"/>
3463
- <line num="1" count="46" type="stmt"/>
3464
- <line num="3" count="46" type="stmt"/>
3463
+ <line num="1" count="47" type="stmt"/>
3464
+ <line num="3" count="47" type="stmt"/>
3465
3465
  <line num="4" count="803" type="stmt"/>
3466
3466
  </file>
3467
3467
  <file name="utils.js" path="/home/runner/work/budibase/budibase/packages/server/src/db/utils.js">
3468
3468
  <metrics statements="108" coveredstatements="100" conditionals="51" coveredconditionals="18" methods="30" coveredmethods="27"/>
3469
- <line num="1" count="46" type="stmt"/>
3470
- <line num="12" count="46" type="stmt"/>
3471
- <line num="14" count="46" type="stmt"/>
3472
- <line num="16" count="46" type="stmt"/>
3473
- <line num="22" count="46" type="stmt"/>
3474
- <line num="45" count="46" type="stmt"/>
3475
- <line num="50" count="46" type="stmt"/>
3476
- <line num="54" count="46" type="stmt"/>
3477
- <line num="58" count="46" type="stmt"/>
3478
- <line num="60" count="46" type="stmt"/>
3479
- <line num="68" count="46" type="stmt"/>
3480
- <line num="69" count="46" type="stmt"/>
3481
- <line num="70" count="46" type="stmt"/>
3482
- <line num="71" count="46" type="stmt"/>
3483
- <line num="72" count="46" type="stmt"/>
3484
- <line num="73" count="46" type="stmt"/>
3485
- <line num="74" count="46" type="stmt"/>
3486
- <line num="75" count="46" type="stmt"/>
3487
- <line num="76" count="46" type="stmt"/>
3488
- <line num="77" count="46" type="stmt"/>
3489
- <line num="78" count="46" type="stmt"/>
3490
- <line num="79" count="46" type="stmt"/>
3491
- <line num="80" count="46" type="stmt"/>
3492
- <line num="81" count="46" type="stmt"/>
3493
- <line num="83" count="46" type="stmt"/>
3494
- <line num="84" count="46" type="stmt"/>
3495
- <line num="86" count="46" type="stmt"/>
3469
+ <line num="1" count="47" type="stmt"/>
3470
+ <line num="12" count="47" type="stmt"/>
3471
+ <line num="14" count="47" type="stmt"/>
3472
+ <line num="16" count="47" type="stmt"/>
3473
+ <line num="22" count="47" type="stmt"/>
3474
+ <line num="45" count="47" type="stmt"/>
3475
+ <line num="50" count="47" type="stmt"/>
3476
+ <line num="54" count="47" type="stmt"/>
3477
+ <line num="58" count="47" type="stmt"/>
3478
+ <line num="60" count="47" type="stmt"/>
3479
+ <line num="68" count="47" type="stmt"/>
3480
+ <line num="69" count="47" type="stmt"/>
3481
+ <line num="70" count="47" type="stmt"/>
3482
+ <line num="71" count="47" type="stmt"/>
3483
+ <line num="72" count="47" type="stmt"/>
3484
+ <line num="73" count="47" type="stmt"/>
3485
+ <line num="74" count="47" type="stmt"/>
3486
+ <line num="75" count="47" type="stmt"/>
3487
+ <line num="76" count="47" type="stmt"/>
3488
+ <line num="77" count="47" type="stmt"/>
3489
+ <line num="78" count="47" type="stmt"/>
3490
+ <line num="79" count="47" type="stmt"/>
3491
+ <line num="80" count="47" type="stmt"/>
3492
+ <line num="81" count="47" type="stmt"/>
3493
+ <line num="83" count="47" type="stmt"/>
3494
+ <line num="84" count="47" type="stmt"/>
3495
+ <line num="86" count="47" type="stmt"/>
3496
3496
  <line num="87" count="74" type="stmt"/>
3497
3497
  <line num="103" count="603" type="cond" truecount="2" falsecount="0"/>
3498
3498
  <line num="104" count="590" type="stmt"/>
3499
3499
  <line num="106" count="603" type="stmt"/>
3500
- <line num="113" count="46" type="stmt"/>
3501
- <line num="118" count="46" type="cond" truecount="0" falsecount="2"/>
3500
+ <line num="113" count="47" type="stmt"/>
3501
+ <line num="118" count="47" type="cond" truecount="0" falsecount="2"/>
3502
3502
  <line num="119" count="3" type="stmt"/>
3503
- <line num="126" count="46" type="stmt"/>
3503
+ <line num="126" count="47" type="stmt"/>
3504
3504
  <line num="127" count="99" type="stmt"/>
3505
- <line num="138" count="46" type="cond" truecount="0" falsecount="3"/>
3505
+ <line num="138" count="47" type="cond" truecount="0" falsecount="3"/>
3506
3506
  <line num="139" count="11" type="cond" truecount="1" falsecount="1"/>
3507
3507
  <line num="140" count="0" type="stmt"/>
3508
3508
  <line num="143" count="11" type="cond" truecount="1" falsecount="1"/>
3509
3509
  <line num="145" count="11" type="stmt"/>
3510
- <line num="154" count="46" type="cond" truecount="1" falsecount="0"/>
3510
+ <line num="154" count="47" type="cond" truecount="1" falsecount="0"/>
3511
3511
  <line num="155" count="200" type="cond" truecount="2" falsecount="0"/>
3512
3512
  <line num="156" count="200" type="stmt"/>
3513
- <line num="162" count="46" type="cond" truecount="0" falsecount="2"/>
3513
+ <line num="162" count="47" type="cond" truecount="0" falsecount="2"/>
3514
3514
  <line num="163" count="3" type="stmt"/>
3515
- <line num="171" count="46" type="stmt"/>
3515
+ <line num="171" count="47" type="stmt"/>
3516
3516
  <line num="172" count="132" type="stmt"/>
3517
- <line num="178" count="46" type="stmt"/>
3517
+ <line num="178" count="47" type="stmt"/>
3518
3518
  <line num="179" count="2" type="stmt"/>
3519
3519
  <line num="180" count="2" type="cond" truecount="4" falsecount="0"/>
3520
3520
  <line num="181" count="1" type="stmt"/>
3521
3521
  <line num="183" count="1" type="stmt"/>
3522
- <line num="189" count="46" type="cond" truecount="0" falsecount="2"/>
3522
+ <line num="189" count="47" type="cond" truecount="0" falsecount="2"/>
3523
3523
  <line num="190" count="203" type="stmt"/>
3524
- <line num="197" count="46" type="stmt"/>
3524
+ <line num="197" count="47" type="stmt"/>
3525
3525
  <line num="198" count="20" type="stmt"/>
3526
- <line num="212" count="46" type="stmt"/>
3526
+ <line num="212" count="47" type="stmt"/>
3527
3527
  <line num="220" count="9" type="stmt"/>
3528
3528
  <line num="221" count="9" type="stmt"/>
3529
3529
  <line num="222" count="9" type="stmt"/>
3530
3530
  <line num="223" count="9" type="stmt"/>
3531
- <line num="229" count="46" type="cond" truecount="0" falsecount="1"/>
3531
+ <line num="229" count="47" type="cond" truecount="0" falsecount="1"/>
3532
3532
  <line num="230" count="0" type="stmt"/>
3533
- <line num="237" count="46" type="cond" truecount="0" falsecount="1"/>
3533
+ <line num="237" count="47" type="cond" truecount="0" falsecount="1"/>
3534
3534
  <line num="238" count="178" type="stmt"/>
3535
3535
  <line num="239" count="178" type="cond" truecount="1" falsecount="1"/>
3536
3536
  <line num="240" count="0" type="stmt"/>
3537
3537
  <line num="242" count="178" type="stmt"/>
3538
- <line num="249" count="46" type="stmt"/>
3538
+ <line num="249" count="47" type="stmt"/>
3539
3539
  <line num="250" count="178" type="stmt"/>
3540
3540
  <line num="251" count="178" type="stmt"/>
3541
3541
  <line num="252" count="178" type="stmt"/>
3542
- <line num="259" count="46" type="stmt"/>
3542
+ <line num="259" count="47" type="stmt"/>
3543
3543
  <line num="260" count="5" type="cond" truecount="2" falsecount="0"/>
3544
- <line num="266" count="46" type="cond" truecount="0" falsecount="2"/>
3544
+ <line num="266" count="47" type="cond" truecount="0" falsecount="2"/>
3545
3545
  <line num="267" count="188" type="stmt"/>
3546
- <line num="274" count="46" type="stmt"/>
3546
+ <line num="274" count="47" type="stmt"/>
3547
3547
  <line num="275" count="197" type="stmt"/>
3548
- <line num="281" count="46" type="cond" truecount="0" falsecount="2"/>
3548
+ <line num="281" count="47" type="cond" truecount="0" falsecount="2"/>
3549
3549
  <line num="282" count="190" type="stmt"/>
3550
- <line num="289" count="46" type="stmt"/>
3550
+ <line num="289" count="47" type="stmt"/>
3551
3551
  <line num="290" count="10" type="stmt"/>
3552
- <line num="296" count="46" type="cond" truecount="0" falsecount="2"/>
3552
+ <line num="296" count="47" type="cond" truecount="0" falsecount="2"/>
3553
3553
  <line num="297" count="2" type="stmt"/>
3554
- <line num="304" count="46" type="cond" truecount="1" falsecount="1"/>
3554
+ <line num="304" count="47" type="cond" truecount="1" falsecount="1"/>
3555
3555
  <line num="305" count="23" type="stmt"/>
3556
- <line num="313" count="46" type="cond" truecount="0" falsecount="2"/>
3556
+ <line num="313" count="47" type="cond" truecount="0" falsecount="2"/>
3557
3557
  <line num="314" count="3" type="stmt"/>
3558
- <line num="321" count="46" type="stmt"/>
3558
+ <line num="321" count="47" type="stmt"/>
3559
3559
  <line num="322" count="18" type="stmt"/>
3560
- <line num="330" count="46" type="cond" truecount="0" falsecount="2"/>
3560
+ <line num="330" count="47" type="cond" truecount="0" falsecount="2"/>
3561
3561
  <line num="331" count="3" type="cond" truecount="2" falsecount="0"/>
3562
3562
  <line num="332" count="2" type="stmt"/>
3563
3563
  <line num="335" count="1" type="stmt"/>
3564
- <line num="342" count="46" type="stmt"/>
3564
+ <line num="342" count="47" type="stmt"/>
3565
3565
  <line num="343" count="10" type="stmt"/>
3566
- <line num="346" count="46" type="cond" truecount="0" falsecount="2"/>
3566
+ <line num="346" count="47" type="cond" truecount="0" falsecount="2"/>
3567
3567
  <line num="347" count="0" type="stmt"/>
3568
3568
  <line num="348" count="0" type="cond" truecount="0" falsecount="2"/>
3569
3569
  <line num="349" count="0" type="stmt"/>
3570
3570
  <line num="351" count="0" type="stmt"/>
3571
- <line num="354" count="46" type="stmt"/>
3571
+ <line num="354" count="47" type="stmt"/>
3572
3572
  <line num="355" count="1" type="stmt"/>
3573
- <line num="358" count="46" type="cond" truecount="0" falsecount="1"/>
3573
+ <line num="358" count="47" type="cond" truecount="0" falsecount="1"/>
3574
3574
  <line num="359" count="0" type="stmt"/>
3575
- <line num="365" count="46" type="stmt"/>
3575
+ <line num="365" count="47" type="stmt"/>
3576
3576
  <line num="366" count="60" type="stmt"/>
3577
3577
  </file>
3578
3578
  </package>