From 90cf28fa935b6b20bdc81e74295e1553de453243 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Fri, 25 Oct 2024 10:41:42 -0700 Subject: [PATCH 01/21] Github CI/CD --- .github/dependabot.yml | 67 +------------------ .../{codeql-analysis.yml => build.yml} | 53 ++++++++------- .github/workflows/dependency-review.yml | 31 +++++++-- package.json | 1 + 4 files changed, 57 insertions(+), 95 deletions(-) rename .github/workflows/{codeql-analysis.yml => build.yml} (51%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 13353706b..8359bf31c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,71 +1,8 @@ version: 2 updates: -- package-ecosystem: maven +- package-ecosystem: npm directory: "/" schedule: interval: daily open-pull-requests-limit: 10 - target-branch: dev - ignore: - - dependency-name: org.eclipse.jetty:jetty-maven-plugin - versions: - - 11.0.0 - - 11.0.1 - - dependency-name: com.eduworks:org.credentialengine - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:cass.adapter - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:cass.import - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:cass.rollup - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:ebac.identity - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:cass.competency - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:forge - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:kbac.skyrepo - versions: - - 3.1.2 - - 3.1.3 - - 3.1.7 - - dependency-name: com.eduworks:ew.db.mapdb - versions: - - 5.16.4 - - dependency-name: com.eduworks:ew.levr.rdf - versions: - - 5.16.4 - - dependency-name: com.eduworks:ew.levr.net - versions: - - 5.16.4 - - dependency-name: com.eduworks:ew.levr.db.mapdb - versions: - - 5.16.4 - - dependency-name: com.eduworks:ew.levr.security - versions: - - 5.16.4 - - dependency-name: com.eduworks:ew.levr.base - versions: - - 5.16.4 + target-branch: "master" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/build.yml similarity index 51% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/build.yml index d20710e16..292c4d4f8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/build.yml @@ -9,16 +9,16 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: "Build and Analyze" on: push: - branches: [ master ] + branches: [ master,"1.5","1.6" ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ master,"1.5","1.6" ] schedule: - - cron: '36 13 * * 4' + - cron: '16 9 * * 1' jobs: analyze: @@ -28,9 +28,10 @@ jobs: actions: read contents: read security-events: write + pull-requests: write strategy: - fail-fast: false + fail-fast: true matrix: language: [ 'javascript' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] @@ -38,33 +39,37 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v3 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + - name: Build lcov.info + uses: actions/setup-node@v4 + with: + cache: 'npm' + - run: npm ci + - run: docker compose up -d + - run: npm run nyc - #- run: | - # make bootstrap - # make release + - name: Analyze with SonarCloud + uses: SonarSource/sonarcloud-github-action@v3.0.0 + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) + with: + args: + -Dsonar.projectKey=cassproject_cass-npm + -Dsonar.organization=cassproject + -Dsonar.sources=src/com/,src/org/ + -Dsonar.tests=src/test/ + -Dsonar.cpd.exclusions=src/com/asd/**/*,src/org/credentialengine/* + projectBaseDir: . - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 0e72a00ef..6ea5e253d 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -1,20 +1,39 @@ # Dependency Review Action # -# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging. +# This Action will scan dependency manifest files that change as part of a Pull Request, +# surfacing known-vulnerable versions of the packages declared or updated in the PR. +# Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable +# packages will be blocked from merging. # # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement -name: 'Dependency Review' -on: [pull_request] +name: 'Dependency review' +on: + pull_request: + branches: [ "master","1.5","1.6" ] +# If using a dependency submission action in this workflow this permission will need to be set to: +# +# permissions: +# contents: write +# +# https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api permissions: contents: read + # Write permissions for pull-requests are required for using the `comment-summary-in-pr` option, comment out if you aren't using this option + pull-requests: write jobs: dependency-review: runs-on: ubuntu-latest steps: - - name: 'Checkout Repository' - uses: actions/checkout@v3 + - name: 'Checkout repository' + uses: actions/checkout@v4 - name: 'Dependency Review' - uses: actions/dependency-review-action@v1 + uses: actions/dependency-review-action@v4 + # Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options. + with: + comment-summary-in-pr: always + # fail-on-severity: moderate + deny-licenses: GPL-1.0-or-later, LGPL-2.0-or-later + # retry-on-snapshot-warnings: true diff --git a/package.json b/package.json index 610da7d45..8bdd72647 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "mocha": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "mochaEncryption": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/com/eduworks/ec/crypto/*.test.js", "mochafast": "wait-on http://localhost/api/ping && mocha -b src/**/*.test.js", + "nyc": "nyc --reporter lcov npm run mocha", "automocha": "nodemon --watch ../cass-npm --watch . --exec \"npm run mocha\"", "automochafast": "nodemon --exec \"npm run mochafast\"", "run": "pm2 start ./pm2.config.js", From 392c5ec108be1fc0ad64268d10a9048a76b6f4dc Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Fri, 25 Oct 2024 11:10:11 -0700 Subject: [PATCH 02/21] Github CI/CD --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 292c4d4f8..b8edb9185 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,11 +64,10 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) with: args: - -Dsonar.projectKey=cassproject_cass-npm + -Dsonar.projectKey=cassproject_cass -Dsonar.organization=cassproject - -Dsonar.sources=src/com/,src/org/ - -Dsonar.tests=src/test/ - -Dsonar.cpd.exclusions=src/com/asd/**/*,src/org/credentialengine/* + -Dsonar.sources=src/main/ + -Dsonar.tests=src/main/ projectBaseDir: . - name: Perform CodeQL Analysis From 30bdbd70c50cdf323a281ccc425a82776e2847ce Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Fri, 25 Oct 2024 12:47:49 -0700 Subject: [PATCH 03/21] Github CI/CD --- .github/workflows/build.yml | 2 +- package-lock.json | 714 +++++++++++++++--------------------- package.json | 4 +- 3 files changed, 306 insertions(+), 414 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8edb9185..0e8263f66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) with: args: - -Dsonar.projectKey=cassproject_cass + -Dsonar.projectKey=cassproject_CASS -Dsonar.organization=cassproject -Dsonar.sources=src/main/ -Dsonar.tests=src/main/ diff --git a/package-lock.json b/package-lock.json index c2295e228..218e28ce5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "cass", - "version": "1.5.66", + "version": "1.5.67", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cass", - "version": "1.5.66", + "version": "1.5.67", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-s3": "^3.676.0", + "@aws-sdk/client-s3": "^3.679.0", "@xmldom/xmldom": "^0.8.10", "aws-sdk": "^2.1691.0", "busboy": "^1.6.0", @@ -286,34 +286,34 @@ } }, "node_modules/@aws-sdk/client-s3": { - "version": "3.676.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.676.0.tgz", - "integrity": "sha512-yxhqXkrJGQoRK+Ulbr3CvKzCjVgR97ehzSk6o9inSTun+jh8wBp0CFI/0R3BTH1wPwwdHf34O5H+3qWw2Pa/IQ==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.679.0.tgz", + "integrity": "sha512-P93tUbJXiDtSPgBfFpnjaijLV38hyPlE3g0XybsPTmSYNV6A9Jt1TUIF6vX+o6LdFuq3FerCiagUjhfDANWkAw==", "dependencies": { "@aws-crypto/sha1-browser": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.675.0", - "@aws-sdk/client-sts": "3.675.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.675.0", - "@aws-sdk/middleware-bucket-endpoint": "3.667.0", - "@aws-sdk/middleware-expect-continue": "3.667.0", - "@aws-sdk/middleware-flexible-checksums": "3.669.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-location-constraint": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-sdk-s3": "3.674.0", - "@aws-sdk/middleware-ssec": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/signature-v4-multi-region": "3.674.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.669.0", - "@aws-sdk/xml-builder": "3.662.0", + "@aws-sdk/client-sso-oidc": "3.679.0", + "@aws-sdk/client-sts": "3.679.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-node": "3.679.0", + "@aws-sdk/middleware-bucket-endpoint": "3.679.0", + "@aws-sdk/middleware-expect-continue": "3.679.0", + "@aws-sdk/middleware-flexible-checksums": "3.679.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-location-constraint": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-sdk-s3": "3.679.0", + "@aws-sdk/middleware-ssec": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/signature-v4-multi-region": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.679.0", + "@aws-sdk/xml-builder": "3.679.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/eventstream-serde-browser": "^3.0.10", @@ -354,22 +354,22 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.675.0.tgz", - "integrity": "sha512-2goBCEr4acZJ1YJ69eWPTsIfZUbO7enog+lBA5kZShDiwovqzwYSHSlf6OGz4ETs2xT1n7n+QfKY0p+TluTfEw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.679.0.tgz", + "integrity": "sha512-/0cAvYnpOZTo/Y961F1kx2fhDDLUYZ0SQQ5/75gh3xVImLj7Zw+vp74ieqFbqWLYGMaq8z1Arr9A8zG95mbLdg==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.679.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -402,23 +402,23 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.675.0.tgz", - "integrity": "sha512-4kEcaa2P/BFz+xy5tagbtzM08gbjHXyYqW+n6SJuUFK7N6bZNnA4cu1hVgHcqOqk8Dbwv7fiseGT0x3Hhqjwqg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.679.0.tgz", + "integrity": "sha512-/dBYWcCwbA/id4sFCIVZvf0UsvzHCC68SryxeNQk/PDkY9N4n5yRcMUkZDaEyQCjowc3kY4JOXp2AdUP037nhA==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.675.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-node": "3.679.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.679.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -450,28 +450,28 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.675.0" + "@aws-sdk/client-sts": "^3.679.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.675.0.tgz", - "integrity": "sha512-zgjyR4GyuONeDGJBKNt9lFJ8HfDX7rpxZZVR7LSXr9lUkjf6vUGgD2k/K4UAoOTWCKKCor6TA562ezGlA8su6Q==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.679.0.tgz", + "integrity": "sha512-3CvrT8w1RjFu1g8vKA5Azfr5V83r2/b68Ock43WE003Bq/5Y38mwmYX7vk0fPHzC3qejt4YMAWk/C3fSKOy25g==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.675.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.675.0", - "@aws-sdk/middleware-host-header": "3.667.0", - "@aws-sdk/middleware-logger": "3.667.0", - "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/region-config-resolver": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.669.0", + "@aws-sdk/client-sso-oidc": "3.679.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-node": "3.679.0", + "@aws-sdk/middleware-host-header": "3.679.0", + "@aws-sdk/middleware-logger": "3.679.0", + "@aws-sdk/middleware-recursion-detection": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/region-config-resolver": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", + "@aws-sdk/util-user-agent-browser": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.679.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -504,11 +504,11 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz", - "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz", + "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/core": "^2.4.8", "@smithy/node-config-provider": "^3.1.8", "@smithy/property-provider": "^3.1.7", @@ -525,12 +525,12 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz", - "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz", + "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -540,12 +540,12 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz", - "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz", + "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/node-http-handler": "^3.2.4", "@smithy/property-provider": "^3.1.7", @@ -560,17 +560,17 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.675.0.tgz", - "integrity": "sha512-kCBlC6grpbpCvgowk9T4JHZxJ88VfN0r77bDZClcadFRAKQ8UHyO02zhgFCfUdnU1lNv1mr3ngEcGN7XzJlYWA==", - "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-env": "3.667.0", - "@aws-sdk/credential-provider-http": "3.667.0", - "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.675.0", - "@aws-sdk/credential-provider-web-identity": "3.667.0", - "@aws-sdk/types": "3.667.0", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.679.0.tgz", + "integrity": "sha512-Rg7t8RwUzKcumpipG4neZqaeJ6DF+Bco1+FHn5BZB68jpvwvjBjcQUuWkxj18B6ctYHr1fkunnzeKEn/+vy7+w==", + "dependencies": { + "@aws-sdk/core": "3.679.0", + "@aws-sdk/credential-provider-env": "3.679.0", + "@aws-sdk/credential-provider-http": "3.679.0", + "@aws-sdk/credential-provider-process": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.679.0", + "@aws-sdk/credential-provider-web-identity": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -581,21 +581,21 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.675.0" + "@aws-sdk/client-sts": "^3.679.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.675.0.tgz", - "integrity": "sha512-VO1WVZCDmAYu4sY/6qIBzdm5vJTxLhWKJWvL5kVFfSe8WiNNoHlTqYYUK9vAm/JYpIgFLTefPbIc5W4MK7o6Pg==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.667.0", - "@aws-sdk/credential-provider-http": "3.667.0", - "@aws-sdk/credential-provider-ini": "3.675.0", - "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.675.0", - "@aws-sdk/credential-provider-web-identity": "3.667.0", - "@aws-sdk/types": "3.667.0", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.679.0.tgz", + "integrity": "sha512-E3lBtaqCte8tWs6Rkssc8sLzvGoJ10TLGvpkijOlz43wPd6xCRh1YLwg6zolf9fVFtEyUs/GsgymiASOyxhFtw==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.679.0", + "@aws-sdk/credential-provider-http": "3.679.0", + "@aws-sdk/credential-provider-ini": "3.679.0", + "@aws-sdk/credential-provider-process": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.679.0", + "@aws-sdk/credential-provider-web-identity": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -607,12 +607,12 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz", - "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz", + "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ==", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -623,14 +623,14 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.675.0.tgz", - "integrity": "sha512-p/EE2c0ebSgRhg1Fe1OH2+xNl7j1P4DTc7kZy1mX1NJ72fkqnGgBuf1vk5J9RmiRpbauPNMlm+xohjkGS7iodA==", - "dependencies": { - "@aws-sdk/client-sso": "3.675.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/token-providers": "3.667.0", - "@aws-sdk/types": "3.667.0", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.679.0.tgz", + "integrity": "sha512-SAtWonhi9asxn0ukEbcE81jkyanKgqpsrtskvYPpO9Z9KOednM4Cqt6h1bfcS9zaHjN2zu815Gv8O7WiV+F/DQ==", + "dependencies": { + "@aws-sdk/client-sso": "3.679.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/token-providers": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -641,12 +641,12 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz", - "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz", + "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung==", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -655,16 +655,16 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.667.0" + "@aws-sdk/client-sts": "^3.679.0" } }, "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.667.0.tgz", - "integrity": "sha512-XGz4jMAkDoTyFdtLz7ZF+C05IAhCTC1PllpvTBaj821z/L0ilhbqVhrT/f2Buw8Id/K5A390csGXgusXyrFFjA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.679.0.tgz", + "integrity": "sha512-5EpiPhhGgnF+uJR4DzWUk6Lx3pOn9oM6JGXxeHsiynfoBfq7vHMleq+uABHHSQS+y7XzbyZ7x8tXNQlliMwOsg==", "dependencies": { - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-arn-parser": "3.568.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-arn-parser": "3.679.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", @@ -676,11 +676,11 @@ } }, "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.667.0.tgz", - "integrity": "sha512-0TiSL9S5DSG95NHGIz6qTMuV7GDKVn8tvvGSrSSZu/wXO3JaYSH0AElVpYfc4PtPRqVpEyNA7nnc7W56mMCLWQ==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.679.0.tgz", + "integrity": "sha512-nYsh9PdWrF4EahTRdXHGlNud82RPc508CNGdh1lAGfPU3tNveGfMBX3PcGBtPOse3p9ebNKRWVmUc9eXSjGvHA==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -690,14 +690,14 @@ } }, "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.669.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.669.0.tgz", - "integrity": "sha512-01UQLoUzVwWMf+b+AEuwJ2lluBD+Cp8AcbyEHqvEaPdjGKHIS4BCvnY70mZYnAfRtL8R2h9tt7iI61oWU3Gjkg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.679.0.tgz", + "integrity": "sha512-2Nf3rnrcog3GRRdXxc623wkQPH3WXhz8oZ+KHuXBeBKX01zbp7bz22QAZKqw3Oo2lv+LQNEDzIfQYn7leXLZGQ==", "dependencies": { "@aws-crypto/crc32": "5.2.0", "@aws-crypto/crc32c": "5.2.0", - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/is-array-buffer": "^3.0.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/protocol-http": "^4.1.4", @@ -711,11 +711,11 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz", - "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz", + "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -725,11 +725,11 @@ } }, "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.667.0.tgz", - "integrity": "sha512-ob85H3HhT3/u5O+x0o557xGZ78vSNeSSwMaSitxdsfs2hOuoUl1uk+OeLpi1hkuJnL41FPpokV7TVII2XrFfmg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.679.0.tgz", + "integrity": "sha512-SA1C1D3XgoKTGxyNsOqd016ONpk46xJLWDgJUd00Zb21Ox5wYCoY6aDRKiaMRW+1VfCJdezs1Do3XLyIU9KxyA==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, @@ -738,11 +738,11 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz", - "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz", + "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, @@ -751,11 +751,11 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz", - "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz", + "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -765,13 +765,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.674.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.674.0.tgz", - "integrity": "sha512-IvXnWrKy4mO+I44kLYHd6Wlw+FdB4sg1jvHCmnZo1KNaAFIA3x1iXgOaZynKoBdEmol3xfr2uDbeXUQvIwoIgg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.679.0.tgz", + "integrity": "sha512-4zcT193F7RkEfqlS6ZdwyNQ0UUp9s66msNXgItugasTbjf7oqfWDas7N+BG8ADB/Ql3wvRUh9I+zdrVkxxw3BQ==", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-arn-parser": "3.568.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-arn-parser": "3.679.0", "@smithy/core": "^2.4.8", "@smithy/node-config-provider": "^3.1.8", "@smithy/protocol-http": "^4.1.4", @@ -789,11 +789,11 @@ } }, "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.667.0.tgz", - "integrity": "sha512-1wuAUZIkmZIvOmGg5qNQU821CGFHhkuKioxXgNh0DpUxZ9+AeiV7yorJr+bqkb2KBFv1i1TnzGRecvKf/KvZIQ==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.679.0.tgz", + "integrity": "sha512-4GNUxXbs1M71uFHRiCAZtN0/g23ogI9YjMe5isAuYMHXwDB3MhqF7usKf954mBP6tplvN44vYlbJ84faaLrTtg==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, @@ -802,13 +802,13 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.669.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz", - "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.679.0.tgz", + "integrity": "sha512-4hdeXhPDURPqQLPd9jCpUEo9fQITXl3NM3W1MwcJpE0gdUM36uXkQOYsTPeeU/IRCLVjK8Htlh2oCaM9iJrLCA==", "dependencies": { - "@aws-sdk/core": "3.667.0", - "@aws-sdk/types": "3.667.0", - "@aws-sdk/util-endpoints": "3.667.0", + "@aws-sdk/core": "3.679.0", + "@aws-sdk/types": "3.679.0", + "@aws-sdk/util-endpoints": "3.679.0", "@smithy/core": "^2.4.8", "@smithy/protocol-http": "^4.1.4", "@smithy/types": "^3.5.0", @@ -819,11 +819,11 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz", - "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz", + "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", "@smithy/util-config-provider": "^3.0.0", @@ -835,12 +835,12 @@ } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.674.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.674.0.tgz", - "integrity": "sha512-VMQWbtcbg4FV/fILrODADV21pPg9AghuEzQlW2kH0hCtacvBwFl7eBxIiCBLLtkNple+CVPJvyBcqOZdBkEv/w==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.679.0.tgz", + "integrity": "sha512-g1D57e7YBhgXihCWIRBcTUvKquS3FS27xuA24EynY9teiTIq7vHkASxxDnMMMcmKHnCKLI5pkznjk0PuDJ4uJw==", "dependencies": { - "@aws-sdk/middleware-sdk-s3": "3.674.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/middleware-sdk-s3": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/signature-v4": "^4.2.0", "@smithy/types": "^3.5.0", @@ -851,11 +851,11 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz", - "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz", + "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", "@smithy/types": "^3.5.0", @@ -865,13 +865,13 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.667.0" + "@aws-sdk/client-sso-oidc": "^3.679.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz", - "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz", + "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==", "dependencies": { "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -881,9 +881,9 @@ } }, "node_modules/@aws-sdk/util-arn-parser": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.568.0.tgz", - "integrity": "sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.679.0.tgz", + "integrity": "sha512-CwzEbU8R8rq9bqUFryO50RFBlkfufV9UfMArHPWlo+lmsC+NlSluHQALoj6Jkq3zf5ppn1CN0c1DDLrEqdQUXg==", "dependencies": { "tslib": "^2.6.2" }, @@ -892,11 +892,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.667.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz", - "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz", + "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "@smithy/util-endpoints": "^2.1.3", "tslib": "^2.6.2" @@ -906,9 +906,9 @@ } }, "node_modules/@aws-sdk/util-locate-window": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz", - "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz", + "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA==", "dependencies": { "tslib": "^2.6.2" }, @@ -917,23 +917,23 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.675.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz", - "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz", + "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==", "dependencies": { - "@aws-sdk/types": "3.667.0", + "@aws-sdk/types": "3.679.0", "@smithy/types": "^3.5.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.669.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz", - "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.679.0.tgz", + "integrity": "sha512-Bw4uXZ+NU5ed6TNfo4tBbhBSW+2eQxXYjYBGl5gLUNUpg2pDFToQAP6rXBFiwcG52V2ny5oLGiD82SoYuYkAVg==", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.669.0", - "@aws-sdk/types": "3.667.0", + "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/types": "3.679.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -951,9 +951,9 @@ } }, "node_modules/@aws-sdk/xml-builder": { - "version": "3.662.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.662.0.tgz", - "integrity": "sha512-ikLkXn0igUpnJu2mCZjklvmcDGWT9OaLRv3JyC/cRkTaaSrblPjPM7KKsltxdMTLQ+v7fjCN0TsJpxphMfaOPA==", + "version": "3.679.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.679.0.tgz", + "integrity": "sha512-nPmhVZb39ty5bcQ7mAwtjezBcsBqTYZ9A2D9v/lE92KCLdu5RhSkPH7O71ZqbZx1mUSg9fAOxHPiG79U5VlpLQ==", "dependencies": { "@smithy/types": "^3.5.0", "tslib": "^2.6.2" @@ -963,12 +963,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", - "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz", + "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==", "dev": true, "dependencies": { - "@babel/highlight": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -976,30 +977,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz", - "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.0.tgz", + "integrity": "sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", - "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helpers": "^7.25.7", - "@babel/parser": "^7.25.8", - "@babel/template": "^7.25.7", - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.8", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -1053,12 +1054,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", - "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz", + "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==", "dev": true, "dependencies": { - "@babel/types": "^7.25.7", + "@babel/parser": "^7.26.0", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -1068,13 +1070,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", - "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.25.7", - "@babel/helper-validator-option": "^7.25.7", + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -1108,28 +1110,27 @@ "dev": true }, "node_modules/@babel/helper-module-imports": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", - "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", - "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.25.7", - "@babel/helper-simple-access": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1138,152 +1139,53 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-simple-access": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", - "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", - "dev": true, - "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-string-parser": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", - "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", - "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", - "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz", - "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", - "dev": true, - "dependencies": { - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", - "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.25.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", - "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.0.tgz", + "integrity": "sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==", "dev": true, "dependencies": { - "@babel/types": "^7.25.8" + "@babel/types": "^7.26.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -1293,9 +1195,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", - "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1304,30 +1206,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", - "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", - "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1368,14 +1270,13 @@ "dev": true }, "node_modules/@babel/types": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", - "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2778,11 +2679,11 @@ "integrity": "sha512-jYvz8UMLDgy3a5SkGJne8H7VA7zPV2Lwohjx0V8V31+SqAjNmurWMkk9cQhfvlcnXWudBpK9xPM1n4rljOcHYQ==" }, "node_modules/@types/node": { - "version": "22.7.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz", - "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==", + "version": "22.8.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.0.tgz", + "integrity": "sha512-84rafSBHC/z1i1E3p0cJwKA+CfYDNSXX9WSZBRopjIzLET8oNt6ht2tei4C7izwDeEiLLfdeSVBv1egOH916hg==", "dependencies": { - "undici-types": "~6.19.2" + "undici-types": "~6.19.8" } }, "node_modules/@types/responselike": { @@ -4349,9 +4250,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.5.41", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz", - "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==", + "version": "1.5.46", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.46.tgz", + "integrity": "sha512-1XDk0Z8/YRgB2t5GeEg8DPK592DLjVmd/5uwAu6c/S4Z0CUwV/RwYqe5GWxQqcoN3bJ5U7hYMiMRPZzpCzSBhQ==", "dev": true }, "node_modules/emoji-regex": { @@ -4933,16 +4834,16 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz", - "integrity": "sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==", + "version": "7.37.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz", + "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==", "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", "array.prototype.flatmap": "^1.3.2", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.19", + "es-iterator-helpers": "^1.1.0", "estraverse": "^5.3.0", "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", @@ -11058,15 +10959,6 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index 8bdd72647..da4653984 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "mocha": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "mochaEncryption": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/com/eduworks/ec/crypto/*.test.js", "mochafast": "wait-on http://localhost/api/ping && mocha -b src/**/*.test.js", - "nyc": "nyc --reporter lcov npm run mocha", + "nyc": "nyc --reporter lcov npm run mocha", "automocha": "nodemon --watch ../cass-npm --watch . --exec \"npm run mocha\"", "automochafast": "nodemon --exec \"npm run mochafast\"", "run": "pm2 start ./pm2.config.js", @@ -92,7 +92,7 @@ }, "homepage": "https://github.com/cassproject/CASS#readme", "dependencies": { - "@aws-sdk/client-s3": "^3.676.0", + "@aws-sdk/client-s3": "^3.679.0", "@xmldom/xmldom": "^0.8.10", "aws-sdk": "^2.1691.0", "busboy": "^1.6.0", From 71d396d50bc996cc05e27bb5e0f269c0f93975be Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 10:46:39 -0700 Subject: [PATCH 04/21] WIP Sonar --- Dockerfile | 3 +- docker/fips/Dockerfile | 47 ------------------- docker/fips/docker-compose.yml | 32 ------------- docker/standalone/Dockerfile | 2 +- docker/standalone/node/Dockerfile | 4 +- docker/test/Dockerfile | 2 +- docker/test/ubuntu-16.04-latest/Dockerfile | 2 +- docker/test/ubuntu-18.04-latest/Dockerfile | 2 +- .../ubuntu-18.04-latest/Dockerfile-13to15 | 2 +- docker/test/ubuntu-20.04-latest/Dockerfile | 2 +- 10 files changed, 9 insertions(+), 89 deletions(-) delete mode 100644 docker/fips/Dockerfile delete mode 100644 docker/fips/docker-compose.yml diff --git a/Dockerfile b/Dockerfile index f5a59abbb..cf253a480 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM node:20.15.1-bullseye-slim WORKDIR /app COPY package*.json ./ -COPY pm2.test.config.js ./pm2.config.js RUN npm install --omit=dev COPY src src -CMD npm run run && npm run logs \ No newline at end of file +ENTRYPOINT ["node","src/main/server.js"] \ No newline at end of file diff --git a/docker/fips/Dockerfile b/docker/fips/Dockerfile deleted file mode 100644 index 5f0f8b348..000000000 --- a/docker/fips/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:8.8.1 - -RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - -RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy nodejs git build-essential checkinstall zlib1g-dev wget libssl-dev curl clang - -RUN openssl version -RUN cd /usr/local/src && wget https://www.openssl.org/source/openssl-3.0.5.tar.gz && tar xvf openssl-3.0.5.tar.gz && cd openssl-3.0.5 && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib enable-fips linux-x86_64 && make -j8 > make.log && make install > makeinstall.log && make install_ssldirs > makeinstallssldirs.log && make install_fips > makeinstallfips.log && cd / -RUN openssl version - -RUN git clone https://github.com/nodejs/node.git -b v18.3.0 -RUN cd node && export OPENSSL_ENABLE_MD5_VERIFY=true && export OPENSSL_CONF=/usr/local/ssl/openssl.cnf && export OPENSSL_MODULES=/usr/local/ssl/lib64/ossl-modules && ./configure --shared-openssl --shared-openssl-libpath=/usr/local/ssl/lib64 --shared-openssl-includes=/usr/local/ssl/include --shared-openssl-libname=crypto,ssl --openssl-is-fips > configure.log && export LD_LIBRARY_PATH=/usr/local/ssl/lib64 && make -j8 > make.log && make install > makeinstall.log && cd .. - -ENV OPENSSL_ENABLE_MD5_VERIFY=true -ENV OPENSSL_CONF=/usr/local/ssl/openssl.cnf -ENV OPENSSL_MODULES=/usr/local/ssl/lib64/ossl-modules -ENV LD_LIBRARY_PATH=/usr/local/ssl/lib64 -ENV HTTP2=false -ENV FIPS=true - -RUN echo '.include /usr/local/ssl/fipsmodule.cnf' >> /usr/local/ssl/openssl.cnf -RUN echo '[provider_sect]' >> /usr/local/ssl/openssl.cnf -RUN echo 'default = default_sect' >> /usr/local/ssl/openssl.cnf -RUN echo 'fips = fips_sect' >> /usr/local/ssl/openssl.cnf -RUN echo '[default_sect]' >> /usr/local/ssl/openssl.cnf -RUN echo 'activate = 1' >> /usr/local/ssl/openssl.cnf - -RUN mkdir CASS -COPY package.json CASS/package.json -RUN cd CASS && npm install && cd .. -COPY src CASS/src -COPY etc CASS/etc -COPY ca.crt CASS/ca.crt -COPY cass.crt CASS/cass.crt -COPY cass.key CASS/cass.key -COPY pm2.standalone.config.js CASS/pm2.standalone.config.js -COPY copyright.txt CASS/copyright.txt -COPY LICENSE CASS/LICENSE -RUN cd CASS - -RUN echo 'discovery.type: single-node' >> config/elasticsearch.yml -RUN echo 'node.name: cass-a' >> config/elasticsearch.yml -RUN echo '-Xms4g' >> config/jvm.options -RUN echo '-Xmx4g' >> config/jvm.options - -EXPOSE 80 -VOLUME ["/usr/share/elasticsearch/data","/usr/share/elasticsearch/CASS/etc","/usr/share/elasticsearch/CASS/logs"] -ENTRYPOINT /usr/local/bin/docker-entrypoint.sh & (cd CASS && npm run run:standalone && npm run logs) \ No newline at end of file diff --git a/docker/fips/docker-compose.yml b/docker/fips/docker-compose.yml deleted file mode 100644 index e560bc203..000000000 --- a/docker/fips/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: '3' -services: - cass: - image: cassproject/cass:1.5.6 - container_name: cass - networks: - - esnet - ports: - - 80:80 - environment: - - CASS_LOOPBACK=http://localhost/api/ - - ELASTICSEARCH_ENDPOINT=http://elasticsearch:9200 - - PORT=80 - # - CASS_OIDC_ENABLED=true # turns on open id login - # - CASS_OIDC_ISSUER_BASE_URL=http://keycloak:8080/auth/realms/master/ # point at your keycloak realm - # - CASS_OIDC_CLIENT_ID=cass # name of your keycloak client - # - CASS_OIDC_SECRET=M2nn59wDxkwUZ9SVEVAJADYnUeKP78vU # secret from your keycloak client - # - CASS_OIDC_BASE_URL=http://localhost/ # where to redirect after login - ulimits: - memlock: - soft: -1 - hard: -1 - volumes: - - etc:/usr/share/elasticsearch/CASS/etc - - data:/usr/share/elasticsearch/data -volumes: - etc: - driver: local - data: - driver: local -networks: - esnet: \ No newline at end of file diff --git a/docker/standalone/Dockerfile b/docker/standalone/Dockerfile index 868f2d18f..b04d9ed09 100644 --- a/docker/standalone/Dockerfile +++ b/docker/standalone/Dockerfile @@ -5,7 +5,7 @@ RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy nodejs && apt upgrade -qqy && apt clean RUN openssl version -RUN apt install -qqy build-essential checkinstall zlib1g-dev wget libssl-dev curl clang && cd /usr/local/src && wget https://www.openssl.org/source/openssl-3.0.8.tar.gz && tar xvf openssl-3.0.8.tar.gz && cd openssl-3.0.8 && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib enable-fips linux-x86_64 && make -j8 > make.log && make install > makeinstall.log && make install_ssldirs > makeinstallssldirs.log && make install_fips > makeinstallfips.log && cd / && apt remove -qqy build-essential checkinstall zlib1g-dev wget libssl-dev curl clang && rm -rf cd /usr/local/src/openssl-3.0.8 && apt autoremove -qqy && apt clean +RUN apt install -qqy build-essential checkinstall clang curl libssl-dev wget zlib1g-dev && cd /usr/local/src && wget https://www.openssl.org/source/openssl-3.0.8.tar.gz && tar xvf openssl-3.0.8.tar.gz && cd openssl-3.0.8 && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib enable-fips linux-x86_64 && make -j8 > make.log && make install > makeinstall.log && make install_ssldirs > makeinstallssldirs.log && make install_fips > makeinstallfips.log && cd / && apt remove -qqy build-essential checkinstall zlib1g-dev wget libssl-dev curl clang && rm -rf cd /usr/local/src/openssl-3.0.8 && apt autoremove -qqy && apt clean RUN openssl version ENV OPENSSL_CONF=/usr/local/ssl/nodejs.cnf diff --git a/docker/standalone/node/Dockerfile b/docker/standalone/node/Dockerfile index a70284f5c..8efb94877 100644 --- a/docker/standalone/node/Dockerfile +++ b/docker/standalone/node/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app COPY package.json ./ RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt update && apt dist-upgrade -y && apt clean -RUN apt install -qqy build-essential checkinstall zlib1g-dev wget libssl-dev curl clang && cd /usr/local/src && wget https://www.openssl.org/source/openssl-3.0.9.tar.gz && tar xvf openssl-3.0.9.tar.gz && cd openssl-3.0.9 && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib enable-fips linux-x86_64 && make -j8 > make.log && make install > makeinstall.log && make install_ssldirs > makeinstallssldirs.log && make install_fips > makeinstallfips.log && cd / && rm -rf cd /usr/local/src/openssl-3.0.8 && apt remove -qqy build-essential checkinstall zlib1g-dev wget libssl-dev curl clang && apt autoremove -qqy && apt clean +RUN apt install -qqy build-essential checkinstall clang curl libssl-dev wget zlib1g-dev && cd /usr/local/src && wget https://www.openssl.org/source/openssl-3.0.9.tar.gz && tar xvf openssl-3.0.9.tar.gz && cd openssl-3.0.9 && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib enable-fips linux-x86_64 && make -j8 > make.log && make install > makeinstall.log && make install_ssldirs > makeinstallssldirs.log && make install_fips > makeinstallfips.log && cd / && rm -rf cd /usr/local/src/openssl-3.0.8 && apt remove -qqy build-essential checkinstall zlib1g-dev wget libssl-dev curl clang && apt autoremove -qqy && apt clean RUN openssl version ENV OPENSSL_CONF=/usr/local/ssl/nodejs.cnf @@ -29,4 +29,4 @@ COPY copyright.txt copyright.txt COPY LICENSE LICENSE EXPOSE 80 ENV HTTP2=false -CMD node --force-fips ./src/main/server.js \ No newline at end of file +ENTRYPOINT [ "node", "--force-fips", "./src/main/server.js" ] \ No newline at end of file diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index bf47fcd74..f2a16ca40 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -2,7 +2,7 @@ FROM docker.elastic.co/elasticsearch/elasticsearch:8.8.1 RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy -RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy nodejs git +RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy git nodejs ENV CASS_VERSION=1.5 COPY src CASS/src diff --git a/docker/test/ubuntu-16.04-latest/Dockerfile b/docker/test/ubuntu-16.04-latest/Dockerfile index f36774728..7cef5796b 100644 --- a/docker/test/ubuntu-16.04-latest/Dockerfile +++ b/docker/test/ubuntu-16.04-latest/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:xenial-20210416 RUN sed -i -e 's/http:\/\/archive/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list RUN sed -i -e 's/http:\/\/security/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list -RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && apt install -qqy dos2unix ca-certificates curl software-properties-common lsb-core sudo vim systemd gawk git wget +RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && apt install -qqy ca-certificates curl dos2unix gawk git lsb-core software-properties-common sudo systemd vim wget COPY scripts/cassInstall.sh cassInstall.sh RUN chmod 755 cassInstall.sh && chown root:root cassInstall.sh && dos2unix cassInstall.sh ENV CASS_VERSION=1.5 diff --git a/docker/test/ubuntu-18.04-latest/Dockerfile b/docker/test/ubuntu-18.04-latest/Dockerfile index 081720cc9..2f6e0ae60 100644 --- a/docker/test/ubuntu-18.04-latest/Dockerfile +++ b/docker/test/ubuntu-18.04-latest/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 RUN sed -i -e 's/http:\/\/archive/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list RUN sed -i -e 's/http:\/\/security/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list -RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && apt install -qqy dos2unix ca-certificates curl software-properties-common lsb-core sudo vim systemd gawk git wget +RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && apt install -qqy ca-certificates curl dos2unix gawk git lsb-core software-properties-common sudo systemd vim wget COPY scripts/cassInstall.sh cassInstall.sh RUN chmod 755 cassInstall.sh && chown root:root cassInstall.sh && dos2unix cassInstall.sh ENV CASS_VERSION=1.5 diff --git a/docker/test/ubuntu-18.04-latest/Dockerfile-13to15 b/docker/test/ubuntu-18.04-latest/Dockerfile-13to15 index ad93f4729..ebf1c9356 100644 --- a/docker/test/ubuntu-18.04-latest/Dockerfile-13to15 +++ b/docker/test/ubuntu-18.04-latest/Dockerfile-13to15 @@ -1,7 +1,7 @@ FROM ubuntu:18.04 RUN sed -i -e 's/http:\/\/archive/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list RUN sed -i -e 's/http:\/\/security/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list -RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && apt install -qqy dos2unix ca-certificates curl software-properties-common lsb-core sudo vim systemd gawk git wget +RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && apt install -qqy ca-certificates curl dos2unix gawk git lsb-core software-properties-common sudo systemd vim wget COPY scripts/cassInstall.sh cassInstall.sh RUN chmod 755 cassInstall.sh && chown root:root cassInstall.sh && dos2unix cassInstall.sh RUN ./cassInstall.sh 1.3.15 && ./cassInstall.sh 1.5 diff --git a/docker/test/ubuntu-20.04-latest/Dockerfile b/docker/test/ubuntu-20.04-latest/Dockerfile index 2ec5b4e0c..f8c5014d4 100644 --- a/docker/test/ubuntu-20.04-latest/Dockerfile +++ b/docker/test/ubuntu-20.04-latest/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 RUN sed -i -e 's/http:\/\/archive/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list RUN sed -i -e 's/http:\/\/security/mirror:\/\/mirrors/' -e 's/\/ubuntu\//\/mirrors.txt/' /etc/apt/sources.list -RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy dos2unix ca-certificates curl software-properties-common lsb-core sudo vim systemd gawk git wget +RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt upgrade -qqy && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy ca-certificates curl dos2unix gawk git lsb-core software-properties-common sudo systemd vim wget COPY scripts/cassInstall.sh cassInstall.sh RUN chmod 755 cassInstall.sh && chown root:root cassInstall.sh && dos2unix cassInstall.sh ENV CASS_VERSION=1.5 From 308f19de95a6af870138febea419809680c366ad Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 10:50:11 -0700 Subject: [PATCH 05/21] WIP Sonar --- package-lock.json | 68 ++++++++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 30 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 218e28ce5..23fa1f3ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "express-ws": "^5.0.2", "node-object-hash": "^2.3.10", "node-worker-threads-pool": "^1.5.1", - "nodemailer": "^6.9.15", + "nodemailer": "^6.9.16", "pm2": "^5.4.2", "pure-uuid": "^1.8.1", "rdflib": "^2.2.35", @@ -1180,9 +1180,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.0.tgz", - "integrity": "sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==", + "version": "7.26.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.1.tgz", + "integrity": "sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==", "dev": true, "dependencies": { "@babel/types": "^7.26.0" @@ -1307,23 +1307,26 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz", - "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -2679,9 +2682,9 @@ "integrity": "sha512-jYvz8UMLDgy3a5SkGJne8H7VA7zPV2Lwohjx0V8V31+SqAjNmurWMkk9cQhfvlcnXWudBpK9xPM1n4rljOcHYQ==" }, "node_modules/@types/node": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.0.tgz", - "integrity": "sha512-84rafSBHC/z1i1E3p0cJwKA+CfYDNSXX9WSZBRopjIzLET8oNt6ht2tei4C7izwDeEiLLfdeSVBv1egOH916hg==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz", + "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==", "dependencies": { "undici-types": "~6.19.8" } @@ -2731,9 +2734,9 @@ } }, "node_modules/acorn": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", - "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "bin": { "acorn": "bin/acorn" }, @@ -3447,9 +3450,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001669", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz", - "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==", + "version": "1.0.30001673", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001673.tgz", + "integrity": "sha512-WTrjUCSMp3LYX0nE12ECkV0a+e6LC85E0Auz75555/qr78Oc8YWhEPNfDd6SHdtlCMSzqtuXY0uyEMNRcsKpKw==", "dev": true, "funding": [ { @@ -4250,9 +4253,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.5.46", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.46.tgz", - "integrity": "sha512-1XDk0Z8/YRgB2t5GeEg8DPK592DLjVmd/5uwAu6c/S4Z0CUwV/RwYqe5GWxQqcoN3bJ5U7hYMiMRPZzpCzSBhQ==", + "version": "1.5.47", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz", + "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==", "dev": true }, "node_modules/emoji-regex": { @@ -5754,19 +5757,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/fu": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/fu/-/fu-0.1.0.tgz", @@ -8070,9 +8060,9 @@ "integrity": "sha512-7TXAhpMm+jO4MfESxYLtMGSnJWv+itdNHMdaFmeZuPXxwFGU90mtEB42BciUULXOUAxYBfXILAuvrSG3rQZ7mw==" }, "node_modules/nodemailer": { - "version": "6.9.15", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.15.tgz", - "integrity": "sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ==", + "version": "6.9.16", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz", + "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==", "engines": { "node": ">=6.0.0" } diff --git a/package.json b/package.json index da4653984..1acd36137 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "express-ws": "^5.0.2", "node-object-hash": "^2.3.10", "node-worker-threads-pool": "^1.5.1", - "nodemailer": "^6.9.15", + "nodemailer": "^6.9.16", "pm2": "^5.4.2", "pure-uuid": "^1.8.1", "rdflib": "^2.2.35", From 0f84d1638c322b65fb494fcf55d61f50f497d422 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 11:00:50 -0700 Subject: [PATCH 06/21] Updated libraries. --- package-lock.json | 788 ++++++++++++++++++++++++++++++++-------------- package.json | 18 +- 2 files changed, 563 insertions(+), 243 deletions(-) diff --git a/package-lock.json b/package-lock.json index 23fa1f3ff..95a9a83fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,19 +10,19 @@ "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-s3": "^3.679.0", - "@xmldom/xmldom": "^0.8.10", + "@xmldom/xmldom": "^0.9.5", "aws-sdk": "^2.1691.0", "busboy": "^1.6.0", "cassproject": "^1.5.66", "check-disk-space": "^3.4.0", "compression": "^1.7.4", "cors": "^2.8.5", - "cron": "^2.4.4", + "cron": "^3.1.7", "express": "^4.21.1", "express-jwt": "^8.4.1", "express-openid-connect": "^2.17.1", "express-ws": "^5.0.2", - "node-object-hash": "^2.3.10", + "node-object-hash": "^3.0.0", "node-worker-threads-pool": "^1.5.1", "nodemailer": "^6.9.16", "pm2": "^5.4.2", @@ -31,19 +31,19 @@ "spdy": "^4.0.2", "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.1", - "undici": "6.10.2", - "uuid": "^9.0.1", + "undici": "^6.20.1", + "uuid": "^11.0.2", "ws": "^8.18.0" }, "devDependencies": { - "chai": "^4.5.0", - "eslint": "^8.57.1", + "chai": "^5.1.2", + "eslint": "^9.13.0", "eslint-config-google": "^0.14.0", "mocha": "^10.7.3", "nodemon": "^3.1.7", "npm-run-all": "^4.1.5", - "nyc": "^15.1.0", - "wait-on": "^7.2.0" + "nyc": "^17.1.0", + "wait-on": "^8.0.1" } }, "node_modules/@ampproject/remapping": { @@ -1331,15 +1331,57 @@ "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", + "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@eslint/config-array/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/@eslint/core": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz", + "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -1347,7 +1389,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1375,11 +1417,30 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz", + "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.2.tgz", + "integrity": "sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==", + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@fastify/busboy": { @@ -1411,6 +1472,26 @@ "@hapi/hoek": "^9.0.0" } }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", @@ -1464,6 +1545,18 @@ "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", "deprecated": "Use @eslint/object-schema instead" }, + "node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -2235,6 +2328,18 @@ "node": ">=16.0.0" } }, + "node_modules/@smithy/middleware-retry/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@smithy/middleware-serde": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz", @@ -2645,6 +2750,11 @@ "@types/responselike": "^1.0.0" } }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==" + }, "node_modules/@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", @@ -2677,9 +2787,9 @@ } }, "node_modules/@types/luxon": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.8.tgz", - "integrity": "sha512-jYvz8UMLDgy3a5SkGJne8H7VA7zPV2Lwohjx0V8V31+SqAjNmurWMkk9cQhfvlcnXWudBpK9xPM1n4rljOcHYQ==" + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==" }, "node_modules/@types/node": { "version": "22.8.1", @@ -2703,11 +2813,11 @@ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" }, "node_modules/@xmldom/xmldom": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", - "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.5.tgz", + "integrity": "sha512-6g1EwSs8cr8JhP1iBxzyVAWM6BIDvx9Y3FZRIQiMDzgG43Pxi8YkWOZ0nQj2NHgNzgXDZbJewFx/n+YAvMZrfg==", "engines": { - "node": ">=10.0.0" + "node": ">=14.6" } }, "node_modules/abort-controller": { @@ -3056,12 +3166,12 @@ } }, "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", "dev": true, "engines": { - "node": "*" + "node": ">=12" } }, "node_modules/ast-types": { @@ -3491,21 +3601,19 @@ } }, "node_modules/chai": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", - "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz", + "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==", "dev": true, "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.1.0" + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" }, "engines": { - "node": ">=4" + "node": ">=12" } }, "node_modules/chalk": { @@ -3537,15 +3645,12 @@ } }, "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", "dev": true, - "dependencies": { - "get-func-name": "^2.0.2" - }, "engines": { - "node": "*" + "node": ">= 16" } }, "node_modules/chokidar": { @@ -3859,12 +3964,12 @@ } }, "node_modules/cron": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/cron/-/cron-2.4.4.tgz", - "integrity": "sha512-MHlPImXJj3K7x7lyUHjtKEOl69CSlTOWxS89jiFgNkzXfvhVjhMz/nc7/EIfN9vgooZp8XTtXJ1FREdmbyXOiQ==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/cron/-/cron-3.1.7.tgz", + "integrity": "sha512-tlBg7ARsAMQLzgwqVxy8AZl/qlTc5nibqYwtNGoCrd+cV+ugI+tvZC1oT/8dFH8W455YrywGykx/KMmAqOr7Jw==", "dependencies": { - "@types/luxon": "~3.3.0", - "luxon": "~3.3.0" + "@types/luxon": "~3.4.0", + "luxon": "~3.4.0" } }, "node_modules/croner": { @@ -4026,13 +4131,10 @@ } }, "node_modules/deep-eql": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", - "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, "engines": { "node": ">=6" } @@ -4525,58 +4627,62 @@ } }, "node_modules/eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz", + "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", + "@eslint-community/regexpp": "^4.11.0", + "@eslint/config-array": "^0.18.0", + "@eslint/core": "^0.7.0", + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "9.13.0", + "@eslint/plugin-kit": "^0.2.0", + "@humanfs/node": "^0.16.5", "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", + "@humanwhocodes/retry": "^0.3.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.1.0", + "eslint-visitor-keys": "^4.1.0", + "espree": "^10.2.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", "text-table": "^0.2.0" }, "bin": { "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-config-google": { @@ -4591,57 +4697,6 @@ "eslint": ">=5.16.0" } }, - "node_modules/eslint-config-standard": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", - "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "eslint": "^8.0.1", - "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", - "eslint-plugin-promise": "^6.0.0" - } - }, - "node_modules/eslint-config-standard-jsx": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", - "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "peerDependencies": { - "eslint": "^8.8.0", - "eslint-plugin-react": "^7.28.0" - } - }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", @@ -4903,15 +4958,15 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", + "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -4969,6 +5024,17 @@ } } }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", + "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -5107,16 +5173,27 @@ } }, "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz", + "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==", "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.1.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", + "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -5523,14 +5600,14 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/fill-range": { @@ -5603,16 +5680,15 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16" } }, "node_modules/flatted": { @@ -5757,6 +5833,19 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/fu": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/fu/-/fu-0.1.0.tgz", @@ -5821,15 +5910,6 @@ "node": "6.* || 8.* || >= 10.*" } }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/get-intrinsic": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", @@ -5983,14 +6063,11 @@ } }, "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dependencies": { - "type-fest": "^0.20.2" - }, + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "engines": { - "node": ">=8" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -6891,27 +6968,19 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/istanbul-lib-processinfo": { @@ -7501,13 +7570,10 @@ } }, "node_modules/loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.1" - } + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz", + "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==", + "dev": true }, "node_modules/lowercase-keys": { "version": "2.0.0", @@ -7529,9 +7595,9 @@ } }, "node_modules/luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", "engines": { "node": ">=12" } @@ -8029,11 +8095,12 @@ } }, "node_modules/node-object-hash": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.10.tgz", - "integrity": "sha512-jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-3.0.0.tgz", + "integrity": "sha512-jLF6tlyletktvSAawuPmH1SReP0YfZQ+tBrDiTCK+Ai7eXPMS9odi5xW/iKC7ZhrWJJ0Z5xYcW/x+1fVMn1Qvw==", "engines": { - "node": ">=0.10.0" + "node": ">=16", + "pnpm": ">=8" } }, "node_modules/node-preload": { @@ -8360,9 +8427,9 @@ "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==" }, "node_modules/nyc": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", - "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.1.0.tgz", + "integrity": "sha512-U42vQ4czpKa0QdI1hu950XuNhYqgoM+ZF1HT+VuUHL9hPfDPVvNQyltmMqdE9bUHMVa+8yNbc3QKTj8zQhlVxQ==", "dev": true, "dependencies": { "@istanbuljs/load-nyc-config": "^1.0.0", @@ -8372,12 +8439,12 @@ "decamelize": "^1.2.0", "find-cache-dir": "^3.2.0", "find-up": "^4.1.0", - "foreground-child": "^2.0.0", + "foreground-child": "^3.3.0", "get-package-type": "^0.1.0", "glob": "^7.1.6", "istanbul-lib-coverage": "^3.0.0", "istanbul-lib-hook": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-instrument": "^6.0.2", "istanbul-lib-processinfo": "^2.0.2", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", @@ -8397,7 +8464,7 @@ "nyc": "bin/nyc.js" }, "engines": { - "node": ">=8.9" + "node": ">=18" } }, "node_modules/nyc/node_modules/cliui": { @@ -8424,6 +8491,34 @@ "node": ">=8" } }, + "node_modules/nyc/node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/nyc/node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/nyc/node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -8930,12 +9025,12 @@ } }, "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", "dev": true, "engines": { - "node": "*" + "node": ">= 14.16" } }, "node_modules/pem-jwk": { @@ -9721,6 +9816,14 @@ "solid-namespace": "^0.5.3" } }, + "node_modules/rdflib/node_modules/@xmldom/xmldom": { + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -10623,6 +10726,232 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/standard/node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/standard/node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/standard/node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/standard/node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/standard/node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/standard/node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/standard/node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/standard/node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/standard/node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/standard/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/standard/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -11045,15 +11374,6 @@ "node": ">= 0.8.0" } }, - "node_modules/type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -11176,11 +11496,11 @@ "dev": true }, "node_modules/undici": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.10.2.tgz", - "integrity": "sha512-HcVuBy7ACaDejIMdwCzAvO22OsiE6ir6ziTIr9kAE0vB+PheVe29ZvRN8p7FXCO2uZHTjEoUs5bPiFpuc/hwwQ==", + "version": "6.20.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz", + "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==", "engines": { - "node": ">=18.0" + "node": ">=18.17" } }, "node_modules/undici-types": { @@ -11287,15 +11607,15 @@ } }, "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.2.tgz", + "integrity": "sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], "bin": { - "uuid": "dist/bin/uuid" + "uuid": "dist/esm/bin/uuid" } }, "node_modules/validate-npm-package-license": { @@ -11355,13 +11675,13 @@ } }, "node_modules/wait-on": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz", - "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.1.tgz", + "integrity": "sha512-1wWQOyR2LVVtaqrcIL2+OM+x7bkpmzVROa0Nf6FryXkS+er5Sa1kzFGjzZRqLnHa3n1rACFLeTwUqE1ETL9Mig==", "dev": true, "dependencies": { - "axios": "^1.6.1", - "joi": "^17.11.0", + "axios": "^1.7.7", + "joi": "^17.13.3", "lodash": "^4.17.21", "minimist": "^1.2.8", "rxjs": "^7.8.1" diff --git a/package.json b/package.json index 1acd36137..718743b04 100644 --- a/package.json +++ b/package.json @@ -93,19 +93,19 @@ "homepage": "https://github.com/cassproject/CASS#readme", "dependencies": { "@aws-sdk/client-s3": "^3.679.0", - "@xmldom/xmldom": "^0.8.10", + "@xmldom/xmldom": "^0.9.5", "aws-sdk": "^2.1691.0", "busboy": "^1.6.0", "cassproject": "^1.5.66", "check-disk-space": "^3.4.0", "compression": "^1.7.4", "cors": "^2.8.5", - "cron": "^2.4.4", + "cron": "^3.1.7", "express": "^4.21.1", "express-jwt": "^8.4.1", "express-openid-connect": "^2.17.1", "express-ws": "^5.0.2", - "node-object-hash": "^2.3.10", + "node-object-hash": "^3.0.0", "node-worker-threads-pool": "^1.5.1", "nodemailer": "^6.9.16", "pm2": "^5.4.2", @@ -114,18 +114,18 @@ "spdy": "^4.0.2", "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.1", - "undici": "6.10.2", - "uuid": "^9.0.1", + "undici": "^6.20.1", + "uuid": "^11.0.2", "ws": "^8.18.0" }, "devDependencies": { - "chai": "^4.5.0", - "eslint": "^8.57.1", + "chai": "^5.1.2", + "eslint": "^9.13.0", "eslint-config-google": "^0.14.0", "mocha": "^10.7.3", "nodemon": "^3.1.7", "npm-run-all": "^4.1.5", - "nyc": "^15.1.0", - "wait-on": "^7.2.0" + "nyc": "^17.1.0", + "wait-on": "^8.0.1" } } From 027eea7607a45238d556042dc0070ad814b437ae Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 11:24:55 -0700 Subject: [PATCH 07/21] Updated libraries. --- package-lock.json | 87 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 95a9a83fa..378dce8db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "ws": "^8.18.0" }, "devDependencies": { - "chai": "^5.1.2", + "chai": "4.5.0", "eslint": "^9.13.0", "eslint-config-google": "^0.14.0", "mocha": "^10.7.3", @@ -3166,12 +3166,12 @@ } }, "node_modules/assertion-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", - "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, "engines": { - "node": ">=12" + "node": "*" } }, "node_modules/ast-types": { @@ -3601,19 +3601,21 @@ } }, "node_modules/chai": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz", - "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", + "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, "dependencies": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.1.0" }, "engines": { - "node": ">=12" + "node": ">=4" } }, "node_modules/chalk": { @@ -3645,12 +3647,15 @@ } }, "node_modules/check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, + "dependencies": { + "get-func-name": "^2.0.2" + }, "engines": { - "node": ">= 16" + "node": "*" } }, "node_modules/chokidar": { @@ -4131,10 +4136,13 @@ } }, "node_modules/deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", + "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, "engines": { "node": ">=6" } @@ -5910,6 +5918,15 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/get-intrinsic": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", @@ -7570,10 +7587,13 @@ } }, "node_modules/loupe": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz", - "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==", - "dev": true + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.1" + } }, "node_modules/lowercase-keys": { "version": "2.0.0", @@ -9025,12 +9045,12 @@ } }, "node_modules/pathval": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", - "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, "engines": { - "node": ">= 14.16" + "node": "*" } }, "node_modules/pem-jwk": { @@ -11374,6 +11394,15 @@ "node": ">= 0.8.0" } }, + "node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", diff --git a/package.json b/package.json index 718743b04..0c4d26b70 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "ws": "^8.18.0" }, "devDependencies": { - "chai": "^5.1.2", + "chai": "4.5.0", "eslint": "^9.13.0", "eslint-config-google": "^0.14.0", "mocha": "^10.7.3", From 5ee969cad0959141872f820a7c1f5ea5643a108e Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 12:10:34 -0700 Subject: [PATCH 08/21] WIP Sonar --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e8263f66..595698591 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,6 @@ jobs: -Dsonar.projectKey=cassproject_CASS -Dsonar.organization=cassproject -Dsonar.sources=src/main/ - -Dsonar.tests=src/main/ projectBaseDir: . - name: Perform CodeQL Analysis From fd924a1c8f87ce3892ed4c01c5b45f4fb0ca7e47 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 14:06:51 -0700 Subject: [PATCH 09/21] WIP CI/CD LCOV --- .github/workflows/build.yml | 4 +- coverage/lcov-report/index.html | 278 +- coverage/lcov-report/pm2.config.js.html | 139 + coverage/lcov.info | 9447 ++++++++++------------- package-lock.json | 97 +- package.json | 5 +- 6 files changed, 4384 insertions(+), 5586 deletions(-) create mode 100644 coverage/lcov-report/pm2.config.js.html diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 595698591..9a6bb70cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,8 +55,8 @@ jobs: with: cache: 'npm' - run: npm ci - - run: docker compose up -d - - run: npm run nyc + - run: docker compose up -d elasticsearch-cass + - run: npm run run:nyc - name: Analyze with SonarCloud uses: SonarSource/sonarcloud-github-action@v3.0.0 diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html index b53a334b9..045da990b 100644 --- a/coverage/lcov-report/index.html +++ b/coverage/lcov-report/index.html @@ -23,30 +23,30 @@

All files

- 0.92% + 9.68% Statements - 65/7048 + 588/6071
- 0.6% + 3.15% Branches - 25/4145 + 124/3929
- 0% + 4.46% Functions - 0/513 + 19/426
- 0.95% + 10.06% Lines - 65/6782 + 588/5843
@@ -79,213 +79,213 @@

All files

- main - -
+ main + +
- 20.13% - 29/144 - 32.25% - 20/62 - 0% - 0/17 - 20.42% - 29/142 + 57.24% + 83/145 + 41.93% + 26/62 + 17.64% + 3/17 + 58.04% + 83/143 main/server - -
+ +
- 0% - 0/2071 - 0% - 0/1110 - 0% - 0/128 - 0% - 0/2009 + 8.55% + 164/1917 + 1.33% + 15/1126 + 4.06% + 5/123 + 8.84% + 164/1854 main/server/adapter/asn - -
+ +
- 0% - 0/460 - 0% - 0/330 - 0% - 0/17 - 0% - 0/448 + 1.36% + 6/441 + 0.6% + 2/330 + 0% + 0/13 + 1.39% + 6/429 main/server/adapter/case - -
+ +
+ 9.97% + 47/471 + 0.88% + 2/225 + 0% + 0/46 + 10.3% + 47/456 + + + + main/server/adapter/ce + +
+ + 2.35% + 2/85 + 1.08% + 1/92 0% - 0/492 - 0% - 0/225 - 0% - 0/51 - 0% - 0/477 + 0/9 + 2.38% + 2/84 main/server/adapter/ceasn - +
- 0% - 0/1361 - 0% - 0/999 - 0% - 0/53 - 0% - 0/1304 + 0.75% + 10/1323 + 0.09% + 1/1039 + 0% + 0/47 + 0.78% + 10/1266 main/server/adapter/jsonLd - -
+ +
- 0% - 0/53 - 0% - 0/38 + 3.77% + 2/53 + 2.63% + 1/38 0% 0/1 - 0% - 0/53 + 3.77% + 2/53 main/server/adapter/openbadges - -
+ +
- 0% - 0/150 - 0% - 0/80 + 10.66% + 16/150 + 1.25% + 1/80 0% 0/9 - 0% - 0/149 + 10.73% + 16/149 main/server/adapter/replicate - -
+ +
- 0% - 0/81 - 0% - 0/27 + 18.51% + 15/81 + 14.81% + 4/27 0% 0/8 - 0% - 0/79 + 18.98% + 15/79 main/server/adapter/scd - -
+ +
- 0% - 0/111 + 6.3% + 7/111 0% 0/72 0% 0/8 - 0% - 0/107 + 6.54% + 7/107 main/server/adapter/xapi - -
+ +
- 0% - 0/217 - 0% - 0/107 - 0% - 0/17 - 0% - 0/201 + 11.85% + 30/253 + 0.8% + 1/125 + 0% + 0/21 + 12.71% + 30/236 main/server/profile - -
+ +
- 0% - 0/498 - 0% - 0/218 - 0% - 0/35 - 0% - 0/462 - - - - main/server/profile/coprocessors - -
- - 0% - 0/517 - 0% - 0/268 - 0% - 0/56 - 0% - 0/496 + 15.54% + 23/148 + 0.96% + 1/104 + 9.09% + 1/11 + 17.42% + 23/132 main/server/shims - -
+ +
- 4.07% - 36/884 - 0.82% - 5/605 - 0% - 0/111 - 4.25% - 36/846 + 20.47% + 181/884 + 11.4% + 69/605 + 9% + 10/111 + 21.39% + 181/846 main/server/shims/util - -
+ +
- 0% - 0/9 + 22.22% + 2/9 0% 0/4 0% 0/2 - 0% - 0/9 + 22.22% + 2/9 @@ -296,7 +296,7 @@

All files

Code coverage generated by istanbul - at 2024-07-12T23:41:26.479Z + at 2024-10-28T21:03:26.779Z
+ + + + + + \ No newline at end of file diff --git a/coverage/lcov.info b/coverage/lcov.info index b5991b699..261e68024 100644 --- a/coverage/lcov.info +++ b/coverage/lcov.info @@ -3,22 +3,22 @@ SF:src\main\server.js FN:42,(anonymous_0) FN:64,(anonymous_1) FN:67,(anonymous_2) -FN:114,(anonymous_3) -FN:118,(anonymous_4) -FN:121,(anonymous_5) -FN:131,(anonymous_6) -FN:138,(anonymous_7) -FN:151,(anonymous_8) -FN:162,(anonymous_9) -FN:169,(anonymous_10) -FN:173,(anonymous_11) -FN:194,(anonymous_12) -FN:205,(anonymous_13) -FN:208,(anonymous_14) -FN:227,(anonymous_15) -FN:250,(anonymous_16) +FN:115,(anonymous_3) +FN:119,(anonymous_4) +FN:122,(anonymous_5) +FN:132,(anonymous_6) +FN:139,(anonymous_7) +FN:152,(anonymous_8) +FN:163,(anonymous_9) +FN:170,(anonymous_10) +FN:174,(anonymous_11) +FN:195,(anonymous_12) +FN:206,(anonymous_13) +FN:209,(anonymous_14) +FN:228,(anonymous_15) +FN:251,(anonymous_16) FNF:17 -FNH:0 +FNH:3 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) @@ -28,9 +28,9 @@ FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) +FNDA:1,(anonymous_9) +FNDA:1,(anonymous_10) +FNDA:1,(anonymous_11) FNDA:0,(anonymous_12) FNDA:0,(anonymous_13) FNDA:0,(anonymous_14) @@ -77,109 +77,110 @@ DA:76,0 DA:80,1 DA:81,1 DA:82,1 -DA:83,0 -DA:84,0 -DA:85,0 -DA:89,0 -DA:91,0 -DA:93,0 -DA:95,0 -DA:96,0 -DA:97,0 -DA:98,0 -DA:99,0 -DA:101,0 -DA:102,0 -DA:103,0 -DA:104,0 -DA:105,0 -DA:107,0 -DA:108,0 -DA:110,0 -DA:114,0 -DA:115,0 -DA:117,0 -DA:118,0 -DA:119,0 -DA:121,0 -DA:122,0 -DA:125,0 -DA:126,0 -DA:127,0 -DA:130,0 -DA:131,0 +DA:83,1 +DA:84,1 +DA:85,1 +DA:89,1 +DA:91,1 +DA:93,1 +DA:95,1 +DA:96,1 +DA:97,1 +DA:98,1 +DA:99,1 +DA:101,1 +DA:102,1 +DA:103,1 +DA:104,1 +DA:105,1 +DA:106,1 +DA:108,1 +DA:109,1 +DA:111,1 +DA:115,1 +DA:116,0 +DA:118,1 +DA:119,1 +DA:120,0 +DA:122,1 +DA:123,0 +DA:126,1 +DA:127,1 +DA:128,1 +DA:131,1 DA:132,0 DA:133,0 -DA:137,0 -DA:138,0 -DA:140,0 +DA:134,0 +DA:138,1 +DA:139,0 DA:141,0 DA:142,0 DA:143,0 -DA:146,0 -DA:150,0 -DA:151,0 +DA:144,0 +DA:147,0 +DA:151,1 DA:152,0 DA:153,0 -DA:157,0 -DA:158,0 -DA:159,0 -DA:160,0 -DA:162,0 -DA:163,0 -DA:164,0 -DA:165,0 -DA:166,0 -DA:169,0 -DA:170,0 -DA:173,0 -DA:174,0 -DA:176,0 -DA:179,0 -DA:181,0 -DA:184,0 -DA:186,0 -DA:189,0 -DA:191,0 -DA:194,0 -DA:195,0 +DA:154,0 +DA:158,1 +DA:159,1 +DA:160,1 +DA:161,1 +DA:163,1 +DA:164,1 +DA:165,1 +DA:166,1 +DA:167,1 +DA:170,1 +DA:171,1 +DA:174,1 +DA:175,1 +DA:177,1 +DA:180,1 +DA:182,0 +DA:185,1 +DA:187,1 +DA:190,1 +DA:192,0 +DA:195,1 DA:196,0 DA:197,0 DA:198,0 DA:199,0 -DA:201,0 +DA:200,0 DA:202,0 DA:203,0 DA:204,0 DA:205,0 DA:206,0 -DA:208,0 +DA:207,0 DA:209,0 -DA:211,0 -DA:213,0 -DA:214,0 +DA:210,0 +DA:212,0 +DA:214,1 DA:215,0 -DA:224,0 +DA:216,0 DA:225,0 DA:226,0 DA:227,0 DA:228,0 DA:229,0 -DA:231,0 -DA:234,0 +DA:230,0 +DA:232,0 DA:235,0 -DA:237,0 -DA:239,0 +DA:236,0 +DA:238,0 DA:240,0 DA:241,0 -DA:244,0 -DA:247,0 -DA:248,0 -DA:250,0 -DA:251,0 -DA:253,0 -LF:142 -LH:29 +DA:242,0 +DA:245,1 +DA:248,1 +DA:249,0 +DA:251,1 +DA:252,0 +DA:254,1 +LF:143 +LH:83 BRDA:24,0,0,1 BRDA:24,0,1,1 BRDA:25,1,0,0 @@ -210,40 +211,40 @@ BRDA:63,13,0,1 BRDA:63,13,1,1 BRDA:73,14,0,0 BRDA:73,14,1,1 -BRDA:125,15,0,0 -BRDA:125,15,1,0 -BRDA:130,16,0,0 -BRDA:130,16,1,0 -BRDA:137,17,0,0 -BRDA:137,17,1,0 -BRDA:141,18,0,0 -BRDA:141,18,1,0 -BRDA:142,19,0,0 -BRDA:142,19,1,0 -BRDA:142,20,0,0 -BRDA:142,20,1,0 -BRDA:150,21,0,0 -BRDA:150,21,1,0 -BRDA:196,22,0,0 -BRDA:196,22,1,0 -BRDA:198,23,0,0 -BRDA:198,23,1,0 -BRDA:213,24,0,0 -BRDA:213,24,1,0 -BRDA:219,25,0,0 -BRDA:219,25,1,0 -BRDA:220,26,0,0 -BRDA:220,26,1,0 -BRDA:224,27,0,0 -BRDA:224,27,1,0 -BRDA:234,28,0,0 -BRDA:234,28,1,0 -BRDA:239,29,0,0 -BRDA:239,29,1,0 -BRDA:247,30,0,0 -BRDA:247,30,1,0 +BRDA:126,15,0,1 +BRDA:126,15,1,0 +BRDA:131,16,0,0 +BRDA:131,16,1,1 +BRDA:138,17,0,0 +BRDA:138,17,1,1 +BRDA:142,18,0,0 +BRDA:142,18,1,0 +BRDA:143,19,0,0 +BRDA:143,19,1,0 +BRDA:143,20,0,0 +BRDA:143,20,1,0 +BRDA:151,21,0,0 +BRDA:151,21,1,1 +BRDA:197,22,0,0 +BRDA:197,22,1,0 +BRDA:199,23,0,0 +BRDA:199,23,1,0 +BRDA:214,24,0,0 +BRDA:214,24,1,1 +BRDA:220,25,0,0 +BRDA:220,25,1,0 +BRDA:221,26,0,0 +BRDA:221,26,1,0 +BRDA:225,27,0,0 +BRDA:225,27,1,0 +BRDA:235,28,0,0 +BRDA:235,28,1,0 +BRDA:240,29,0,0 +BRDA:240,29,1,0 +BRDA:248,30,0,0 +BRDA:248,30,1,1 BRF:62 -BRH:20 +BRH:26 end_of_record TN: SF:src\main\server\skyId.js @@ -261,34 +262,34 @@ FN:219,(anonymous_10) FN:222,(anonymous_11) FN:226,(anonymous_12) FNF:13 -FNH:0 +FNH:2 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) FNDA:0,(anonymous_3) FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) +FNDA:6,(anonymous_5) +FNDA:1,(anonymous_6) FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) FNDA:0,(anonymous_9) FNDA:0,(anonymous_10) FNDA:0,(anonymous_11) FNDA:0,(anonymous_12) -DA:1,0 -DA:2,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:7,0 +DA:1,1 +DA:2,1 +DA:3,1 +DA:4,1 +DA:5,1 +DA:6,1 +DA:7,1 DA:8,0 -DA:10,0 -DA:11,0 -DA:12,0 -DA:13,0 +DA:10,1 +DA:11,1 +DA:12,1 +DA:13,1 DA:14,0 -DA:16,0 +DA:16,1 DA:17,0 DA:18,0 DA:19,0 @@ -324,7 +325,7 @@ DA:58,0 DA:59,0 DA:61,0 DA:63,0 -DA:65,0 +DA:65,1 DA:66,0 DA:67,0 DA:68,0 @@ -368,7 +369,7 @@ DA:118,0 DA:119,0 DA:121,0 DA:122,0 -DA:124,0 +DA:124,1 DA:125,0 DA:126,0 DA:127,0 @@ -404,18 +405,18 @@ DA:165,0 DA:166,0 DA:167,0 DA:168,0 -DA:170,0 -DA:171,0 +DA:170,1 +DA:171,6 DA:172,0 -DA:174,0 -DA:175,0 -DA:176,0 -DA:177,0 +DA:174,6 +DA:175,6 +DA:176,6 +DA:177,6 DA:178,0 DA:179,0 DA:180,0 -DA:183,0 -DA:184,0 +DA:183,6 +DA:184,6 DA:186,0 DA:187,0 DA:189,0 @@ -425,35 +426,35 @@ DA:193,0 DA:194,0 DA:196,0 DA:198,0 -DA:200,0 -DA:201,0 +DA:200,1 +DA:201,1 DA:202,0 -DA:204,0 +DA:204,1 DA:205,0 -DA:207,0 +DA:207,1 DA:208,0 -DA:210,0 -DA:211,0 -DA:212,0 -DA:213,0 -DA:214,0 -DA:215,0 -DA:216,0 -DA:217,0 -DA:218,0 -DA:219,0 +DA:210,1 +DA:211,1 +DA:212,1 +DA:213,1 +DA:214,1 +DA:215,1 +DA:216,1 +DA:217,1 +DA:218,1 +DA:219,1 DA:220,0 -DA:222,0 +DA:222,1 DA:223,0 -DA:225,0 -DA:226,0 +DA:225,1 +DA:226,1 DA:227,0 -DA:274,0 -DA:275,0 -DA:276,0 -DA:277,0 +DA:274,1 +DA:275,1 +DA:276,1 +DA:277,1 LF:177 -LH:0 +LH:43 BRDA:21,0,0,0 BRDA:21,0,1,0 BRDA:22,1,0,0 @@ -525,10 +526,10 @@ BRDA:156,33,1,0 BRDA:160,34,0,0 BRDA:160,34,1,0 BRDA:171,35,0,0 -BRDA:171,35,1,0 +BRDA:171,35,1,6 BRDA:179,36,0,0 BRDA:179,36,1,0 -BRDA:183,37,0,0 +BRDA:183,37,0,6 BRDA:183,37,1,0 BRDA:186,38,0,0 BRDA:186,38,1,0 @@ -537,67 +538,7 @@ BRDA:189,39,1,0 BRDA:193,40,0,0 BRDA:193,40,1,0 BRF:82 -BRH:0 -end_of_record -TN: -SF:src\main\server\skyId.test.js -FN:10,(anonymous_0) -FN:18,(anonymous_1) -FN:33,(anonymous_2) -FN:44,(anonymous_3) -FNF:4 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -DA:1,0 -DA:2,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:8,0 -DA:10,0 -DA:11,0 -DA:12,0 -DA:13,0 -DA:14,0 -DA:15,0 -DA:16,0 -DA:18,0 -DA:19,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:23,0 -DA:24,0 -DA:25,0 -DA:26,0 -DA:27,0 -DA:28,0 -DA:29,0 -DA:30,0 -DA:33,0 -DA:34,0 -DA:35,0 -DA:36,0 -DA:37,0 -DA:38,0 -DA:39,0 -DA:40,0 -DA:41,0 -DA:44,0 -DA:45,0 -DA:46,0 -DA:47,0 -DA:48,0 -DA:49,0 -DA:50,0 -LF:43 -LH:0 -BRF:0 -BRH:0 +BRH:2 end_of_record TN: SF:src\main\server\skyRepo.js @@ -614,99 +555,103 @@ FN:68,(anonymous_9) FN:107,(anonymous_10) FN:200,(anonymous_11) FN:203,(anonymous_12) -FN:278,(anonymous_13) -FN:281,(anonymous_14) -FN:298,(anonymous_15) -FN:304,(anonymous_16) -FN:329,(anonymous_17) -FN:353,(anonymous_18) -FN:377,(anonymous_19) -FN:398,(anonymous_20) -FN:418,(anonymous_21) -FN:433,(anonymous_22) -FN:8445,(anonymous_23) -FN:8448,(anonymous_24) -FN:8455,(anonymous_25) -FN:8493,(anonymous_26) -FN:8529,(anonymous_27) -FN:8568,(anonymous_28) -FN:8574,(anonymous_29) -FN:8583,(anonymous_30) -FN:8592,(anonymous_31) -FN:8607,(anonymous_32) -FN:8616,(anonymous_33) -FN:8722,(anonymous_34) -FN:8734,(anonymous_35) -FN:8734,(anonymous_36) -FN:8741,(anonymous_37) -FN:8746,(anonymous_38) -FN:8762,(anonymous_39) -FN:8835,(anonymous_40) -FN:8843,(anonymous_41) -FN:8873,(anonymous_42) -FN:8894,(anonymous_43) -FN:8925,(anonymous_44) -FN:8946,(anonymous_45) -FN:8950,(anonymous_46) -FN:8985,(anonymous_47) -FN:8993,(anonymous_48) -FN:8996,(anonymous_49) -FN:9000,(anonymous_50) -FN:9020,(anonymous_51) -FN:9046,(anonymous_52) -FN:9056,(anonymous_53) -FN:9085,(anonymous_54) -FN:9092,(anonymous_55) -FN:9096,(anonymous_56) -FN:9130,(anonymous_57) -FN:9154,(anonymous_58) -FN:9180,(anonymous_59) -FN:9199,(anonymous_60) -FN:9225,(anonymous_61) -FN:9232,(anonymous_62) -FN:9263,(anonymous_63) -FN:9294,(anonymous_64) -FN:9336,(anonymous_65) -FN:9340,(anonymous_66) -FN:9344,(anonymous_67) -FN:9364,(anonymous_68) -FN:9402,(anonymous_69) -FN:9423,(anonymous_70) -FN:9451,(anonymous_71) -FN:9452,(anonymous_72) -FN:9477,(anonymous_73) -FN:9486,(anonymous_74) -FN:9507,(anonymous_75) -FN:9531,(anonymous_76) -FN:9775,(anonymous_77) -FN:9822,(anonymous_78) -FN:9832,(anonymous_79) -FN:9836,(anonymous_80) -FN:9860,(anonymous_81) -FN:9864,(anonymous_82) -FN:9864,(anonymous_83) -FN:9866,(anonymous_84) -FN:9918,(anonymous_85) -FN:9930,(anonymous_86) -FN:9942,(anonymous_87) -FN:9957,(anonymous_88) -FN:10062,(anonymous_89) -FN:10065,(anonymous_90) -FN:10071,(anonymous_91) -FN:10104,(anonymous_92) -FN:10108,(anonymous_93) -FN:10116,(anonymous_94) -FN:10122,(anonymous_95) -FNF:96 -FNH:0 +FN:209,(anonymous_13) +FN:210,(anonymous_14) +FN:220,(anonymous_15) +FN:277,(anonymous_16) +FN:280,(anonymous_17) +FN:297,(anonymous_18) +FN:303,(anonymous_19) +FN:328,(anonymous_20) +FN:352,(anonymous_21) +FN:376,(anonymous_22) +FN:397,(anonymous_23) +FN:417,(anonymous_24) +FN:432,(anonymous_25) +FN:8444,(anonymous_26) +FN:8447,(anonymous_27) +FN:8454,(anonymous_28) +FN:8474,(anonymous_29) +FN:8509,(anonymous_30) +FN:8545,(anonymous_31) +FN:8584,(anonymous_32) +FN:8590,(anonymous_33) +FN:8599,(anonymous_34) +FN:8608,(anonymous_35) +FN:8623,(anonymous_36) +FN:8632,(anonymous_37) +FN:8738,(anonymous_38) +FN:8750,(anonymous_39) +FN:8750,(anonymous_40) +FN:8757,(anonymous_41) +FN:8762,(anonymous_42) +FN:8778,(anonymous_43) +FN:8856,(anonymous_44) +FN:8864,(anonymous_45) +FN:8894,(anonymous_46) +FN:8915,(anonymous_47) +FN:8946,(anonymous_48) +FN:8967,(anonymous_49) +FN:8971,(anonymous_50) +FN:9006,(anonymous_51) +FN:9014,(anonymous_52) +FN:9017,(anonymous_53) +FN:9021,(anonymous_54) +FN:9041,(anonymous_55) +FN:9067,(anonymous_56) +FN:9077,(anonymous_57) +FN:9106,(anonymous_58) +FN:9113,(anonymous_59) +FN:9117,(anonymous_60) +FN:9151,(anonymous_61) +FN:9175,(anonymous_62) +FN:9201,(anonymous_63) +FN:9221,(anonymous_64) +FN:9247,(anonymous_65) +FN:9254,(anonymous_66) +FN:9285,(anonymous_67) +FN:9316,(anonymous_68) +FN:9358,(anonymous_69) +FN:9362,(anonymous_70) +FN:9366,(anonymous_71) +FN:9386,(anonymous_72) +FN:9424,(anonymous_73) +FN:9445,(anonymous_74) +FN:9474,(anonymous_75) +FN:9475,(anonymous_76) +FN:9500,(anonymous_77) +FN:9509,(anonymous_78) +FN:9530,(anonymous_79) +FN:9554,(anonymous_80) +FN:9798,(anonymous_81) +FN:9846,(anonymous_82) +FN:9856,(anonymous_83) +FN:9860,(anonymous_84) +FN:9884,(anonymous_85) +FN:9888,(anonymous_86) +FN:9888,(anonymous_87) +FN:9890,(anonymous_88) +FN:9942,(anonymous_89) +FN:9954,(anonymous_90) +FN:9966,(anonymous_91) +FN:9981,(anonymous_92) +FN:10086,(anonymous_93) +FN:10089,(anonymous_94) +FN:10095,(anonymous_95) +FN:10128,(anonymous_96) +FN:10132,(anonymous_97) +FN:10140,(anonymous_98) +FN:10146,(anonymous_99) +FNF:100 +FNH:2 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) +FNDA:2,(anonymous_3) FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) +FNDA:6,(anonymous_7) FNDA:0,(anonymous_8) FNDA:0,(anonymous_9) FNDA:0,(anonymous_10) @@ -795,43 +740,47 @@ FNDA:0,(anonymous_92) FNDA:0,(anonymous_93) FNDA:0,(anonymous_94) FNDA:0,(anonymous_95) -DA:1,0 -DA:2,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:10,0 +FNDA:0,(anonymous_96) +FNDA:0,(anonymous_97) +FNDA:0,(anonymous_98) +FNDA:0,(anonymous_99) +DA:1,1 +DA:2,1 +DA:3,1 +DA:4,1 +DA:5,1 +DA:6,1 +DA:10,1 DA:11,0 -DA:13,0 +DA:13,1 DA:14,0 -DA:16,0 -DA:21,0 -DA:22,0 +DA:16,1 +DA:21,1 +DA:22,2 DA:23,0 -DA:25,0 +DA:25,2 DA:26,0 -DA:28,0 -DA:29,0 +DA:28,2 +DA:29,2 DA:31,0 DA:32,0 DA:34,0 DA:35,0 -DA:38,0 +DA:38,1 DA:39,0 DA:40,0 DA:41,0 DA:43,0 DA:46,0 DA:49,0 -DA:57,0 -DA:58,0 -DA:59,0 +DA:57,1 +DA:58,6 +DA:59,6 DA:60,0 -DA:62,0 -DA:65,0 +DA:62,6 +DA:65,1 DA:66,0 -DA:68,0 +DA:68,1 DA:69,0 DA:70,0 DA:71,0 @@ -857,7 +806,7 @@ DA:98,0 DA:100,0 DA:101,0 DA:103,0 -DA:107,0 +DA:107,1 DA:108,0 DA:109,0 DA:110,0 @@ -923,9 +872,9 @@ DA:194,0 DA:195,0 DA:197,0 DA:198,0 -DA:200,0 +DA:200,1 DA:201,0 -DA:203,0 +DA:203,1 DA:204,0 DA:205,0 DA:207,0 @@ -933,55 +882,55 @@ DA:208,0 DA:209,0 DA:210,0 DA:211,0 -DA:213,0 +DA:212,0 DA:214,0 DA:215,0 DA:217,0 -DA:218,0 +DA:220,0 DA:221,0 DA:222,0 DA:223,0 +DA:224,0 DA:225,0 +DA:226,0 +DA:227,0 DA:228,0 DA:229,0 DA:230,0 DA:231,0 -DA:232,0 DA:233,0 DA:234,0 DA:235,0 -DA:236,0 -DA:237,0 DA:238,0 DA:239,0 -DA:241,0 DA:242,0 DA:243,0 +DA:244,0 +DA:245,0 DA:246,0 DA:247,0 DA:250,0 -DA:251,0 -DA:252,0 -DA:253,0 DA:254,0 DA:255,0 +DA:256,0 +DA:257,0 DA:258,0 +DA:259,0 +DA:261,0 DA:262,0 -DA:263,0 DA:264,0 -DA:265,0 DA:266,0 DA:267,0 -DA:268,0 -DA:270,0 -DA:273,0 -DA:275,0 +DA:269,0 +DA:272,0 +DA:274,0 +DA:277,1 DA:278,0 -DA:279,0 -DA:281,0 +DA:280,1 +DA:283,0 DA:284,0 DA:285,0 -DA:286,0 +DA:287,0 DA:288,0 DA:289,0 DA:290,0 @@ -990,366 +939,366 @@ DA:292,0 DA:293,0 DA:294,0 DA:295,0 -DA:296,0 +DA:297,1 DA:298,0 DA:299,0 -DA:300,0 -DA:302,0 +DA:301,0 +DA:303,1 DA:304,0 DA:305,0 DA:306,0 DA:307,0 DA:308,0 -DA:309,0 +DA:310,0 DA:311,0 -DA:312,0 -DA:314,0 +DA:313,0 +DA:315,0 DA:316,0 DA:317,0 DA:318,0 -DA:319,0 -DA:321,0 +DA:320,0 +DA:322,0 DA:323,0 DA:324,0 -DA:325,0 -DA:327,0 +DA:326,0 +DA:328,1 DA:329,0 DA:330,0 DA:331,0 DA:332,0 -DA:333,0 +DA:334,0 DA:335,0 -DA:336,0 -DA:338,0 +DA:337,0 +DA:339,0 DA:340,0 DA:341,0 DA:342,0 -DA:343,0 -DA:345,0 +DA:344,0 +DA:346,0 DA:347,0 DA:348,0 -DA:349,0 -DA:351,0 +DA:350,0 +DA:352,1 DA:353,0 DA:354,0 DA:355,0 DA:356,0 -DA:357,0 +DA:358,0 DA:359,0 -DA:360,0 -DA:362,0 +DA:361,0 +DA:363,0 DA:364,0 DA:365,0 DA:366,0 -DA:367,0 -DA:369,0 +DA:368,0 +DA:370,0 DA:371,0 DA:372,0 -DA:373,0 -DA:375,0 +DA:374,0 +DA:376,1 DA:377,0 DA:378,0 DA:379,0 DA:380,0 DA:381,0 DA:382,0 -DA:383,0 +DA:384,0 DA:385,0 -DA:386,0 +DA:387,0 DA:388,0 -DA:389,0 -DA:391,0 +DA:390,0 +DA:392,0 DA:393,0 -DA:394,0 -DA:396,0 +DA:395,0 +DA:397,1 DA:398,0 DA:399,0 DA:400,0 DA:401,0 -DA:402,0 +DA:403,0 DA:404,0 DA:405,0 DA:406,0 -DA:407,0 -DA:409,0 +DA:408,0 +DA:410,0 DA:411,0 DA:412,0 DA:413,0 -DA:414,0 -DA:416,0 +DA:415,0 +DA:417,1 DA:418,0 DA:419,0 DA:420,0 DA:421,0 -DA:422,0 -DA:424,0 +DA:423,0 +DA:425,0 DA:426,0 DA:427,0 -DA:428,0 -DA:430,0 -DA:432,0 +DA:429,0 +DA:431,1 +DA:432,1 DA:433,0 DA:434,0 DA:435,0 -DA:436,0 +DA:8412,0 DA:8413,0 -DA:8414,0 +DA:8416,0 DA:8417,0 DA:8418,0 DA:8419,0 DA:8420,0 DA:8421,0 DA:8422,0 -DA:8423,0 +DA:8424,0 DA:8425,0 DA:8426,0 -DA:8427,0 -DA:8429,0 -DA:8432,0 +DA:8428,0 +DA:8431,0 +DA:8433,0 DA:8434,0 -DA:8435,0 +DA:8436,0 DA:8437,0 DA:8438,0 DA:8439,0 -DA:8440,0 -DA:8443,0 +DA:8442,0 +DA:8444,1 DA:8445,0 -DA:8446,0 +DA:8447,1 DA:8448,0 DA:8449,0 -DA:8450,0 -DA:8452,0 +DA:8451,0 +DA:8454,1 DA:8455,0 DA:8456,0 DA:8457,0 DA:8458,0 DA:8459,0 -DA:8460,0 DA:8461,0 DA:8462,0 +DA:8463,0 +DA:8465,0 DA:8466,0 DA:8467,0 DA:8468,0 DA:8469,0 DA:8470,0 -DA:8474,0 +DA:8474,1 DA:8475,0 DA:8476,0 DA:8477,0 +DA:8478,0 +DA:8479,0 DA:8480,0 +DA:8481,0 DA:8482,0 -DA:8483,0 -DA:8484,0 DA:8486,0 DA:8487,0 +DA:8488,0 DA:8489,0 DA:8490,0 -DA:8492,0 -DA:8493,0 DA:8494,0 DA:8495,0 DA:8496,0 DA:8497,0 -DA:8498,0 DA:8500,0 -DA:8501,0 +DA:8502,0 DA:8503,0 DA:8505,0 DA:8506,0 -DA:8507,0 -DA:8508,0 +DA:8508,1 +DA:8509,1 DA:8510,0 +DA:8511,0 DA:8512,0 DA:8513,0 DA:8514,0 -DA:8515,0 DA:8516,0 DA:8517,0 -DA:8518,0 -DA:8520,0 +DA:8519,0 DA:8521,0 DA:8522,0 +DA:8523,0 DA:8524,0 -DA:8525,0 -DA:8527,0 +DA:8526,0 +DA:8528,0 DA:8529,0 DA:8530,0 +DA:8531,0 DA:8532,0 +DA:8533,0 DA:8534,0 -DA:8535,0 +DA:8536,0 DA:8537,0 DA:8538,0 -DA:8539,0 DA:8540,0 -DA:8542,0 +DA:8541,0 DA:8543,0 -DA:8545,0 +DA:8545,1 DA:8546,0 -DA:8547,0 -DA:8549,0 +DA:8548,0 DA:8550,0 +DA:8551,0 DA:8553,0 DA:8554,0 DA:8555,0 DA:8556,0 -DA:8557,0 +DA:8558,0 DA:8559,0 +DA:8561,0 +DA:8562,0 DA:8563,0 -DA:8564,0 +DA:8565,0 DA:8566,0 -DA:8567,0 -DA:8568,0 DA:8569,0 DA:8570,0 +DA:8571,0 DA:8572,0 DA:8573,0 -DA:8574,0 DA:8575,0 -DA:8576,0 -DA:8577,0 +DA:8579,0 +DA:8580,0 DA:8582,0 DA:8583,0 DA:8584,0 DA:8585,0 DA:8586,0 -DA:8587,0 DA:8588,0 +DA:8589,0 +DA:8590,0 +DA:8591,0 DA:8592,0 -DA:8595,0 -DA:8596,0 -DA:8597,0 +DA:8593,0 DA:8598,0 DA:8599,0 -DA:8605,0 -DA:8607,0 +DA:8600,0 +DA:8601,0 +DA:8602,0 +DA:8603,0 +DA:8604,0 DA:8608,0 -DA:8609,0 -DA:8610,0 DA:8611,0 +DA:8612,0 +DA:8613,0 DA:8614,0 -DA:8616,0 -DA:8617,0 -DA:8618,0 -DA:8619,0 -DA:8620,0 -DA:8622,0 -DA:8623,0 +DA:8615,0 +DA:8621,0 +DA:8623,1 DA:8624,0 DA:8625,0 DA:8626,0 DA:8627,0 -DA:8629,0 +DA:8630,0 +DA:8632,1 DA:8633,0 DA:8634,0 +DA:8635,0 DA:8636,0 -DA:8637,0 +DA:8638,0 +DA:8639,0 DA:8640,0 DA:8641,0 DA:8642,0 DA:8643,0 -DA:8644,0 DA:8645,0 -DA:8646,0 -DA:8647,0 DA:8649,0 +DA:8650,0 +DA:8652,0 DA:8653,0 DA:8656,0 DA:8657,0 DA:8658,0 +DA:8659,0 +DA:8660,0 +DA:8661,0 +DA:8662,0 DA:8663,0 DA:8665,0 -DA:8666,0 -DA:8667,0 -DA:8668,0 DA:8669,0 -DA:8670,0 -DA:8671,0 DA:8672,0 -DA:8676,0 -DA:8677,0 -DA:8678,0 +DA:8673,0 +DA:8674,0 DA:8679,0 -DA:8680,0 +DA:8681,0 +DA:8682,0 +DA:8683,0 DA:8684,0 DA:8685,0 DA:8686,0 DA:8687,0 -DA:8690,0 +DA:8688,0 DA:8692,0 DA:8693,0 DA:8694,0 -DA:8697,0 -DA:8699,0 +DA:8695,0 +DA:8696,0 DA:8700,0 DA:8701,0 -DA:8704,0 -DA:8705,0 -DA:8707,0 +DA:8702,0 +DA:8703,0 +DA:8706,0 DA:8708,0 DA:8709,0 DA:8710,0 -DA:8711,0 DA:8713,0 +DA:8715,0 DA:8716,0 DA:8717,0 -DA:8718,0 DA:8720,0 DA:8721,0 -DA:8722,0 DA:8723,0 DA:8724,0 DA:8725,0 -DA:8731,0 +DA:8726,0 +DA:8727,0 +DA:8729,0 DA:8732,0 DA:8733,0 DA:8734,0 -DA:8735,0 DA:8736,0 DA:8737,0 DA:8738,0 DA:8739,0 +DA:8740,0 DA:8741,0 -DA:8743,0 -DA:8745,0 -DA:8746,0 DA:8747,0 DA:8748,0 +DA:8749,0 +DA:8750,0 +DA:8751,0 DA:8752,0 DA:8753,0 DA:8754,0 DA:8755,0 DA:8757,0 -DA:8760,0 +DA:8759,0 +DA:8761,0 DA:8762,0 +DA:8763,0 DA:8764,0 -DA:8765,0 -DA:8766,0 -DA:8767,0 DA:8768,0 DA:8769,0 +DA:8770,0 DA:8771,0 -DA:8774,0 -DA:8775,0 +DA:8773,0 DA:8776,0 -DA:8778,0 -DA:8779,0 +DA:8778,1 DA:8780,0 DA:8781,0 +DA:8782,0 DA:8783,0 -DA:8786,0 +DA:8784,0 +DA:8785,0 DA:8787,0 -DA:8788,0 -DA:8789,0 DA:8790,0 DA:8791,0 DA:8792,0 +DA:8794,0 DA:8797,0 DA:8798,0 DA:8800,0 DA:8801,0 DA:8802,0 DA:8804,0 -DA:8805,0 DA:8807,0 DA:8808,0 DA:8809,0 @@ -1357,84 +1306,83 @@ DA:8810,0 DA:8811,0 DA:8812,0 DA:8813,0 -DA:8814,0 -DA:8815,0 DA:8818,0 DA:8819,0 DA:8821,0 -DA:8824,0 +DA:8822,0 +DA:8823,0 DA:8825,0 DA:8826,0 -DA:8827,0 DA:8828,0 DA:8829,0 DA:8830,0 +DA:8831,0 DA:8832,0 +DA:8833,0 +DA:8834,0 DA:8835,0 DA:8836,0 -DA:8837,0 DA:8839,0 DA:8840,0 -DA:8843,0 -DA:8844,0 +DA:8842,0 DA:8845,0 +DA:8846,0 +DA:8847,0 DA:8848,0 DA:8849,0 DA:8850,0 DA:8851,0 -DA:8852,0 DA:8853,0 -DA:8854,0 -DA:8855,0 -DA:8856,0 +DA:8856,1 DA:8857,0 DA:8858,0 DA:8860,0 DA:8861,0 -DA:8863,0 +DA:8864,1 DA:8865,0 DA:8866,0 DA:8869,0 DA:8870,0 +DA:8871,0 +DA:8872,0 DA:8873,0 DA:8874,0 DA:8875,0 DA:8876,0 DA:8877,0 +DA:8878,0 DA:8879,0 -DA:8880,0 +DA:8881,0 DA:8882,0 -DA:8883,0 DA:8884,0 DA:8886,0 DA:8887,0 -DA:8888,0 DA:8890,0 DA:8891,0 -DA:8894,0 +DA:8894,1 DA:8895,0 DA:8896,0 +DA:8897,0 DA:8898,0 -DA:8899,0 DA:8900,0 DA:8901,0 -DA:8902,0 -DA:8906,0 +DA:8903,0 +DA:8904,0 +DA:8905,0 +DA:8907,0 DA:8908,0 DA:8909,0 DA:8911,0 DA:8912,0 -DA:8914,0 -DA:8915,0 +DA:8915,1 DA:8916,0 -DA:8918,0 +DA:8917,0 DA:8919,0 DA:8920,0 +DA:8921,0 DA:8922,0 -DA:8925,0 -DA:8926,0 +DA:8923,0 DA:8927,0 -DA:8928,0 DA:8929,0 DA:8930,0 DA:8932,0 @@ -1446,194 +1394,194 @@ DA:8939,0 DA:8940,0 DA:8941,0 DA:8943,0 -DA:8946,0 +DA:8946,1 DA:8947,0 DA:8948,0 +DA:8949,0 DA:8950,0 DA:8951,0 -DA:8952,0 DA:8953,0 -DA:8955,0 +DA:8954,0 DA:8956,0 DA:8957,0 DA:8958,0 +DA:8960,0 +DA:8961,0 DA:8962,0 -DA:8963,0 DA:8964,0 -DA:8966,0 +DA:8967,1 DA:8968,0 DA:8969,0 DA:8971,0 DA:8972,0 +DA:8973,0 DA:8974,0 -DA:8975,0 DA:8976,0 +DA:8977,0 DA:8978,0 DA:8979,0 -DA:8980,0 -DA:8982,0 +DA:8983,0 +DA:8984,0 DA:8985,0 -DA:8986,0 DA:8987,0 -DA:8988,0 +DA:8989,0 DA:8990,0 +DA:8992,0 DA:8993,0 -DA:8994,0 +DA:8995,0 DA:8996,0 DA:8997,0 -DA:8998,0 +DA:8999,0 DA:9000,0 DA:9001,0 +DA:9003,0 +DA:9006,1 +DA:9007,0 +DA:9008,0 +DA:9009,0 +DA:9011,0 +DA:9014,1 DA:9015,0 -DA:9016,0 +DA:9017,1 DA:9018,0 -DA:9020,0 -DA:9021,0 +DA:9019,0 +DA:9021,1 DA:9022,0 -DA:9023,0 -DA:9025,0 -DA:9026,0 -DA:9028,0 -DA:9029,0 -DA:9031,0 -DA:9032,0 -DA:9034,0 -DA:9035,0 DA:9036,0 -DA:9038,0 +DA:9037,0 DA:9039,0 -DA:9041,0 +DA:9041,1 DA:9042,0 +DA:9043,0 DA:9044,0 DA:9046,0 DA:9047,0 -DA:9048,0 DA:9049,0 -DA:9051,0 +DA:9050,0 DA:9052,0 -DA:9054,0 +DA:9053,0 DA:9055,0 DA:9056,0 DA:9057,0 -DA:9058,0 DA:9059,0 DA:9060,0 -DA:9061,0 DA:9062,0 DA:9063,0 -DA:9064,0 DA:9065,0 -DA:9066,0 +DA:9067,1 DA:9068,0 DA:9069,0 DA:9070,0 -DA:9071,0 DA:9072,0 DA:9073,0 -DA:9074,0 DA:9075,0 DA:9076,0 DA:9077,0 DA:9078,0 +DA:9079,0 DA:9080,0 DA:9081,0 +DA:9082,0 +DA:9083,0 +DA:9084,0 DA:9085,0 +DA:9086,0 DA:9087,0 -DA:9088,0 +DA:9089,0 DA:9090,0 +DA:9091,0 DA:9092,0 DA:9093,0 DA:9094,0 +DA:9095,0 DA:9096,0 DA:9097,0 +DA:9098,0 DA:9099,0 -DA:9100,0 DA:9101,0 DA:9102,0 -DA:9103,0 -DA:9104,0 -DA:9105,0 DA:9106,0 DA:9108,0 -DA:9113,0 +DA:9109,0 +DA:9111,0 +DA:9113,1 DA:9114,0 -DA:9117,0 +DA:9115,0 +DA:9117,1 DA:9118,0 -DA:9119,0 DA:9120,0 DA:9121,0 DA:9122,0 DA:9123,0 DA:9124,0 -DA:9128,0 -DA:9130,0 -DA:9131,0 -DA:9132,0 +DA:9125,0 +DA:9126,0 +DA:9127,0 +DA:9129,0 DA:9134,0 DA:9135,0 -DA:9136,0 -DA:9137,0 DA:9138,0 DA:9139,0 +DA:9140,0 DA:9141,0 DA:9142,0 +DA:9143,0 DA:9144,0 DA:9145,0 -DA:9147,0 -DA:9148,0 DA:9149,0 -DA:9150,0 -DA:9151,0 -DA:9154,0 +DA:9151,1 +DA:9152,0 +DA:9153,0 DA:9155,0 DA:9156,0 DA:9157,0 DA:9158,0 +DA:9159,0 DA:9160,0 -DA:9161,0 DA:9162,0 -DA:9164,0 +DA:9163,0 DA:9165,0 -DA:9167,0 +DA:9166,0 DA:9168,0 +DA:9169,0 +DA:9170,0 +DA:9171,0 DA:9172,0 -DA:9173,0 -DA:9175,0 +DA:9175,1 DA:9176,0 +DA:9177,0 DA:9178,0 -DA:9180,0 +DA:9179,0 DA:9181,0 DA:9182,0 DA:9183,0 DA:9185,0 DA:9186,0 -DA:9187,0 +DA:9188,0 DA:9189,0 -DA:9190,0 -DA:9192,0 +DA:9193,0 DA:9194,0 -DA:9195,0 +DA:9196,0 DA:9197,0 DA:9199,0 -DA:9200,0 -DA:9201,0 +DA:9201,1 DA:9202,0 DA:9203,0 DA:9204,0 -DA:9205,0 +DA:9206,0 DA:9207,0 DA:9208,0 -DA:9210,0 +DA:9209,0 DA:9211,0 -DA:9213,0 +DA:9212,0 DA:9214,0 DA:9216,0 DA:9217,0 -DA:9218,0 -DA:9220,0 -DA:9221,0 +DA:9219,0 +DA:9221,1 DA:9222,0 DA:9223,0 +DA:9224,0 DA:9225,0 DA:9226,0 DA:9227,0 @@ -1641,28 +1589,28 @@ DA:9229,0 DA:9230,0 DA:9232,0 DA:9233,0 -DA:9234,0 DA:9235,0 +DA:9236,0 DA:9238,0 +DA:9239,0 DA:9240,0 -DA:9241,0 +DA:9242,0 +DA:9243,0 +DA:9244,0 DA:9245,0 -DA:9247,0 +DA:9247,1 DA:9248,0 DA:9249,0 -DA:9250,0 DA:9251,0 DA:9252,0 -DA:9253,0 -DA:9254,0 +DA:9254,1 DA:9255,0 +DA:9256,0 DA:9257,0 -DA:9261,0 +DA:9260,0 +DA:9262,0 DA:9263,0 -DA:9264,0 -DA:9265,0 -DA:9266,0 -DA:9268,0 +DA:9267,0 DA:9269,0 DA:9270,0 DA:9271,0 @@ -1671,71 +1619,72 @@ DA:9273,0 DA:9274,0 DA:9275,0 DA:9276,0 -DA:9278,0 +DA:9277,0 DA:9279,0 -DA:9280,0 -DA:9282,0 DA:9283,0 -DA:9284,0 -DA:9285,0 +DA:9285,1 +DA:9286,0 +DA:9287,0 DA:9288,0 -DA:9289,0 +DA:9290,0 +DA:9291,0 DA:9292,0 +DA:9293,0 DA:9294,0 DA:9295,0 DA:9296,0 DA:9297,0 DA:9298,0 -DA:9299,0 DA:9300,0 DA:9301,0 DA:9302,0 -DA:9303,0 DA:9304,0 DA:9305,0 DA:9306,0 DA:9307,0 -DA:9308,0 DA:9310,0 DA:9311,0 -DA:9312,0 DA:9314,0 -DA:9315,0 -DA:9316,0 +DA:9316,1 DA:9317,0 +DA:9318,0 +DA:9319,0 DA:9320,0 DA:9321,0 +DA:9322,0 +DA:9323,0 +DA:9324,0 DA:9325,0 DA:9326,0 DA:9327,0 DA:9328,0 DA:9329,0 DA:9330,0 +DA:9332,0 +DA:9333,0 DA:9334,0 DA:9336,0 DA:9337,0 DA:9338,0 -DA:9340,0 -DA:9341,0 +DA:9339,0 DA:9342,0 -DA:9344,0 -DA:9345,0 -DA:9346,0 +DA:9343,0 DA:9347,0 DA:9348,0 +DA:9349,0 DA:9350,0 DA:9351,0 -DA:9353,0 -DA:9354,0 -DA:9355,0 +DA:9352,0 DA:9356,0 -DA:9357,0 +DA:9358,1 +DA:9359,0 DA:9360,0 -DA:9362,0 +DA:9362,1 +DA:9363,0 DA:9364,0 -DA:9365,0 -DA:9366,0 +DA:9366,1 DA:9367,0 +DA:9368,0 DA:9369,0 DA:9370,0 DA:9372,0 @@ -1745,137 +1694,136 @@ DA:9376,0 DA:9377,0 DA:9378,0 DA:9379,0 -DA:9380,0 -DA:9381,0 DA:9382,0 -DA:9383,0 DA:9384,0 -DA:9385,0 -DA:9386,0 +DA:9386,1 DA:9387,0 DA:9388,0 DA:9389,0 -DA:9390,0 +DA:9391,0 DA:9392,0 DA:9394,0 DA:9395,0 -DA:9396,0 DA:9397,0 DA:9398,0 +DA:9399,0 DA:9400,0 +DA:9401,0 DA:9402,0 DA:9403,0 DA:9404,0 DA:9405,0 +DA:9406,0 DA:9407,0 DA:9408,0 DA:9409,0 DA:9410,0 +DA:9411,0 DA:9412,0 DA:9414,0 -DA:9415,0 +DA:9416,0 DA:9417,0 DA:9418,0 DA:9419,0 -DA:9421,0 -DA:9423,0 -DA:9424,0 +DA:9420,0 +DA:9422,0 +DA:9424,1 DA:9425,0 DA:9426,0 -DA:9428,0 +DA:9427,0 +DA:9429,0 +DA:9430,0 +DA:9431,0 +DA:9432,0 DA:9434,0 -DA:9435,0 +DA:9436,0 DA:9437,0 -DA:9438,0 DA:9439,0 DA:9440,0 DA:9441,0 -DA:9442,0 DA:9443,0 +DA:9445,1 +DA:9446,0 DA:9447,0 DA:9448,0 -DA:9449,0 DA:9450,0 -DA:9451,0 -DA:9452,0 -DA:9454,0 -DA:9455,0 +DA:9456,0 DA:9457,0 +DA:9459,0 DA:9460,0 DA:9461,0 DA:9462,0 DA:9463,0 DA:9464,0 DA:9465,0 -DA:9467,0 -DA:9468,0 DA:9469,0 DA:9470,0 +DA:9471,0 DA:9472,0 DA:9473,0 +DA:9474,0 DA:9475,0 DA:9477,0 -DA:9479,0 +DA:9478,0 DA:9480,0 -DA:9481,0 -DA:9482,0 +DA:9483,0 DA:9484,0 +DA:9485,0 DA:9486,0 DA:9487,0 DA:9488,0 DA:9490,0 DA:9491,0 +DA:9492,0 DA:9493,0 -DA:9494,0 DA:9495,0 DA:9496,0 DA:9498,0 -DA:9499,0 DA:9500,0 DA:9502,0 DA:9503,0 +DA:9504,0 DA:9505,0 DA:9507,0 -DA:9508,0 -DA:9509,0 +DA:9509,1 DA:9510,0 DA:9511,0 DA:9513,0 DA:9514,0 -DA:9515,0 +DA:9516,0 DA:9517,0 -DA:9520,0 +DA:9518,0 +DA:9519,0 DA:9521,0 +DA:9522,0 DA:9523,0 -DA:9524,0 +DA:9525,0 DA:9526,0 -DA:9527,0 -DA:9529,0 +DA:9528,0 +DA:9530,1 DA:9531,0 DA:9532,0 DA:9533,0 DA:9534,0 -DA:9535,0 DA:9536,0 DA:9537,0 +DA:9538,0 DA:9540,0 -DA:9541,0 -DA:9542,0 DA:9543,0 +DA:9544,0 DA:9546,0 DA:9547,0 -DA:9548,0 -DA:9551,0 +DA:9549,0 +DA:9550,0 DA:9552,0 -DA:9553,0 -DA:9554,0 +DA:9554,1 DA:9555,0 DA:9556,0 DA:9557,0 DA:9558,0 DA:9559,0 DA:9560,0 -DA:9561,0 +DA:9563,0 DA:9564,0 DA:9565,0 DA:9566,0 @@ -1885,85 +1833,84 @@ DA:9571,0 DA:9574,0 DA:9575,0 DA:9576,0 +DA:9577,0 +DA:9578,0 DA:9579,0 DA:9580,0 DA:9581,0 +DA:9582,0 +DA:9583,0 DA:9584,0 -DA:9585,0 -DA:9586,0 +DA:9587,0 +DA:9588,0 DA:9589,0 -DA:9590,0 -DA:9591,0 +DA:9592,0 +DA:9593,0 DA:9594,0 -DA:9595,0 -DA:9596,0 +DA:9597,0 +DA:9598,0 DA:9599,0 -DA:9600,0 -DA:9601,0 -DA:9605,0 -DA:9606,0 +DA:9602,0 +DA:9603,0 +DA:9604,0 +DA:9607,0 DA:9608,0 DA:9609,0 -DA:9611,0 DA:9612,0 DA:9613,0 -DA:9615,0 -DA:9616,0 +DA:9614,0 DA:9617,0 DA:9618,0 DA:9619,0 -DA:9620,0 -DA:9621,0 DA:9622,0 DA:9623,0 -DA:9625,0 -DA:9626,0 -DA:9627,0 +DA:9624,0 DA:9628,0 DA:9629,0 -DA:9630,0 +DA:9631,0 DA:9632,0 -DA:9633,0 DA:9634,0 DA:9635,0 DA:9636,0 DA:9638,0 DA:9639,0 DA:9640,0 +DA:9641,0 DA:9642,0 DA:9643,0 DA:9644,0 DA:9645,0 DA:9646,0 -DA:9647,0 DA:9648,0 DA:9649,0 +DA:9650,0 DA:9651,0 DA:9652,0 DA:9653,0 DA:9655,0 -DA:9774,0 -DA:9775,0 -DA:9776,0 -DA:9777,0 -DA:9778,0 -DA:9779,0 -DA:9780,0 -DA:9781,0 -DA:9782,0 -DA:9783,0 -DA:9784,0 -DA:9785,0 -DA:9786,0 -DA:9787,0 -DA:9788,0 -DA:9789,0 -DA:9790,0 -DA:9793,0 -DA:9794,0 -DA:9796,0 -DA:9798,0 +DA:9656,0 +DA:9657,0 +DA:9658,0 +DA:9659,0 +DA:9661,0 +DA:9662,0 +DA:9663,0 +DA:9665,0 +DA:9666,0 +DA:9667,0 +DA:9668,0 +DA:9669,0 +DA:9670,0 +DA:9671,0 +DA:9672,0 +DA:9674,0 +DA:9675,0 +DA:9676,0 +DA:9678,0 +DA:9797,1 +DA:9798,1 DA:9799,0 +DA:9800,0 DA:9801,0 DA:9802,0 DA:9803,0 @@ -1973,195 +1920,214 @@ DA:9806,0 DA:9807,0 DA:9808,0 DA:9809,0 +DA:9810,0 +DA:9811,0 +DA:9812,0 DA:9813,0 -DA:9814,0 -DA:9815,0 DA:9816,0 -DA:9818,0 +DA:9817,0 DA:9819,0 -DA:9820,0 DA:9821,0 DA:9822,0 -DA:9823,0 +DA:9824,0 DA:9825,0 DA:9826,0 DA:9827,0 +DA:9828,0 +DA:9829,0 +DA:9830,0 DA:9831,0 DA:9832,0 -DA:9834,0 DA:9836,0 DA:9837,0 DA:9838,0 DA:9839,0 DA:9840,0 -DA:9841,0 DA:9842,0 +DA:9843,0 DA:9844,0 +DA:9845,0 DA:9846,0 DA:9847,0 -DA:9848,0 +DA:9849,0 DA:9850,0 DA:9851,0 -DA:9852,0 -DA:9853,0 -DA:9854,0 +DA:9855,0 +DA:9856,0 DA:9858,0 -DA:9860,0 +DA:9860,1 DA:9861,0 DA:9862,0 DA:9863,0 DA:9864,0 +DA:9865,0 DA:9866,0 -DA:9867,0 DA:9868,0 -DA:9869,0 +DA:9870,0 DA:9871,0 DA:9872,0 -DA:9873,0 DA:9874,0 DA:9875,0 +DA:9876,0 DA:9877,0 DA:9878,0 -DA:9880,0 DA:9882,0 -DA:9883,0 -DA:9884,0 +DA:9884,1 DA:9885,0 +DA:9886,0 DA:9887,0 -DA:9889,0 +DA:9888,0 +DA:9890,1 DA:9891,0 DA:9892,0 DA:9893,0 -DA:9894,0 DA:9895,0 DA:9896,0 DA:9897,0 DA:9898,0 -DA:9900,0 +DA:9899,0 +DA:9901,0 DA:9902,0 -DA:9903,0 DA:9904,0 DA:9906,0 DA:9907,0 +DA:9908,0 +DA:9909,0 +DA:9911,0 +DA:9913,0 DA:9915,0 +DA:9916,0 DA:9917,0 DA:9918,0 +DA:9919,0 +DA:9920,0 DA:9921,0 DA:9922,0 -DA:9923,0 DA:9924,0 -DA:9925,0 +DA:9926,0 DA:9927,0 DA:9928,0 DA:9930,0 DA:9931,0 -DA:9932,0 -DA:9933,0 -DA:9934,0 -DA:9935,0 -DA:9936,0 -DA:9937,0 -DA:9938,0 -DA:9940,0 +DA:9939,0 +DA:9941,0 DA:9942,0 -DA:9943,0 -DA:9944,0 DA:9945,0 DA:9946,0 +DA:9947,0 DA:9948,0 DA:9949,0 DA:9951,0 DA:9952,0 -DA:9953,0 +DA:9954,1 DA:9955,0 +DA:9956,0 DA:9957,0 DA:9958,0 DA:9959,0 DA:9960,0 DA:9961,0 DA:9962,0 -DA:9963,0 -DA:9966,0 +DA:9964,0 +DA:9966,1 DA:9967,0 DA:9968,0 DA:9969,0 +DA:9970,0 DA:9972,0 DA:9973,0 -DA:9974,0 DA:9975,0 DA:9976,0 DA:9977,0 -DA:9978,0 DA:9979,0 -DA:9980,0 +DA:9981,1 +DA:9982,0 DA:9983,0 DA:9984,0 DA:9985,0 -DA:9988,0 -DA:9989,0 +DA:9986,0 +DA:9987,0 DA:9990,0 +DA:9991,0 +DA:9992,0 DA:9993,0 -DA:9994,0 -DA:9995,0 +DA:9996,0 +DA:9997,0 DA:9998,0 DA:9999,0 DA:10000,0 +DA:10001,0 +DA:10002,0 DA:10003,0 DA:10004,0 -DA:10005,0 +DA:10007,0 DA:10008,0 DA:10009,0 -DA:10010,0 +DA:10012,0 +DA:10013,0 DA:10014,0 -DA:10015,0 -DA:10016,0 +DA:10017,0 DA:10018,0 DA:10019,0 -DA:10021,0 -DA:10061,0 -DA:10062,0 -DA:10063,0 -DA:10065,0 -DA:10066,0 -DA:10067,0 -DA:10069,0 -DA:10071,0 -DA:10072,0 -DA:10073,0 -DA:10075,0 -DA:10076,0 -DA:10077,0 -DA:10078,0 -DA:10079,0 -DA:10083,0 +DA:10022,0 +DA:10023,0 +DA:10024,0 +DA:10027,0 +DA:10028,0 +DA:10029,0 +DA:10032,0 +DA:10033,0 +DA:10034,0 +DA:10038,0 +DA:10039,0 +DA:10040,0 +DA:10042,0 +DA:10043,0 +DA:10045,0 +DA:10085,1 +DA:10086,1 +DA:10087,0 +DA:10089,1 +DA:10090,0 +DA:10091,0 +DA:10093,0 +DA:10095,1 +DA:10096,0 +DA:10097,0 +DA:10099,0 +DA:10100,0 +DA:10101,0 DA:10102,0 -DA:10104,0 -DA:10106,0 +DA:10103,0 DA:10107,0 -DA:10108,0 -DA:10110,0 -DA:10113,0 -DA:10115,0 -DA:10116,0 -DA:10117,0 -DA:10122,0 -DA:10240,0 -DA:10266,0 -DA:10292,0 -LF:1353 -LH:0 +DA:10126,1 +DA:10128,1 +DA:10130,0 +DA:10131,0 +DA:10132,0 +DA:10134,0 +DA:10137,0 +DA:10139,1 +DA:10140,1 +DA:10141,0 +DA:10146,0 +DA:10263,1 +DA:10289,1 +DA:10315,1 +LF:1370 +LH:95 BRDA:22,0,0,0 -BRDA:22,0,1,0 +BRDA:22,0,1,2 BRDA:25,1,0,0 -BRDA:25,1,1,0 -BRDA:28,2,0,0 +BRDA:25,1,1,2 +BRDA:28,2,0,2 BRDA:28,2,1,0 BRDA:31,3,0,0 BRDA:31,3,1,0 BRDA:39,4,0,0 BRDA:39,4,1,0 BRDA:59,5,0,0 -BRDA:59,5,1,0 +BRDA:59,5,1,6 BRDA:73,6,0,0 BRDA:73,6,1,0 BRDA:76,7,0,0 @@ -2244,1098 +2210,966 @@ BRDA:204,45,0,0 BRDA:204,45,1,0 BRDA:207,46,0,0 BRDA:207,46,1,0 -BRDA:210,47,0,0 -BRDA:210,47,1,0 -BRDA:217,48,0,0 -BRDA:217,48,1,0 -BRDA:217,49,0,0 -BRDA:217,49,1,0 -BRDA:221,50,0,0 -BRDA:221,50,1,0 -BRDA:229,51,0,0 -BRDA:229,51,1,0 -BRDA:233,52,0,0 -BRDA:233,52,1,0 +BRDA:214,47,0,0 +BRDA:214,47,1,0 +BRDA:214,48,0,0 +BRDA:214,48,1,0 +BRDA:221,49,0,0 +BRDA:221,49,1,0 +BRDA:225,50,0,0 +BRDA:225,50,1,0 +BRDA:225,51,0,0 +BRDA:225,51,1,0 +BRDA:225,51,2,0 +BRDA:229,52,0,0 +BRDA:229,52,1,0 BRDA:233,53,0,0 BRDA:233,53,1,0 -BRDA:233,53,2,0 -BRDA:237,54,0,0 -BRDA:237,54,1,0 -BRDA:241,55,0,0 -BRDA:241,55,1,0 -BRDA:246,56,0,0 -BRDA:246,56,1,0 -BRDA:250,57,0,0 -BRDA:250,57,1,0 -BRDA:250,58,0,0 -BRDA:250,58,1,0 -BRDA:252,59,0,0 -BRDA:252,59,1,0 -BRDA:267,60,0,0 -BRDA:267,60,1,0 -BRDA:285,61,0,0 -BRDA:285,61,1,0 -BRDA:299,62,0,0 -BRDA:299,62,1,0 -BRDA:299,63,0,0 -BRDA:299,63,1,0 -BRDA:308,64,0,0 -BRDA:308,64,1,0 -BRDA:308,65,0,0 -BRDA:308,65,1,0 -BRDA:311,66,0,0 -BRDA:311,66,1,0 -BRDA:311,67,0,0 -BRDA:311,67,1,0 -BRDA:314,68,0,0 -BRDA:314,68,1,0 -BRDA:314,69,0,0 -BRDA:314,69,1,0 -BRDA:318,70,0,0 -BRDA:318,70,1,0 -BRDA:318,71,0,0 -BRDA:318,71,1,0 -BRDA:324,72,0,0 -BRDA:324,72,1,0 -BRDA:332,73,0,0 -BRDA:332,73,1,0 -BRDA:332,74,0,0 -BRDA:332,74,1,0 -BRDA:335,75,0,0 -BRDA:335,75,1,0 -BRDA:335,76,0,0 -BRDA:335,76,1,0 -BRDA:338,77,0,0 -BRDA:338,77,1,0 -BRDA:338,78,0,0 -BRDA:338,78,1,0 -BRDA:342,79,0,0 -BRDA:342,79,1,0 -BRDA:342,80,0,0 -BRDA:342,80,1,0 -BRDA:347,81,0,0 -BRDA:347,81,1,0 -BRDA:347,82,0,0 -BRDA:347,82,1,0 -BRDA:348,83,0,0 -BRDA:348,83,1,0 -BRDA:356,84,0,0 -BRDA:356,84,1,0 -BRDA:356,85,0,0 -BRDA:356,85,1,0 -BRDA:359,86,0,0 -BRDA:359,86,1,0 -BRDA:359,87,0,0 -BRDA:359,87,1,0 -BRDA:362,88,0,0 -BRDA:362,88,1,0 -BRDA:362,89,0,0 -BRDA:362,89,1,0 -BRDA:366,90,0,0 -BRDA:366,90,1,0 -BRDA:366,91,0,0 -BRDA:366,91,1,0 -BRDA:372,92,0,0 -BRDA:372,92,1,0 -BRDA:380,93,0,0 -BRDA:380,93,1,0 -BRDA:380,94,0,0 -BRDA:380,94,1,0 -BRDA:382,95,0,0 -BRDA:382,95,1,0 -BRDA:388,96,0,0 -BRDA:388,96,1,0 -BRDA:389,97,0,0 -BRDA:389,97,1,0 -BRDA:389,98,0,0 -BRDA:389,98,1,0 -BRDA:393,99,0,0 -BRDA:393,99,1,0 -BRDA:401,100,0,0 -BRDA:401,100,1,0 -BRDA:401,101,0,0 -BRDA:401,101,1,0 -BRDA:406,102,0,0 -BRDA:406,102,1,0 -BRDA:406,103,0,0 -BRDA:406,103,1,0 -BRDA:413,104,0,0 -BRDA:413,104,1,0 -BRDA:421,105,0,0 -BRDA:421,105,1,0 -BRDA:421,106,0,0 -BRDA:421,106,1,0 -BRDA:427,107,0,0 -BRDA:427,107,1,0 -BRDA:434,108,0,0 -BRDA:434,108,1,0 -BRDA:8417,109,0,0 -BRDA:8417,109,1,0 -BRDA:8422,110,0,0 -BRDA:8422,110,1,0 -BRDA:8425,111,0,0 -BRDA:8425,111,1,0 -BRDA:8426,112,0,0 -BRDA:8426,112,1,0 -BRDA:8434,113,0,0 -BRDA:8434,113,1,0 -BRDA:8434,114,0,0 -BRDA:8434,114,1,0 -BRDA:8437,115,0,0 -BRDA:8437,115,1,0 -BRDA:8449,116,0,0 -BRDA:8449,116,1,0 -BRDA:8449,117,0,0 -BRDA:8449,117,1,0 -BRDA:8458,118,0,0 -BRDA:8458,118,1,0 -BRDA:8458,119,0,0 -BRDA:8458,119,1,0 +BRDA:238,54,0,0 +BRDA:238,54,1,0 +BRDA:242,55,0,0 +BRDA:242,55,1,0 +BRDA:242,56,0,0 +BRDA:242,56,1,0 +BRDA:244,57,0,0 +BRDA:244,57,1,0 +BRDA:261,58,0,0 +BRDA:261,58,1,0 +BRDA:261,59,0,0 +BRDA:261,59,1,0 +BRDA:266,60,0,0 +BRDA:266,60,1,0 +BRDA:284,61,0,0 +BRDA:284,61,1,0 +BRDA:298,62,0,0 +BRDA:298,62,1,0 +BRDA:298,63,0,0 +BRDA:298,63,1,0 +BRDA:307,64,0,0 +BRDA:307,64,1,0 +BRDA:307,65,0,0 +BRDA:307,65,1,0 +BRDA:310,66,0,0 +BRDA:310,66,1,0 +BRDA:310,67,0,0 +BRDA:310,67,1,0 +BRDA:313,68,0,0 +BRDA:313,68,1,0 +BRDA:313,69,0,0 +BRDA:313,69,1,0 +BRDA:317,70,0,0 +BRDA:317,70,1,0 +BRDA:317,71,0,0 +BRDA:317,71,1,0 +BRDA:323,72,0,0 +BRDA:323,72,1,0 +BRDA:331,73,0,0 +BRDA:331,73,1,0 +BRDA:331,74,0,0 +BRDA:331,74,1,0 +BRDA:334,75,0,0 +BRDA:334,75,1,0 +BRDA:334,76,0,0 +BRDA:334,76,1,0 +BRDA:337,77,0,0 +BRDA:337,77,1,0 +BRDA:337,78,0,0 +BRDA:337,78,1,0 +BRDA:341,79,0,0 +BRDA:341,79,1,0 +BRDA:341,80,0,0 +BRDA:341,80,1,0 +BRDA:346,81,0,0 +BRDA:346,81,1,0 +BRDA:346,82,0,0 +BRDA:346,82,1,0 +BRDA:347,83,0,0 +BRDA:347,83,1,0 +BRDA:355,84,0,0 +BRDA:355,84,1,0 +BRDA:355,85,0,0 +BRDA:355,85,1,0 +BRDA:358,86,0,0 +BRDA:358,86,1,0 +BRDA:358,87,0,0 +BRDA:358,87,1,0 +BRDA:361,88,0,0 +BRDA:361,88,1,0 +BRDA:361,89,0,0 +BRDA:361,89,1,0 +BRDA:365,90,0,0 +BRDA:365,90,1,0 +BRDA:365,91,0,0 +BRDA:365,91,1,0 +BRDA:371,92,0,0 +BRDA:371,92,1,0 +BRDA:379,93,0,0 +BRDA:379,93,1,0 +BRDA:379,94,0,0 +BRDA:379,94,1,0 +BRDA:381,95,0,0 +BRDA:381,95,1,0 +BRDA:387,96,0,0 +BRDA:387,96,1,0 +BRDA:388,97,0,0 +BRDA:388,97,1,0 +BRDA:388,98,0,0 +BRDA:388,98,1,0 +BRDA:392,99,0,0 +BRDA:392,99,1,0 +BRDA:400,100,0,0 +BRDA:400,100,1,0 +BRDA:400,101,0,0 +BRDA:400,101,1,0 +BRDA:405,102,0,0 +BRDA:405,102,1,0 +BRDA:405,103,0,0 +BRDA:405,103,1,0 +BRDA:412,104,0,0 +BRDA:412,104,1,0 +BRDA:420,105,0,0 +BRDA:420,105,1,0 +BRDA:420,106,0,0 +BRDA:420,106,1,0 +BRDA:426,107,0,0 +BRDA:426,107,1,0 +BRDA:433,108,0,0 +BRDA:433,108,1,0 +BRDA:8416,109,0,0 +BRDA:8416,109,1,0 +BRDA:8421,110,0,0 +BRDA:8421,110,1,0 +BRDA:8424,111,0,0 +BRDA:8424,111,1,0 +BRDA:8425,112,0,0 +BRDA:8425,112,1,0 +BRDA:8433,113,0,0 +BRDA:8433,113,1,0 +BRDA:8433,114,0,0 +BRDA:8433,114,1,0 +BRDA:8436,115,0,0 +BRDA:8436,115,1,0 +BRDA:8448,116,0,0 +BRDA:8448,116,1,0 +BRDA:8448,117,0,0 +BRDA:8448,117,1,0 +BRDA:8455,118,0,0 +BRDA:8455,118,1,0 +BRDA:8455,119,0,0 +BRDA:8455,119,1,0 BRDA:8461,120,0,0 BRDA:8461,120,1,0 -BRDA:8466,121,0,0 -BRDA:8466,121,1,0 -BRDA:8466,122,0,0 -BRDA:8466,122,1,0 -BRDA:8469,123,0,0 -BRDA:8469,123,1,0 -BRDA:8476,124,0,0 -BRDA:8476,124,1,0 -BRDA:8482,125,0,0 -BRDA:8482,125,1,0 -BRDA:8482,126,0,0 -BRDA:8482,126,1,0 +BRDA:8461,121,0,0 +BRDA:8461,121,1,0 +BRDA:8467,122,0,0 +BRDA:8467,122,1,0 +BRDA:8467,123,0,0 +BRDA:8467,123,1,0 +BRDA:8478,124,0,0 +BRDA:8478,124,1,0 +BRDA:8478,125,0,0 +BRDA:8478,125,1,0 +BRDA:8481,126,0,0 +BRDA:8481,126,1,0 BRDA:8486,127,0,0 BRDA:8486,127,1,0 -BRDA:8494,128,0,0 -BRDA:8494,128,1,0 -BRDA:8500,129,0,0 -BRDA:8500,129,1,0 -BRDA:8500,130,0,0 -BRDA:8500,130,1,0 -BRDA:8507,131,0,0 -BRDA:8507,131,1,0 -BRDA:8517,132,0,0 -BRDA:8517,132,1,0 -BRDA:8520,133,0,0 -BRDA:8520,133,1,0 -BRDA:8524,134,0,0 -BRDA:8524,134,1,0 -BRDA:8538,135,0,0 -BRDA:8538,135,1,0 -BRDA:8539,136,0,0 -BRDA:8539,136,1,0 -BRDA:8546,137,0,0 -BRDA:8546,137,1,0 -BRDA:8554,138,0,0 -BRDA:8554,138,1,0 -BRDA:8563,139,0,0 -BRDA:8563,139,1,0 -BRDA:8567,140,0,0 -BRDA:8567,140,1,0 -BRDA:8569,141,0,0 -BRDA:8569,141,1,0 -BRDA:8572,142,0,0 -BRDA:8572,142,1,0 -BRDA:8575,143,0,0 -BRDA:8575,143,1,0 -BRDA:8582,144,0,0 -BRDA:8582,144,1,0 -BRDA:8587,145,0,0 -BRDA:8587,145,1,0 -BRDA:8595,146,0,0 -BRDA:8595,146,1,0 -BRDA:8595,147,0,0 -BRDA:8595,147,1,0 -BRDA:8610,148,0,0 -BRDA:8610,148,1,0 -BRDA:8624,149,0,0 -BRDA:8624,149,1,0 -BRDA:8624,150,0,0 -BRDA:8624,150,1,0 -BRDA:8624,150,2,0 -BRDA:8633,151,0,0 -BRDA:8633,151,1,0 -BRDA:8633,152,0,0 -BRDA:8633,152,1,0 -BRDA:8636,153,0,0 -BRDA:8636,153,1,0 -BRDA:8636,154,0,0 -BRDA:8636,154,1,0 -BRDA:8641,155,0,0 -BRDA:8641,155,1,0 -BRDA:8645,156,0,0 -BRDA:8645,156,1,0 -BRDA:8646,157,0,0 -BRDA:8646,157,1,0 -BRDA:8646,158,0,0 -BRDA:8646,158,1,0 -BRDA:8646,158,2,0 +BRDA:8486,128,0,0 +BRDA:8486,128,1,0 +BRDA:8489,129,0,0 +BRDA:8489,129,1,0 +BRDA:8496,130,0,0 +BRDA:8496,130,1,0 +BRDA:8502,131,0,0 +BRDA:8502,131,1,0 +BRDA:8510,132,0,0 +BRDA:8510,132,1,0 +BRDA:8516,133,0,0 +BRDA:8516,133,1,0 +BRDA:8516,134,0,0 +BRDA:8516,134,1,0 +BRDA:8523,135,0,0 +BRDA:8523,135,1,0 +BRDA:8533,136,0,0 +BRDA:8533,136,1,0 +BRDA:8536,137,0,0 +BRDA:8536,137,1,0 +BRDA:8540,138,0,0 +BRDA:8540,138,1,0 +BRDA:8554,139,0,0 +BRDA:8554,139,1,0 +BRDA:8555,140,0,0 +BRDA:8555,140,1,0 +BRDA:8562,141,0,0 +BRDA:8562,141,1,0 +BRDA:8570,142,0,0 +BRDA:8570,142,1,0 +BRDA:8579,143,0,0 +BRDA:8579,143,1,0 +BRDA:8583,144,0,0 +BRDA:8583,144,1,0 +BRDA:8585,145,0,0 +BRDA:8585,145,1,0 +BRDA:8588,146,0,0 +BRDA:8588,146,1,0 +BRDA:8591,147,0,0 +BRDA:8591,147,1,0 +BRDA:8598,148,0,0 +BRDA:8598,148,1,0 +BRDA:8603,149,0,0 +BRDA:8603,149,1,0 +BRDA:8611,150,0,0 +BRDA:8611,150,1,0 +BRDA:8611,151,0,0 +BRDA:8611,151,1,0 +BRDA:8626,152,0,0 +BRDA:8626,152,1,0 +BRDA:8640,153,0,0 +BRDA:8640,153,1,0 +BRDA:8640,154,0,0 +BRDA:8640,154,1,0 +BRDA:8640,154,2,0 +BRDA:8649,155,0,0 +BRDA:8649,155,1,0 +BRDA:8649,156,0,0 +BRDA:8649,156,1,0 +BRDA:8652,157,0,0 +BRDA:8652,157,1,0 +BRDA:8652,158,0,0 +BRDA:8652,158,1,0 BRDA:8657,159,0,0 BRDA:8657,159,1,0 -BRDA:8668,160,0,0 -BRDA:8668,160,1,0 -BRDA:8668,161,0,0 -BRDA:8668,161,1,0 -BRDA:8671,162,0,0 -BRDA:8671,162,1,0 -BRDA:8676,163,0,0 -BRDA:8676,163,1,0 -BRDA:8676,164,0,0 -BRDA:8676,164,1,0 -BRDA:8679,165,0,0 -BRDA:8679,165,1,0 -BRDA:8686,166,0,0 -BRDA:8686,166,1,0 +BRDA:8661,160,0,0 +BRDA:8661,160,1,0 +BRDA:8662,161,0,0 +BRDA:8662,161,1,0 +BRDA:8662,162,0,0 +BRDA:8662,162,1,0 +BRDA:8662,162,2,0 +BRDA:8673,163,0,0 +BRDA:8673,163,1,0 +BRDA:8684,164,0,0 +BRDA:8684,164,1,0 +BRDA:8684,165,0,0 +BRDA:8684,165,1,0 +BRDA:8687,166,0,0 +BRDA:8687,166,1,0 BRDA:8692,167,0,0 BRDA:8692,167,1,0 BRDA:8692,168,0,0 BRDA:8692,168,1,0 -BRDA:8700,169,0,0 -BRDA:8700,169,1,0 -BRDA:8708,170,0,0 -BRDA:8708,170,1,0 -BRDA:8716,171,0,0 -BRDA:8716,171,1,0 -BRDA:8718,172,0,0 -BRDA:8718,172,1,0 -BRDA:8720,173,0,0 -BRDA:8720,173,1,0 -BRDA:8723,174,0,0 -BRDA:8723,174,1,0 -BRDA:8734,175,0,0 -BRDA:8734,175,1,0 -BRDA:8738,176,0,0 -BRDA:8738,176,1,0 -BRDA:8747,177,0,0 -BRDA:8747,177,1,0 -BRDA:8747,178,0,0 -BRDA:8747,178,1,0 -BRDA:8752,179,0,0 -BRDA:8752,179,1,0 -BRDA:8766,180,0,0 -BRDA:8766,180,1,0 -BRDA:8766,181,0,0 -BRDA:8766,181,1,0 -BRDA:8766,181,2,0 -BRDA:8775,182,0,0 -BRDA:8775,182,1,0 -BRDA:8779,183,0,0 -BRDA:8779,183,1,0 -BRDA:8780,184,0,0 -BRDA:8780,184,1,0 -BRDA:8780,185,0,0 -BRDA:8780,185,1,0 -BRDA:8780,185,2,0 -BRDA:8787,186,0,0 -BRDA:8787,186,1,0 -BRDA:8789,187,0,0 -BRDA:8789,187,1,0 -BRDA:8791,188,0,0 -BRDA:8791,188,1,0 -BRDA:8791,189,0,0 -BRDA:8791,189,1,0 -BRDA:8797,190,0,0 -BRDA:8797,190,1,0 +BRDA:8695,169,0,0 +BRDA:8695,169,1,0 +BRDA:8702,170,0,0 +BRDA:8702,170,1,0 +BRDA:8708,171,0,0 +BRDA:8708,171,1,0 +BRDA:8708,172,0,0 +BRDA:8708,172,1,0 +BRDA:8716,173,0,0 +BRDA:8716,173,1,0 +BRDA:8724,174,0,0 +BRDA:8724,174,1,0 +BRDA:8732,175,0,0 +BRDA:8732,175,1,0 +BRDA:8734,176,0,0 +BRDA:8734,176,1,0 +BRDA:8736,177,0,0 +BRDA:8736,177,1,0 +BRDA:8739,178,0,0 +BRDA:8739,178,1,0 +BRDA:8750,179,0,0 +BRDA:8750,179,1,0 +BRDA:8754,180,0,0 +BRDA:8754,180,1,0 +BRDA:8763,181,0,0 +BRDA:8763,181,1,0 +BRDA:8763,182,0,0 +BRDA:8763,182,1,0 +BRDA:8768,183,0,0 +BRDA:8768,183,1,0 +BRDA:8782,184,0,0 +BRDA:8782,184,1,0 +BRDA:8782,185,0,0 +BRDA:8782,185,1,0 +BRDA:8782,185,2,0 +BRDA:8791,186,0,0 +BRDA:8791,186,1,0 +BRDA:8797,187,0,0 +BRDA:8797,187,1,0 +BRDA:8797,188,0,0 +BRDA:8797,188,1,0 +BRDA:8797,188,2,0 +BRDA:8797,188,3,0 +BRDA:8800,189,0,0 +BRDA:8800,189,1,0 +BRDA:8801,190,0,0 +BRDA:8801,190,1,0 BRDA:8801,191,0,0 BRDA:8801,191,1,0 -BRDA:8801,192,0,0 -BRDA:8801,192,1,0 -BRDA:8804,193,0,0 -BRDA:8804,193,1,0 -BRDA:8804,194,0,0 -BRDA:8804,194,1,0 -BRDA:8810,195,0,0 -BRDA:8810,195,1,0 -BRDA:8813,196,0,0 -BRDA:8813,196,1,0 -BRDA:8813,197,0,0 -BRDA:8813,197,1,0 -BRDA:8818,198,0,0 -BRDA:8818,198,1,0 -BRDA:8818,199,0,0 -BRDA:8818,199,1,0 -BRDA:8826,200,0,0 -BRDA:8826,200,1,0 -BRDA:8829,201,0,0 -BRDA:8829,201,1,0 -BRDA:8836,202,0,0 -BRDA:8836,202,1,0 -BRDA:8844,203,0,0 -BRDA:8844,203,1,0 -BRDA:8858,204,0,0 -BRDA:8858,204,1,0 -BRDA:8860,205,0,0 -BRDA:8860,205,1,0 -BRDA:8865,206,0,0 -BRDA:8865,206,1,0 -BRDA:8876,207,0,0 -BRDA:8876,207,1,0 -BRDA:8879,208,0,0 -BRDA:8879,208,1,0 -BRDA:8883,209,0,0 -BRDA:8883,209,1,0 -BRDA:8887,210,0,0 -BRDA:8887,210,1,0 -BRDA:8895,211,0,0 -BRDA:8895,211,1,0 -BRDA:8901,212,0,0 -BRDA:8901,212,1,0 -BRDA:8908,213,0,0 -BRDA:8908,213,1,0 -BRDA:8911,214,0,0 -BRDA:8911,214,1,0 -BRDA:8915,215,0,0 -BRDA:8915,215,1,0 -BRDA:8919,216,0,0 -BRDA:8919,216,1,0 -BRDA:8929,217,0,0 -BRDA:8929,217,1,0 -BRDA:8932,218,0,0 -BRDA:8932,218,1,0 -BRDA:8936,219,0,0 -BRDA:8936,219,1,0 -BRDA:8940,220,0,0 -BRDA:8940,220,1,0 -BRDA:8947,221,0,0 -BRDA:8947,221,1,0 -BRDA:8957,222,0,0 -BRDA:8957,222,1,0 -BRDA:8963,223,0,0 -BRDA:8963,223,1,0 -BRDA:8968,224,0,0 -BRDA:8968,224,1,0 -BRDA:8971,225,0,0 -BRDA:8971,225,1,0 -BRDA:8975,226,0,0 -BRDA:8975,226,1,0 -BRDA:8979,227,0,0 -BRDA:8979,227,1,0 -BRDA:8986,228,0,0 -BRDA:8986,228,1,0 -BRDA:8986,229,0,0 -BRDA:8986,229,1,0 -BRDA:8986,229,2,0 -BRDA:9022,230,0,0 -BRDA:9022,230,1,0 -BRDA:9025,231,0,0 -BRDA:9025,231,1,0 -BRDA:9028,232,0,0 -BRDA:9028,232,1,0 -BRDA:9031,233,0,0 -BRDA:9031,233,1,0 -BRDA:9035,234,0,0 -BRDA:9035,234,1,0 -BRDA:9038,235,0,0 -BRDA:9038,235,1,0 -BRDA:9041,236,0,0 -BRDA:9041,236,1,0 -BRDA:9041,237,0,0 -BRDA:9041,237,1,0 -BRDA:9048,238,0,0 -BRDA:9048,238,1,0 -BRDA:9051,239,0,0 -BRDA:9051,239,1,0 -BRDA:9054,240,0,0 -BRDA:9054,240,1,0 -BRDA:9063,241,0,0 -BRDA:9063,241,1,0 -BRDA:9064,242,0,0 -BRDA:9064,242,1,0 -BRDA:9065,243,0,0 -BRDA:9065,243,1,0 -BRDA:9065,244,0,0 -BRDA:9065,244,1,0 -BRDA:9070,245,0,0 -BRDA:9070,245,1,0 -BRDA:9077,246,0,0 -BRDA:9077,246,1,0 -BRDA:9078,247,0,0 -BRDA:9078,247,1,0 -BRDA:9080,248,0,0 -BRDA:9080,248,1,0 -BRDA:9087,249,0,0 -BRDA:9087,249,1,0 -BRDA:9102,250,0,0 -BRDA:9102,250,1,0 -BRDA:9105,251,0,0 -BRDA:9105,251,1,0 -BRDA:9113,252,0,0 -BRDA:9113,252,1,0 -BRDA:9113,253,0,0 -BRDA:9113,253,1,0 -BRDA:9119,254,0,0 -BRDA:9119,254,1,0 -BRDA:9122,255,0,0 -BRDA:9122,255,1,0 -BRDA:9131,256,0,0 -BRDA:9131,256,1,0 -BRDA:9131,257,0,0 -BRDA:9131,257,1,0 +BRDA:8801,191,2,0 +BRDA:8808,192,0,0 +BRDA:8808,192,1,0 +BRDA:8810,193,0,0 +BRDA:8810,193,1,0 +BRDA:8812,194,0,0 +BRDA:8812,194,1,0 +BRDA:8812,195,0,0 +BRDA:8812,195,1,0 +BRDA:8818,196,0,0 +BRDA:8818,196,1,0 +BRDA:8822,197,0,0 +BRDA:8822,197,1,0 +BRDA:8822,198,0,0 +BRDA:8822,198,1,0 +BRDA:8825,199,0,0 +BRDA:8825,199,1,0 +BRDA:8825,200,0,0 +BRDA:8825,200,1,0 +BRDA:8831,201,0,0 +BRDA:8831,201,1,0 +BRDA:8834,202,0,0 +BRDA:8834,202,1,0 +BRDA:8834,203,0,0 +BRDA:8834,203,1,0 +BRDA:8839,204,0,0 +BRDA:8839,204,1,0 +BRDA:8839,205,0,0 +BRDA:8839,205,1,0 +BRDA:8847,206,0,0 +BRDA:8847,206,1,0 +BRDA:8850,207,0,0 +BRDA:8850,207,1,0 +BRDA:8857,208,0,0 +BRDA:8857,208,1,0 +BRDA:8865,209,0,0 +BRDA:8865,209,1,0 +BRDA:8879,210,0,0 +BRDA:8879,210,1,0 +BRDA:8881,211,0,0 +BRDA:8881,211,1,0 +BRDA:8886,212,0,0 +BRDA:8886,212,1,0 +BRDA:8897,213,0,0 +BRDA:8897,213,1,0 +BRDA:8900,214,0,0 +BRDA:8900,214,1,0 +BRDA:8904,215,0,0 +BRDA:8904,215,1,0 +BRDA:8908,216,0,0 +BRDA:8908,216,1,0 +BRDA:8916,217,0,0 +BRDA:8916,217,1,0 +BRDA:8922,218,0,0 +BRDA:8922,218,1,0 +BRDA:8929,219,0,0 +BRDA:8929,219,1,0 +BRDA:8932,220,0,0 +BRDA:8932,220,1,0 +BRDA:8936,221,0,0 +BRDA:8936,221,1,0 +BRDA:8940,222,0,0 +BRDA:8940,222,1,0 +BRDA:8950,223,0,0 +BRDA:8950,223,1,0 +BRDA:8953,224,0,0 +BRDA:8953,224,1,0 +BRDA:8957,225,0,0 +BRDA:8957,225,1,0 +BRDA:8961,226,0,0 +BRDA:8961,226,1,0 +BRDA:8968,227,0,0 +BRDA:8968,227,1,0 +BRDA:8978,228,0,0 +BRDA:8978,228,1,0 +BRDA:8984,229,0,0 +BRDA:8984,229,1,0 +BRDA:8989,230,0,0 +BRDA:8989,230,1,0 +BRDA:8992,231,0,0 +BRDA:8992,231,1,0 +BRDA:8996,232,0,0 +BRDA:8996,232,1,0 +BRDA:9000,233,0,0 +BRDA:9000,233,1,0 +BRDA:9007,234,0,0 +BRDA:9007,234,1,0 +BRDA:9007,235,0,0 +BRDA:9007,235,1,0 +BRDA:9007,235,2,0 +BRDA:9043,236,0,0 +BRDA:9043,236,1,0 +BRDA:9046,237,0,0 +BRDA:9046,237,1,0 +BRDA:9049,238,0,0 +BRDA:9049,238,1,0 +BRDA:9052,239,0,0 +BRDA:9052,239,1,0 +BRDA:9056,240,0,0 +BRDA:9056,240,1,0 +BRDA:9059,241,0,0 +BRDA:9059,241,1,0 +BRDA:9062,242,0,0 +BRDA:9062,242,1,0 +BRDA:9062,243,0,0 +BRDA:9062,243,1,0 +BRDA:9069,244,0,0 +BRDA:9069,244,1,0 +BRDA:9072,245,0,0 +BRDA:9072,245,1,0 +BRDA:9075,246,0,0 +BRDA:9075,246,1,0 +BRDA:9084,247,0,0 +BRDA:9084,247,1,0 +BRDA:9085,248,0,0 +BRDA:9085,248,1,0 +BRDA:9086,249,0,0 +BRDA:9086,249,1,0 +BRDA:9086,250,0,0 +BRDA:9086,250,1,0 +BRDA:9091,251,0,0 +BRDA:9091,251,1,0 +BRDA:9098,252,0,0 +BRDA:9098,252,1,0 +BRDA:9099,253,0,0 +BRDA:9099,253,1,0 +BRDA:9101,254,0,0 +BRDA:9101,254,1,0 +BRDA:9108,255,0,0 +BRDA:9108,255,1,0 +BRDA:9123,256,0,0 +BRDA:9123,256,1,0 +BRDA:9126,257,0,0 +BRDA:9126,257,1,0 BRDA:9134,258,0,0 BRDA:9134,258,1,0 -BRDA:9141,259,0,0 -BRDA:9141,259,1,0 -BRDA:9144,260,0,0 -BRDA:9144,260,1,0 -BRDA:9156,261,0,0 -BRDA:9156,261,1,0 -BRDA:9156,262,0,0 -BRDA:9156,262,1,0 -BRDA:9161,263,0,0 -BRDA:9161,263,1,0 -BRDA:9167,264,0,0 -BRDA:9167,264,1,0 -BRDA:9172,265,0,0 -BRDA:9172,265,1,0 -BRDA:9175,266,0,0 -BRDA:9175,266,1,0 -BRDA:9182,267,0,0 -BRDA:9182,267,1,0 -BRDA:9189,268,0,0 -BRDA:9189,268,1,0 -BRDA:9194,269,0,0 -BRDA:9194,269,1,0 -BRDA:9200,270,0,0 -BRDA:9200,270,1,0 -BRDA:9200,271,0,0 -BRDA:9200,271,1,0 -BRDA:9200,271,2,0 -BRDA:9207,272,0,0 -BRDA:9207,272,1,0 -BRDA:9210,273,0,0 -BRDA:9210,273,1,0 -BRDA:9213,274,0,0 -BRDA:9213,274,1,0 -BRDA:9213,275,0,0 -BRDA:9213,275,1,0 -BRDA:9217,276,0,0 -BRDA:9217,276,1,0 -BRDA:9226,277,0,0 -BRDA:9226,277,1,0 -BRDA:9240,278,0,0 -BRDA:9240,278,1,0 -BRDA:9251,279,0,0 -BRDA:9251,279,1,0 -BRDA:9254,280,0,0 -BRDA:9254,280,1,0 -BRDA:9265,281,0,0 -BRDA:9265,281,1,0 -BRDA:9270,282,0,0 -BRDA:9270,282,1,0 -BRDA:9270,283,0,0 -BRDA:9270,283,1,0 -BRDA:9270,283,2,0 -BRDA:9275,284,0,0 -BRDA:9275,284,1,0 -BRDA:9278,285,0,0 -BRDA:9278,285,1,0 -BRDA:9282,286,0,0 -BRDA:9282,286,1,0 -BRDA:9288,287,0,0 -BRDA:9288,287,1,0 -BRDA:9297,288,0,0 -BRDA:9297,288,1,0 -BRDA:9299,289,0,0 -BRDA:9299,289,1,0 -BRDA:9303,290,0,0 -BRDA:9303,290,1,0 -BRDA:9303,291,0,0 -BRDA:9303,291,1,0 -BRDA:9303,291,2,0 -BRDA:9307,292,0,0 -BRDA:9307,292,1,0 +BRDA:9134,259,0,0 +BRDA:9134,259,1,0 +BRDA:9140,260,0,0 +BRDA:9140,260,1,0 +BRDA:9143,261,0,0 +BRDA:9143,261,1,0 +BRDA:9152,262,0,0 +BRDA:9152,262,1,0 +BRDA:9152,263,0,0 +BRDA:9152,263,1,0 +BRDA:9155,264,0,0 +BRDA:9155,264,1,0 +BRDA:9162,265,0,0 +BRDA:9162,265,1,0 +BRDA:9165,266,0,0 +BRDA:9165,266,1,0 +BRDA:9177,267,0,0 +BRDA:9177,267,1,0 +BRDA:9177,268,0,0 +BRDA:9177,268,1,0 +BRDA:9182,269,0,0 +BRDA:9182,269,1,0 +BRDA:9188,270,0,0 +BRDA:9188,270,1,0 +BRDA:9193,271,0,0 +BRDA:9193,271,1,0 +BRDA:9196,272,0,0 +BRDA:9196,272,1,0 +BRDA:9203,273,0,0 +BRDA:9203,273,1,0 +BRDA:9211,274,0,0 +BRDA:9211,274,1,0 +BRDA:9216,275,0,0 +BRDA:9216,275,1,0 +BRDA:9222,276,0,0 +BRDA:9222,276,1,0 +BRDA:9222,277,0,0 +BRDA:9222,277,1,0 +BRDA:9222,277,2,0 +BRDA:9229,278,0,0 +BRDA:9229,278,1,0 +BRDA:9232,279,0,0 +BRDA:9232,279,1,0 +BRDA:9235,280,0,0 +BRDA:9235,280,1,0 +BRDA:9235,281,0,0 +BRDA:9235,281,1,0 +BRDA:9239,282,0,0 +BRDA:9239,282,1,0 +BRDA:9248,283,0,0 +BRDA:9248,283,1,0 +BRDA:9262,284,0,0 +BRDA:9262,284,1,0 +BRDA:9273,285,0,0 +BRDA:9273,285,1,0 +BRDA:9276,286,0,0 +BRDA:9276,286,1,0 +BRDA:9287,287,0,0 +BRDA:9287,287,1,0 +BRDA:9292,288,0,0 +BRDA:9292,288,1,0 +BRDA:9292,289,0,0 +BRDA:9292,289,1,0 +BRDA:9292,289,2,0 +BRDA:9297,290,0,0 +BRDA:9297,290,1,0 +BRDA:9300,291,0,0 +BRDA:9300,291,1,0 +BRDA:9304,292,0,0 +BRDA:9304,292,1,0 BRDA:9310,293,0,0 BRDA:9310,293,1,0 -BRDA:9314,294,0,0 -BRDA:9314,294,1,0 -BRDA:9320,295,0,0 -BRDA:9320,295,1,0 -BRDA:9347,296,0,0 -BRDA:9347,296,1,0 -BRDA:9347,297,0,0 -BRDA:9347,297,1,0 -BRDA:9350,298,0,0 -BRDA:9350,298,1,0 -BRDA:9350,299,0,0 -BRDA:9350,299,1,0 -BRDA:9354,300,0,0 -BRDA:9354,300,1,0 -BRDA:9366,301,0,0 -BRDA:9366,301,1,0 +BRDA:9319,294,0,0 +BRDA:9319,294,1,0 +BRDA:9321,295,0,0 +BRDA:9321,295,1,0 +BRDA:9325,296,0,0 +BRDA:9325,296,1,0 +BRDA:9325,297,0,0 +BRDA:9325,297,1,0 +BRDA:9325,297,2,0 +BRDA:9329,298,0,0 +BRDA:9329,298,1,0 +BRDA:9332,299,0,0 +BRDA:9332,299,1,0 +BRDA:9336,300,0,0 +BRDA:9336,300,1,0 +BRDA:9342,301,0,0 +BRDA:9342,301,1,0 BRDA:9369,302,0,0 BRDA:9369,302,1,0 -BRDA:9372,303,0,0 -BRDA:9372,303,1,0 -BRDA:9386,304,0,0 -BRDA:9386,304,1,0 -BRDA:9386,305,0,0 -BRDA:9386,305,1,0 -BRDA:9389,306,0,0 -BRDA:9389,306,1,0 -BRDA:9404,307,0,0 -BRDA:9404,307,1,0 -BRDA:9404,308,0,0 -BRDA:9404,308,1,0 -BRDA:9407,309,0,0 -BRDA:9407,309,1,0 -BRDA:9407,310,0,0 -BRDA:9407,310,1,0 -BRDA:9407,310,2,0 -BRDA:9409,311,0,0 -BRDA:9409,311,1,0 -BRDA:9414,312,0,0 -BRDA:9414,312,1,0 -BRDA:9418,313,0,0 -BRDA:9418,313,1,0 -BRDA:9425,314,0,0 -BRDA:9425,314,1,0 -BRDA:9434,315,0,0 -BRDA:9434,315,1,0 -BRDA:9437,316,0,0 -BRDA:9437,316,1,0 -BRDA:9439,317,0,0 -BRDA:9439,317,1,0 -BRDA:9442,318,0,0 -BRDA:9442,318,1,0 -BRDA:9449,319,0,0 -BRDA:9449,319,1,0 -BRDA:9454,320,0,0 -BRDA:9454,320,1,0 -BRDA:9463,321,0,0 -BRDA:9463,321,1,0 -BRDA:9469,322,0,0 -BRDA:9469,322,1,0 -BRDA:9479,323,0,0 -BRDA:9479,323,1,0 -BRDA:9480,324,0,0 -BRDA:9480,324,1,0 -BRDA:9480,325,0,0 -BRDA:9480,325,1,0 -BRDA:9480,325,2,0 -BRDA:9487,326,0,0 -BRDA:9487,326,1,0 -BRDA:9487,327,0,0 -BRDA:9487,327,1,0 -BRDA:9490,328,0,0 -BRDA:9490,328,1,0 -BRDA:9495,329,0,0 -BRDA:9495,329,1,0 -BRDA:9498,330,0,0 -BRDA:9498,330,1,0 -BRDA:9499,331,0,0 -BRDA:9499,331,1,0 -BRDA:9502,332,0,0 -BRDA:9502,332,1,0 -BRDA:9503,333,0,0 -BRDA:9503,333,1,0 -BRDA:9510,334,0,0 -BRDA:9510,334,1,0 -BRDA:9513,335,0,0 -BRDA:9513,335,1,0 -BRDA:9514,336,0,0 -BRDA:9514,336,1,0 -BRDA:9520,337,0,0 -BRDA:9520,337,1,0 -BRDA:9520,338,0,0 -BRDA:9520,338,1,0 -BRDA:9523,339,0,0 -BRDA:9523,339,1,0 -BRDA:9526,340,0,0 -BRDA:9526,340,1,0 -BRDA:9526,341,0,0 -BRDA:9526,341,1,0 -BRDA:9535,342,0,0 -BRDA:9535,342,1,0 -BRDA:9536,343,0,0 -BRDA:9536,343,1,0 -BRDA:9541,344,0,0 -BRDA:9541,344,1,0 -BRDA:9542,345,0,0 -BRDA:9542,345,1,0 -BRDA:9546,346,0,0 -BRDA:9546,346,1,0 -BRDA:9547,347,0,0 -BRDA:9547,347,1,0 -BRDA:9557,348,0,0 -BRDA:9557,348,1,0 +BRDA:9369,303,0,0 +BRDA:9369,303,1,0 +BRDA:9372,304,0,0 +BRDA:9372,304,1,0 +BRDA:9372,305,0,0 +BRDA:9372,305,1,0 +BRDA:9376,306,0,0 +BRDA:9376,306,1,0 +BRDA:9388,307,0,0 +BRDA:9388,307,1,0 +BRDA:9391,308,0,0 +BRDA:9391,308,1,0 +BRDA:9394,309,0,0 +BRDA:9394,309,1,0 +BRDA:9408,310,0,0 +BRDA:9408,310,1,0 +BRDA:9408,311,0,0 +BRDA:9408,311,1,0 +BRDA:9411,312,0,0 +BRDA:9411,312,1,0 +BRDA:9426,313,0,0 +BRDA:9426,313,1,0 +BRDA:9426,314,0,0 +BRDA:9426,314,1,0 +BRDA:9429,315,0,0 +BRDA:9429,315,1,0 +BRDA:9429,316,0,0 +BRDA:9429,316,1,0 +BRDA:9429,316,2,0 +BRDA:9431,317,0,0 +BRDA:9431,317,1,0 +BRDA:9436,318,0,0 +BRDA:9436,318,1,0 +BRDA:9440,319,0,0 +BRDA:9440,319,1,0 +BRDA:9447,320,0,0 +BRDA:9447,320,1,0 +BRDA:9456,321,0,0 +BRDA:9456,321,1,0 +BRDA:9459,322,0,0 +BRDA:9459,322,1,0 +BRDA:9461,323,0,0 +BRDA:9461,323,1,0 +BRDA:9464,324,0,0 +BRDA:9464,324,1,0 +BRDA:9471,325,0,0 +BRDA:9471,325,1,0 +BRDA:9477,326,0,0 +BRDA:9477,326,1,0 +BRDA:9486,327,0,0 +BRDA:9486,327,1,0 +BRDA:9492,328,0,0 +BRDA:9492,328,1,0 +BRDA:9502,329,0,0 +BRDA:9502,329,1,0 +BRDA:9503,330,0,0 +BRDA:9503,330,1,0 +BRDA:9503,331,0,0 +BRDA:9503,331,1,0 +BRDA:9503,331,2,0 +BRDA:9510,332,0,0 +BRDA:9510,332,1,0 +BRDA:9510,333,0,0 +BRDA:9510,333,1,0 +BRDA:9513,334,0,0 +BRDA:9513,334,1,0 +BRDA:9518,335,0,0 +BRDA:9518,335,1,0 +BRDA:9521,336,0,0 +BRDA:9521,336,1,0 +BRDA:9522,337,0,0 +BRDA:9522,337,1,0 +BRDA:9525,338,0,0 +BRDA:9525,338,1,0 +BRDA:9526,339,0,0 +BRDA:9526,339,1,0 +BRDA:9533,340,0,0 +BRDA:9533,340,1,0 +BRDA:9536,341,0,0 +BRDA:9536,341,1,0 +BRDA:9537,342,0,0 +BRDA:9537,342,1,0 +BRDA:9543,343,0,0 +BRDA:9543,343,1,0 +BRDA:9543,344,0,0 +BRDA:9543,344,1,0 +BRDA:9546,345,0,0 +BRDA:9546,345,1,0 +BRDA:9549,346,0,0 +BRDA:9549,346,1,0 +BRDA:9549,347,0,0 +BRDA:9549,347,1,0 +BRDA:9558,348,0,0 +BRDA:9558,348,1,0 BRDA:9559,349,0,0 BRDA:9559,349,1,0 -BRDA:9560,350,0,0 -BRDA:9560,350,1,0 -BRDA:9564,351,0,0 -BRDA:9564,351,1,0 -BRDA:9565,352,0,0 -BRDA:9565,352,1,0 -BRDA:9569,353,0,0 -BRDA:9569,353,1,0 -BRDA:9570,354,0,0 -BRDA:9570,354,1,0 -BRDA:9574,355,0,0 -BRDA:9574,355,1,0 -BRDA:9575,356,0,0 -BRDA:9575,356,1,0 -BRDA:9579,357,0,0 -BRDA:9579,357,1,0 -BRDA:9580,358,0,0 -BRDA:9580,358,1,0 -BRDA:9584,359,0,0 -BRDA:9584,359,1,0 -BRDA:9585,360,0,0 -BRDA:9585,360,1,0 -BRDA:9589,361,0,0 -BRDA:9589,361,1,0 -BRDA:9590,362,0,0 -BRDA:9590,362,1,0 -BRDA:9594,363,0,0 -BRDA:9594,363,1,0 -BRDA:9595,364,0,0 -BRDA:9595,364,1,0 -BRDA:9599,365,0,0 -BRDA:9599,365,1,0 -BRDA:9600,366,0,0 -BRDA:9600,366,1,0 -BRDA:9605,367,0,0 -BRDA:9605,367,1,0 -BRDA:9605,368,0,0 -BRDA:9605,368,1,0 -BRDA:9608,369,0,0 -BRDA:9608,369,1,0 -BRDA:9608,370,0,0 -BRDA:9608,370,1,0 -BRDA:9611,371,0,0 -BRDA:9611,371,1,0 -BRDA:9611,372,0,0 -BRDA:9611,372,1,0 -BRDA:9620,373,0,0 -BRDA:9620,373,1,0 -BRDA:9622,374,0,0 -BRDA:9622,374,1,0 -BRDA:9627,375,0,0 -BRDA:9627,375,1,0 -BRDA:9629,376,0,0 -BRDA:9629,376,1,0 -BRDA:9629,377,0,0 -BRDA:9629,377,1,0 -BRDA:9632,378,0,0 -BRDA:9632,378,1,0 -BRDA:9632,379,0,0 -BRDA:9632,379,1,0 -BRDA:9635,380,0,0 -BRDA:9635,380,1,0 -BRDA:9643,381,0,0 -BRDA:9643,381,1,0 -BRDA:9645,382,0,0 -BRDA:9645,382,1,0 -BRDA:9648,383,0,0 -BRDA:9648,383,1,0 -BRDA:9790,384,0,0 -BRDA:9790,384,1,0 -BRDA:9793,385,0,0 -BRDA:9793,385,1,0 -BRDA:9798,386,0,0 -BRDA:9798,386,1,0 -BRDA:9804,387,0,0 -BRDA:9804,387,1,0 -BRDA:9807,388,0,0 -BRDA:9807,388,1,0 -BRDA:9813,389,0,0 -BRDA:9813,389,1,0 -BRDA:9818,390,0,0 -BRDA:9818,390,1,0 -BRDA:9823,391,0,0 -BRDA:9823,391,1,0 -BRDA:9826,392,0,0 -BRDA:9826,392,1,0 -BRDA:9831,393,0,0 -BRDA:9831,393,1,0 -BRDA:9831,394,0,0 -BRDA:9831,394,1,0 -BRDA:9841,395,0,0 -BRDA:9841,395,1,0 -BRDA:9841,396,0,0 -BRDA:9841,396,1,0 -BRDA:9841,396,2,0 -BRDA:9841,396,3,0 +BRDA:9564,350,0,0 +BRDA:9564,350,1,0 +BRDA:9565,351,0,0 +BRDA:9565,351,1,0 +BRDA:9569,352,0,0 +BRDA:9569,352,1,0 +BRDA:9570,353,0,0 +BRDA:9570,353,1,0 +BRDA:9580,354,0,0 +BRDA:9580,354,1,0 +BRDA:9582,355,0,0 +BRDA:9582,355,1,0 +BRDA:9583,356,0,0 +BRDA:9583,356,1,0 +BRDA:9587,357,0,0 +BRDA:9587,357,1,0 +BRDA:9588,358,0,0 +BRDA:9588,358,1,0 +BRDA:9592,359,0,0 +BRDA:9592,359,1,0 +BRDA:9593,360,0,0 +BRDA:9593,360,1,0 +BRDA:9597,361,0,0 +BRDA:9597,361,1,0 +BRDA:9598,362,0,0 +BRDA:9598,362,1,0 +BRDA:9602,363,0,0 +BRDA:9602,363,1,0 +BRDA:9603,364,0,0 +BRDA:9603,364,1,0 +BRDA:9607,365,0,0 +BRDA:9607,365,1,0 +BRDA:9608,366,0,0 +BRDA:9608,366,1,0 +BRDA:9612,367,0,0 +BRDA:9612,367,1,0 +BRDA:9613,368,0,0 +BRDA:9613,368,1,0 +BRDA:9617,369,0,0 +BRDA:9617,369,1,0 +BRDA:9618,370,0,0 +BRDA:9618,370,1,0 +BRDA:9622,371,0,0 +BRDA:9622,371,1,0 +BRDA:9623,372,0,0 +BRDA:9623,372,1,0 +BRDA:9628,373,0,0 +BRDA:9628,373,1,0 +BRDA:9628,374,0,0 +BRDA:9628,374,1,0 +BRDA:9631,375,0,0 +BRDA:9631,375,1,0 +BRDA:9631,376,0,0 +BRDA:9631,376,1,0 +BRDA:9634,377,0,0 +BRDA:9634,377,1,0 +BRDA:9634,378,0,0 +BRDA:9634,378,1,0 +BRDA:9643,379,0,0 +BRDA:9643,379,1,0 +BRDA:9645,380,0,0 +BRDA:9645,380,1,0 +BRDA:9650,381,0,0 +BRDA:9650,381,1,0 +BRDA:9652,382,0,0 +BRDA:9652,382,1,0 +BRDA:9652,383,0,0 +BRDA:9652,383,1,0 +BRDA:9655,384,0,0 +BRDA:9655,384,1,0 +BRDA:9655,385,0,0 +BRDA:9655,385,1,0 +BRDA:9658,386,0,0 +BRDA:9658,386,1,0 +BRDA:9666,387,0,0 +BRDA:9666,387,1,0 +BRDA:9668,388,0,0 +BRDA:9668,388,1,0 +BRDA:9671,389,0,0 +BRDA:9671,389,1,0 +BRDA:9813,390,0,0 +BRDA:9813,390,1,0 +BRDA:9816,391,0,0 +BRDA:9816,391,1,0 +BRDA:9821,392,0,0 +BRDA:9821,392,1,0 +BRDA:9827,393,0,0 +BRDA:9827,393,1,0 +BRDA:9830,394,0,0 +BRDA:9830,394,1,0 +BRDA:9837,395,0,0 +BRDA:9837,395,1,0 +BRDA:9842,396,0,0 +BRDA:9842,396,1,0 BRDA:9847,397,0,0 BRDA:9847,397,1,0 -BRDA:9869,398,0,0 -BRDA:9869,398,1,0 -BRDA:9871,399,0,0 -BRDA:9871,399,1,0 -BRDA:9877,400,0,0 -BRDA:9877,400,1,0 -BRDA:9877,401,0,0 -BRDA:9877,401,1,0 -BRDA:9884,402,0,0 -BRDA:9884,402,1,0 -BRDA:9897,403,0,0 -BRDA:9897,403,1,0 -BRDA:9897,404,0,0 -BRDA:9897,404,1,0 -BRDA:9897,404,2,0 -BRDA:9897,404,3,0 -BRDA:9903,405,0,0 -BRDA:9903,405,1,0 -BRDA:9918,406,0,0 -BRDA:9918,406,1,0 -BRDA:9937,407,0,0 -BRDA:9937,407,1,0 -BRDA:9948,408,0,0 -BRDA:9948,408,1,0 -BRDA:9952,409,0,0 -BRDA:9952,409,1,0 -BRDA:9961,410,0,0 -BRDA:9961,410,1,0 -BRDA:9962,411,0,0 -BRDA:9962,411,1,0 -BRDA:9967,412,0,0 -BRDA:9967,412,1,0 -BRDA:9968,413,0,0 -BRDA:9968,413,1,0 -BRDA:9977,414,0,0 -BRDA:9977,414,1,0 -BRDA:9978,415,0,0 -BRDA:9978,415,1,0 -BRDA:9979,416,0,0 -BRDA:9979,416,1,0 -BRDA:9983,417,0,0 -BRDA:9983,417,1,0 -BRDA:9984,418,0,0 -BRDA:9984,418,1,0 -BRDA:9988,419,0,0 -BRDA:9988,419,1,0 -BRDA:9989,420,0,0 -BRDA:9989,420,1,0 -BRDA:9993,421,0,0 -BRDA:9993,421,1,0 -BRDA:9994,422,0,0 -BRDA:9994,422,1,0 -BRDA:9998,423,0,0 -BRDA:9998,423,1,0 -BRDA:9999,424,0,0 -BRDA:9999,424,1,0 -BRDA:10003,425,0,0 -BRDA:10003,425,1,0 -BRDA:10004,426,0,0 -BRDA:10004,426,1,0 -BRDA:10008,427,0,0 -BRDA:10008,427,1,0 -BRDA:10009,428,0,0 -BRDA:10009,428,1,0 -BRDA:10015,429,0,0 -BRDA:10015,429,1,0 -BRDA:10015,430,0,0 -BRDA:10015,430,1,0 -BRDA:10015,430,2,0 -BRDA:10018,431,0,0 -BRDA:10018,431,1,0 -BRDA:10018,432,0,0 -BRDA:10018,432,1,0 -BRDA:10018,432,2,0 -BRDA:10066,433,0,0 -BRDA:10066,433,1,0 -BRDA:10076,434,0,0 -BRDA:10076,434,1,0 -BRDA:10106,435,0,0 -BRDA:10106,435,1,0 -BRDA:10106,436,0,0 -BRDA:10106,436,1,0 -BRDA:10106,436,2,0 -BRDA:10120,437,0,0 -BRDA:10120,437,1,0 -BRDA:10121,438,0,0 -BRDA:10121,438,1,0 -BRDA:10122,439,0,0 -BRDA:10122,439,1,0 -BRDA:10122,440,0,0 -BRDA:10122,440,1,0 -BRDA:10123,441,0,0 -BRDA:10123,441,1,0 -BRDA:10123,442,0,0 -BRDA:10123,442,1,0 -BRDA:10124,443,0,0 -BRDA:10124,443,1,0 -BRDA:10124,444,0,0 -BRDA:10124,444,1,0 -BRDA:10125,445,0,0 -BRDA:10125,445,1,0 -BRDA:10130,446,0,0 -BRDA:10130,446,1,0 -BRDA:10134,447,0,0 -BRDA:10134,447,1,0 -BRF:914 -BRH:0 +BRDA:9850,398,0,0 +BRDA:9850,398,1,0 +BRDA:9855,399,0,0 +BRDA:9855,399,1,0 +BRDA:9855,400,0,0 +BRDA:9855,400,1,0 +BRDA:9865,401,0,0 +BRDA:9865,401,1,0 +BRDA:9865,402,0,0 +BRDA:9865,402,1,0 +BRDA:9865,402,2,0 +BRDA:9865,402,3,0 +BRDA:9865,402,4,0 +BRDA:9871,403,0,0 +BRDA:9871,403,1,0 +BRDA:9893,404,0,0 +BRDA:9893,404,1,0 +BRDA:9895,405,0,0 +BRDA:9895,405,1,0 +BRDA:9901,406,0,0 +BRDA:9901,406,1,0 +BRDA:9901,407,0,0 +BRDA:9901,407,1,0 +BRDA:9908,408,0,0 +BRDA:9908,408,1,0 +BRDA:9921,409,0,0 +BRDA:9921,409,1,0 +BRDA:9921,410,0,0 +BRDA:9921,410,1,0 +BRDA:9921,410,2,0 +BRDA:9921,410,3,0 +BRDA:9921,410,4,0 +BRDA:9927,411,0,0 +BRDA:9927,411,1,0 +BRDA:9942,412,0,0 +BRDA:9942,412,1,0 +BRDA:9961,413,0,0 +BRDA:9961,413,1,0 +BRDA:9972,414,0,0 +BRDA:9972,414,1,0 +BRDA:9976,415,0,0 +BRDA:9976,415,1,0 +BRDA:9985,416,0,0 +BRDA:9985,416,1,0 +BRDA:9986,417,0,0 +BRDA:9986,417,1,0 +BRDA:9991,418,0,0 +BRDA:9991,418,1,0 +BRDA:9992,419,0,0 +BRDA:9992,419,1,0 +BRDA:10001,420,0,0 +BRDA:10001,420,1,0 +BRDA:10002,421,0,0 +BRDA:10002,421,1,0 +BRDA:10003,422,0,0 +BRDA:10003,422,1,0 +BRDA:10007,423,0,0 +BRDA:10007,423,1,0 +BRDA:10008,424,0,0 +BRDA:10008,424,1,0 +BRDA:10012,425,0,0 +BRDA:10012,425,1,0 +BRDA:10013,426,0,0 +BRDA:10013,426,1,0 +BRDA:10017,427,0,0 +BRDA:10017,427,1,0 +BRDA:10018,428,0,0 +BRDA:10018,428,1,0 +BRDA:10022,429,0,0 +BRDA:10022,429,1,0 +BRDA:10023,430,0,0 +BRDA:10023,430,1,0 +BRDA:10027,431,0,0 +BRDA:10027,431,1,0 +BRDA:10028,432,0,0 +BRDA:10028,432,1,0 +BRDA:10032,433,0,0 +BRDA:10032,433,1,0 +BRDA:10033,434,0,0 +BRDA:10033,434,1,0 +BRDA:10039,435,0,0 +BRDA:10039,435,1,0 +BRDA:10039,436,0,0 +BRDA:10039,436,1,0 +BRDA:10039,436,2,0 +BRDA:10042,437,0,0 +BRDA:10042,437,1,0 +BRDA:10042,438,0,0 +BRDA:10042,438,1,0 +BRDA:10042,438,2,0 +BRDA:10090,439,0,0 +BRDA:10090,439,1,0 +BRDA:10100,440,0,0 +BRDA:10100,440,1,0 +BRDA:10130,441,0,0 +BRDA:10130,441,1,0 +BRDA:10130,442,0,0 +BRDA:10130,442,1,0 +BRDA:10130,442,2,0 +BRDA:10144,443,0,0 +BRDA:10144,443,1,0 +BRDA:10145,444,0,0 +BRDA:10145,444,1,0 +BRDA:10146,445,0,0 +BRDA:10146,445,1,0 +BRDA:10146,446,0,0 +BRDA:10146,446,1,0 +BRDA:10147,447,0,0 +BRDA:10147,447,1,0 +BRDA:10147,448,0,0 +BRDA:10147,448,1,0 +BRDA:10148,449,0,0 +BRDA:10148,449,1,0 +BRDA:10148,450,0,0 +BRDA:10148,450,1,0 +BRDA:10149,451,0,0 +BRDA:10149,451,1,0 +BRDA:10154,452,0,0 +BRDA:10154,452,1,0 +BRDA:10158,453,0,0 +BRDA:10158,453,1,0 +BRF:930 +BRH:4 end_of_record TN: -SF:src\main\server\skyRepo.test.js -FN:4,(anonymous_0) -FN:18,(anonymous_1) -FN:19,(anonymous_2) -FN:23,(anonymous_3) -FN:60,(anonymous_4) -FNF:5 -FNH:0 -FNDA:0,(anonymous_0) +SF:src\main\server\util.js +FN:25,(anonymous_0) +FN:33,(anonymous_1) +FN:44,(anonymous_2) +FN:414,(anonymous_3) +FN:520,(anonymous_4) +FN:521,(anonymous_5) +FN:525,(anonymous_6) +FNF:7 +FNH:1 +FNDA:1,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) FNDA:0,(anonymous_3) FNDA:0,(anonymous_4) -DA:1,0 -DA:2,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:10,0 -DA:13,0 -DA:14,0 -DA:15,0 -DA:18,0 -DA:19,0 -DA:23,0 -DA:25,0 -DA:26,0 -DA:27,0 -DA:28,0 +FNDA:0,(anonymous_5) +FNDA:0,(anonymous_6) +DA:21,1 +DA:22,1 +DA:25,1 +DA:26,1 +DA:27,1 +DA:28,1 DA:29,0 -DA:30,0 -DA:31,0 +DA:31,1 +DA:32,0 +DA:33,0 DA:34,0 -DA:35,0 DA:36,0 -DA:39,0 -DA:42,0 +DA:38,1 +DA:39,1 +DA:40,1 +DA:41,1 +DA:42,1 +DA:43,0 DA:44,0 DA:45,0 DA:47,0 -DA:49,0 -DA:50,0 -DA:51,0 -DA:52,0 -DA:53,0 -DA:54,0 -DA:55,0 -DA:56,0 +DA:49,1 +DA:50,1 +DA:56,1 DA:57,0 +DA:58,0 +DA:59,0 DA:60,0 DA:61,0 DA:62,0 -DA:64,0 +DA:63,0 DA:65,0 DA:66,0 -DA:67,0 -DA:68,0 -DA:69,0 -DA:74,0 DA:75,0 DA:76,0 DA:77,0 +DA:78,0 DA:79,0 DA:80,0 +DA:81,0 +DA:82,0 DA:83,0 DA:84,0 DA:85,0 +DA:86,0 DA:87,0 DA:88,0 -DA:89,0 -DA:92,0 DA:93,0 DA:94,0 +DA:95,0 DA:96,0 DA:97,0 DA:98,0 -DA:101,0 -DA:102,0 -DA:103,0 -DA:104,0 -DA:106,0 -DA:107,0 -DA:108,0 -DA:109,0 -DA:111,0 +DA:99,0 +DA:100,0 DA:112,0 DA:113,0 DA:114,0 +DA:115,0 +DA:116,0 DA:117,0 DA:118,0 DA:119,0 -DA:120,0 -DA:122,0 -DA:123,0 -DA:125,0 -DA:126,0 -DA:128,0 -DA:129,0 -DA:130,0 DA:131,0 -DA:133,0 +DA:132,0 DA:134,0 +DA:135,0 DA:136,0 DA:137,0 -DA:139,0 +DA:138,0 DA:140,0 DA:141,0 +DA:142,0 DA:143,0 DA:144,0 DA:145,0 +DA:146,0 DA:148,0 DA:149,0 -DA:152,0 DA:153,0 +DA:154,0 DA:155,0 DA:156,0 DA:157,0 DA:159,0 DA:160,0 +DA:161,0 DA:162,0 DA:163,0 DA:164,0 +DA:165,0 DA:166,0 DA:167,0 DA:168,0 +DA:169,0 DA:170,0 DA:171,0 -DA:172,0 -DA:176,0 -DA:177,0 -DA:178,0 -DA:179,0 -DA:181,0 -DA:182,0 +DA:183,0 DA:184,0 DA:185,0 DA:186,0 DA:187,0 -DA:189,0 -DA:190,0 -DA:192,0 -DA:193,0 -LF:129 -LH:0 -BRF:0 -BRH:0 -end_of_record -TN: -SF:src\main\server\util.js -FN:25,(anonymous_0) -FN:33,(anonymous_1) -FN:44,(anonymous_2) -FN:414,(anonymous_3) -FN:520,(anonymous_4) -FN:521,(anonymous_5) -FN:525,(anonymous_6) -FNF:7 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -DA:21,0 -DA:22,0 -DA:25,0 -DA:26,0 -DA:27,0 -DA:28,0 -DA:29,0 -DA:31,0 -DA:32,0 -DA:33,0 -DA:34,0 -DA:36,0 -DA:38,0 -DA:39,0 -DA:40,0 -DA:41,0 -DA:42,0 -DA:43,0 -DA:44,0 -DA:45,0 -DA:47,0 -DA:49,0 -DA:50,0 -DA:56,0 -DA:57,0 -DA:58,0 -DA:59,0 -DA:60,0 -DA:61,0 -DA:62,0 -DA:63,0 -DA:65,0 -DA:66,0 -DA:75,0 -DA:76,0 -DA:77,0 -DA:78,0 -DA:79,0 -DA:80,0 -DA:81,0 -DA:82,0 -DA:83,0 -DA:84,0 -DA:85,0 -DA:86,0 -DA:87,0 -DA:88,0 -DA:93,0 -DA:94,0 -DA:95,0 -DA:96,0 -DA:97,0 -DA:98,0 -DA:99,0 -DA:100,0 -DA:112,0 -DA:113,0 -DA:114,0 -DA:115,0 -DA:116,0 -DA:117,0 -DA:118,0 -DA:119,0 -DA:131,0 -DA:132,0 -DA:134,0 -DA:135,0 -DA:136,0 -DA:137,0 -DA:138,0 -DA:140,0 -DA:141,0 -DA:142,0 -DA:143,0 -DA:144,0 -DA:145,0 -DA:146,0 -DA:148,0 -DA:149,0 -DA:153,0 -DA:154,0 -DA:155,0 -DA:156,0 -DA:157,0 -DA:159,0 -DA:160,0 -DA:161,0 -DA:162,0 -DA:163,0 -DA:164,0 -DA:165,0 -DA:166,0 -DA:167,0 -DA:168,0 -DA:169,0 -DA:170,0 -DA:171,0 -DA:183,0 -DA:184,0 -DA:185,0 -DA:186,0 -DA:187,0 -DA:188,0 +DA:188,0 DA:189,0 DA:190,0 DA:202,0 @@ -3365,7 +3199,7 @@ DA:232,0 DA:236,0 DA:237,0 DA:238,0 -DA:241,0 +DA:241,1 DA:242,0 DA:243,0 DA:244,0 @@ -3482,8 +3316,8 @@ DA:402,0 DA:406,0 DA:407,0 DA:408,0 -DA:411,0 -DA:414,0 +DA:411,1 +DA:414,1 DA:415,0 DA:416,0 DA:418,0 @@ -3509,11 +3343,11 @@ DA:450,0 DA:452,0 DA:453,0 DA:454,0 -DA:457,0 -DA:520,0 +DA:457,1 +DA:520,1 DA:521,0 DA:522,0 -DA:525,0 +DA:525,1 DA:526,0 DA:527,0 DA:529,0 @@ -3524,22 +3358,22 @@ DA:533,0 DA:534,0 DA:535,0 DA:537,0 -DA:539,0 +DA:539,1 LF:292 -LH:0 +LH:22 BRDA:28,0,0,0 -BRDA:28,0,1,0 +BRDA:28,0,1,1 BRDA:31,1,0,0 -BRDA:31,1,1,0 +BRDA:31,1,1,1 BRDA:42,2,0,0 -BRDA:42,2,1,0 -BRDA:42,3,0,0 +BRDA:42,2,1,1 +BRDA:42,3,0,1 BRDA:42,3,1,0 -BRDA:49,4,0,0 +BRDA:49,4,0,1 BRDA:49,4,1,0 BRDA:56,5,0,0 -BRDA:56,5,1,0 -BRDA:56,6,0,0 +BRDA:56,5,1,1 +BRDA:56,6,0,1 BRDA:56,6,1,0 BRDA:62,7,0,0 BRDA:62,7,1,0 @@ -3576,8 +3410,8 @@ BRDA:220,21,1,0 BRDA:236,22,0,0 BRDA:236,22,1,0 BRDA:241,23,0,0 -BRDA:241,23,1,0 -BRDA:241,24,0,0 +BRDA:241,23,1,1 +BRDA:241,24,0,1 BRDA:241,24,1,0 BRDA:247,25,0,0 BRDA:247,25,1,0 @@ -3640,7 +3474,7 @@ BRDA:453,52,1,0 BRDA:526,53,0,0 BRDA:526,53,1,0 BRF:112 -BRH:0 +BRH:9 end_of_record TN: SF:src\main\server\websocket.js @@ -3652,9 +3486,9 @@ FNH:0 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) -DA:1,0 -DA:2,0 -DA:3,0 +DA:1,1 +DA:2,1 +DA:3,1 DA:4,0 DA:5,0 DA:6,0 @@ -3662,13 +3496,13 @@ DA:7,0 DA:8,0 DA:10,0 DA:11,0 -DA:15,0 +DA:15,1 DA:16,0 DA:17,0 DA:18,0 DA:20,0 LF:15 -LH:0 +LH:4 BRDA:8,0,0,0 BRDA:8,0,1,0 BRF:2 @@ -3704,8 +3538,8 @@ FNDA:0,(anonymous_9) FNDA:0,(anonymous_10) FNDA:0,(anonymous_11) FNDA:0,asnEndpoint -DA:1,0 -DA:3,0 +DA:1,1 +DA:3,1 DA:21,0 DA:23,0 DA:24,0 @@ -4013,8 +3847,8 @@ DA:483,0 DA:484,0 DA:486,0 DA:489,0 -DA:499,0 -DA:500,0 +DA:499,1 +DA:500,1 DA:504,0 DA:505,0 DA:508,0 @@ -4131,10 +3965,10 @@ DA:692,0 DA:693,0 DA:694,0 DA:695,0 -DA:699,0 -DA:700,0 +DA:699,1 +DA:700,1 LF:429 -LH:0 +LH:6 BRDA:23,0,0,0 BRDA:23,0,1,0 BRDA:23,1,0,0 @@ -4354,7 +4188,7 @@ BRDA:483,107,0,0 BRDA:483,107,1,0 BRDA:483,108,0,0 BRDA:483,108,1,0 -BRDA:499,109,0,0 +BRDA:499,109,0,1 BRDA:499,109,1,0 BRDA:508,110,0,0 BRDA:508,110,1,0 @@ -4463,86 +4297,10 @@ BRDA:691,160,0,0 BRDA:691,160,1,0 BRDA:693,161,0,0 BRDA:693,161,1,0 -BRDA:699,162,0,0 +BRDA:699,162,0,1 BRDA:699,162,1,0 BRF:330 -BRH:0 -end_of_record -TN: -SF:src\main\server\adapter\asn\asn.test.js -FN:3,(anonymous_0) -FN:17,(anonymous_1) -FN:20,(anonymous_2) -FN:32,(anonymous_3) -FNF:4 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -DA:1,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:9,0 -DA:12,0 -DA:13,0 -DA:14,0 -DA:17,0 -DA:18,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:25,0 -DA:26,0 -DA:27,0 -DA:28,0 -DA:32,0 -DA:33,0 -LF:19 -LH:0 -BRF:0 -BRH:0 -end_of_record -TN: -SF:src\main\server\adapter\case\case.test.js -FN:3,(anonymous_0) -FN:17,(anonymous_1) -FN:20,(anonymous_2) -FN:32,(anonymous_3) -FN:36,(anonymous_4) -FNF:5 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -DA:1,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:9,0 -DA:12,0 -DA:13,0 -DA:14,0 -DA:17,0 -DA:18,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:25,0 -DA:26,0 -DA:27,0 -DA:28,0 -DA:32,0 -DA:33,0 -DA:36,0 -DA:37,0 -LF:21 -LH:0 -BRF:0 -BRH:0 +BRH:2 end_of_record TN: SF:src\main\server\adapter\case\caseAdapter.js @@ -4592,10 +4350,10 @@ FNDA:0,(anonymous_18) FNDA:0,(anonymous_19) FNDA:0,(anonymous_20) FNDA:0,(anonymous_21) -DA:1,0 -DA:3,0 +DA:1,1 +DA:3,1 DA:4,0 -DA:19,0 +DA:19,1 DA:20,0 DA:21,0 DA:22,0 @@ -4618,11 +4376,11 @@ DA:42,0 DA:43,0 DA:44,0 DA:45,0 -DA:47,0 +DA:47,1 DA:48,0 DA:49,0 DA:50,0 -DA:52,0 +DA:52,1 DA:53,0 DA:54,0 DA:55,0 @@ -4655,7 +4413,7 @@ DA:86,0 DA:87,0 DA:89,0 DA:90,0 -DA:92,0 +DA:92,1 DA:93,0 DA:94,0 DA:95,0 @@ -4674,7 +4432,7 @@ DA:108,0 DA:109,0 DA:110,0 DA:112,0 -DA:114,0 +DA:114,1 DA:115,0 DA:116,0 DA:117,0 @@ -4691,7 +4449,7 @@ DA:131,0 DA:133,0 DA:134,0 DA:136,0 -DA:147,0 +DA:147,1 DA:148,0 DA:149,0 DA:150,0 @@ -4724,13 +4482,13 @@ DA:181,0 DA:182,0 DA:183,0 DA:188,0 -DA:198,0 +DA:198,1 DA:199,0 -DA:209,0 +DA:209,1 DA:210,0 -DA:220,0 +DA:220,1 DA:221,0 -DA:231,0 +DA:231,1 DA:232,0 DA:233,0 DA:234,0 @@ -4778,7 +4536,7 @@ DA:283,0 DA:284,0 DA:285,0 DA:286,0 -DA:296,0 +DA:296,1 DA:297,0 DA:298,0 DA:299,0 @@ -4830,11 +4588,11 @@ DA:349,0 DA:350,0 DA:351,0 DA:352,0 -DA:362,0 +DA:362,1 DA:363,0 -DA:373,0 +DA:373,1 DA:374,0 -DA:385,0 +DA:385,1 DA:386,0 DA:387,0 DA:388,0 @@ -4872,24 +4630,24 @@ DA:425,0 DA:428,0 DA:429,0 DA:430,0 -DA:440,0 +DA:440,1 DA:441,0 -DA:451,0 +DA:451,1 DA:452,0 -DA:455,0 -DA:456,0 -DA:457,0 -DA:458,0 -DA:459,0 -DA:460,0 -DA:461,0 -DA:462,0 -DA:463,0 -DA:464,0 -DA:465,0 -DA:466,0 +DA:455,1 +DA:456,1 +DA:457,1 +DA:458,1 +DA:459,1 +DA:460,1 +DA:461,1 +DA:462,1 +DA:463,1 +DA:464,1 +DA:465,1 +DA:466,1 LF:296 -LH:0 +LH:30 BRDA:21,0,0,0 BRDA:21,0,1,0 BRDA:21,1,0,0 @@ -5057,10 +4815,10 @@ BRDA:421,80,0,0 BRDA:421,80,1,0 BRDA:423,81,0,0 BRDA:423,81,1,0 -BRDA:455,82,0,0 +BRDA:455,82,0,1 BRDA:455,82,1,0 BRF:169 -BRH:0 +BRH:1 end_of_record TN: SF:src\main\server\adapter\case\caseIngest.js @@ -5114,9 +4872,9 @@ FNDA:0,(anonymous_20) FNDA:0,(anonymous_21) FNDA:0,(anonymous_22) FNDA:0,(anonymous_23) -DA:1,0 -DA:2,0 -DA:4,0 +DA:1,1 +DA:2,1 +DA:4,1 DA:6,0 DA:9,0 DA:12,0 @@ -5129,7 +4887,7 @@ DA:30,0 DA:33,0 DA:36,0 DA:39,0 -DA:43,0 +DA:43,1 DA:44,0 DA:45,0 DA:46,0 @@ -5139,19 +4897,19 @@ DA:49,0 DA:50,0 DA:51,0 DA:54,0 -DA:57,0 +DA:57,1 DA:58,0 DA:59,0 DA:61,0 DA:62,0 DA:64,0 DA:66,0 -DA:70,0 +DA:70,1 DA:71,0 DA:72,0 DA:73,0 DA:75,0 -DA:79,0 +DA:79,1 DA:80,0 DA:81,0 DA:82,0 @@ -5171,7 +4929,7 @@ DA:99,0 DA:101,0 DA:102,0 DA:104,0 -DA:107,0 +DA:107,1 DA:108,0 DA:109,0 DA:110,0 @@ -5186,7 +4944,7 @@ DA:123,0 DA:124,0 DA:125,0 DA:126,0 -DA:129,0 +DA:129,1 DA:130,0 DA:131,0 DA:132,0 @@ -5203,7 +4961,7 @@ DA:150,0 DA:151,0 DA:152,0 DA:154,0 -DA:158,0 +DA:158,1 DA:159,0 DA:160,0 DA:161,0 @@ -5220,7 +4978,7 @@ DA:174,0 DA:175,0 DA:177,0 DA:178,0 -DA:181,0 +DA:181,1 DA:182,0 DA:183,0 DA:184,0 @@ -5234,8 +4992,8 @@ DA:191,0 DA:192,0 DA:193,0 DA:194,0 -DA:197,0 -DA:198,0 +DA:197,1 +DA:198,1 DA:199,0 DA:200,0 DA:202,0 @@ -5266,16 +5024,16 @@ DA:232,0 DA:234,0 DA:235,0 DA:238,0 -DA:241,0 +DA:241,1 DA:242,0 DA:243,0 DA:244,0 DA:245,0 -DA:248,0 -DA:249,0 -DA:250,0 +DA:248,1 +DA:249,1 +DA:250,1 LF:160 -LH:0 +LH:17 BRDA:44,0,0,0 BRDA:44,0,1,0 BRDA:44,1,0,0 @@ -5330,72 +5088,275 @@ BRDA:218,24,0,0 BRDA:218,24,1,0 BRDA:231,25,0,0 BRDA:231,25,1,0 -BRDA:248,26,0,0 +BRDA:248,26,0,1 BRDA:248,26,1,0 BRF:56 -BRH:0 +BRH:1 end_of_record TN: -SF:src\main\server\adapter\ceasn\ceasn.js -FN:33,ceasnExportUriTransform -FN:59,competencyPromise -FN:60,(anonymous_2) -FN:69,(anonymous_3) -FN:172,cassFrameworkAsCeasn -FN:240,(anonymous_5) -FN:392,(anonymous_6) -FN:549,stripNonCe -FN:580,(anonymous_8) -FN:593,orderFields -FN:595,(anonymous_10) -FN:599,(anonymous_11) -FN:605,competencyInCollectionPromise -FN:606,(anonymous_13) -FN:715,cassFrameworkAsCeasnCollection -FN:737,(anonymous_15) -FN:861,(anonymous_16) -FN:966,conceptArrays -FN:994,(anonymous_18) -FN:1003,conceptPromise -FN:1004,(anonymous_20) -FN:1069,levelPromise -FN:1070,(anonymous_22) -FN:1125,cassConceptSchemeAsCeasn -FN:1135,(anonymous_24) -FN:1145,getSubConcepts -FN:1146,(anonymous_26) -FN:1168,(anonymous_27) -FN:1246,cassConceptSchemeAsCeasnProgression -FN:1256,(anonymous_29) -FN:1266,getSubConcepts -FN:1267,(anonymous_31) -FN:1289,(anonymous_32) -FN:1369,createEachRelation -FN:1391,createRelations -FN:1400,importCompetencyPromise -FN:1401,(anonymous_36) -FN:1527,importCeFrameworkToCass -FN:1533,(anonymous_38) -FN:1579,(anonymous_39) -FN:1645,importCompetencyToCollectionPromise -FN:1646,(anonymous_41) -FN:1728,importCeCollectionToCass -FN:1734,(anonymous_43) -FN:1780,(anonymous_44) -FN:1839,ceasnFrameworkToCass -FN:1897,ceasnEndpoint -FNF:47 +SF:src\main\server\adapter\ce\pna.js +FN:7,pnaEndpoint +FN:74,(anonymous_1) +FN:79,(anonymous_2) +FN:95,(anonymous_3) +FN:99,(anonymous_4) +FN:101,(anonymous_5) +FN:114,uploadToAws +FN:173,(anonymous_7) +FN:176,(anonymous_8) +FNF:9 FNH:0 -FNDA:0,ceasnExportUriTransform -FNDA:0,competencyPromise +FNDA:0,pnaEndpoint +FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) FNDA:0,(anonymous_3) -FNDA:0,cassFrameworkAsCeasn +FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,stripNonCe +FNDA:0,uploadToAws +FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) -FNDA:0,orderFields +DA:9,0 +DA:10,0 +DA:11,0 +DA:12,0 +DA:13,0 +DA:14,0 +DA:15,0 +DA:16,0 +DA:18,0 +DA:19,0 +DA:22,0 +DA:23,0 +DA:25,0 +DA:26,0 +DA:30,0 +DA:32,0 +DA:33,0 +DA:35,0 +DA:41,0 +DA:42,0 +DA:43,0 +DA:44,0 +DA:46,0 +DA:49,0 +DA:50,0 +DA:51,0 +DA:53,0 +DA:56,0 +DA:70,0 +DA:72,0 +DA:73,0 +DA:74,0 +DA:75,0 +DA:80,0 +DA:81,0 +DA:82,0 +DA:83,0 +DA:84,0 +DA:85,0 +DA:86,0 +DA:96,0 +DA:99,0 +DA:100,0 +DA:102,0 +DA:105,0 +DA:107,0 +DA:108,0 +DA:110,0 +DA:116,0 +DA:118,0 +DA:119,0 +DA:120,0 +DA:121,0 +DA:122,0 +DA:124,0 +DA:125,0 +DA:126,0 +DA:127,0 +DA:132,0 +DA:133,0 +DA:134,0 +DA:139,0 +DA:140,0 +DA:141,0 +DA:146,0 +DA:147,0 +DA:148,0 +DA:153,0 +DA:154,0 +DA:155,0 +DA:160,0 +DA:168,0 +DA:173,0 +DA:174,0 +DA:175,0 +DA:177,0 +DA:178,0 +DA:179,0 +DA:181,0 +DA:186,0 +DA:187,0 +DA:188,0 +DA:195,1 +DA:196,1 +LF:84 +LH:2 +BRDA:11,0,0,0 +BRDA:11,0,1,0 +BRDA:11,1,0,0 +BRDA:11,1,1,0 +BRDA:15,2,0,0 +BRDA:15,2,1,0 +BRDA:18,3,0,0 +BRDA:18,3,1,0 +BRDA:23,4,0,0 +BRDA:23,4,1,0 +BRDA:23,5,0,0 +BRDA:23,5,1,0 +BRDA:25,6,0,0 +BRDA:25,6,1,0 +BRDA:36,7,0,0 +BRDA:36,7,1,0 +BRDA:38,8,0,0 +BRDA:38,8,1,0 +BRDA:42,9,0,0 +BRDA:42,9,1,0 +BRDA:43,10,0,0 +BRDA:43,10,1,0 +BRDA:43,11,0,0 +BRDA:43,11,1,0 +BRDA:49,12,0,0 +BRDA:49,12,1,0 +BRDA:49,13,0,0 +BRDA:49,13,1,0 +BRDA:50,14,0,0 +BRDA:50,14,1,0 +BRDA:50,15,0,0 +BRDA:50,15,1,0 +BRDA:59,16,0,0 +BRDA:59,16,1,0 +BRDA:62,17,0,0 +BRDA:62,17,1,0 +BRDA:63,18,0,0 +BRDA:63,18,1,0 +BRDA:64,19,0,0 +BRDA:64,19,1,0 +BRDA:64,20,0,0 +BRDA:64,20,1,0 +BRDA:66,21,0,0 +BRDA:66,21,1,0 +BRDA:67,22,0,0 +BRDA:67,22,1,0 +BRDA:70,23,0,0 +BRDA:70,23,1,0 +BRDA:80,24,0,0 +BRDA:80,24,1,0 +BRDA:80,25,0,0 +BRDA:80,25,1,0 +BRDA:82,26,0,0 +BRDA:82,26,1,0 +BRDA:82,27,0,0 +BRDA:82,27,1,0 +BRDA:84,28,0,0 +BRDA:84,28,1,0 +BRDA:84,29,0,0 +BRDA:84,29,1,0 +BRDA:90,30,0,0 +BRDA:90,30,1,0 +BRDA:90,31,0,0 +BRDA:90,31,1,0 +BRDA:90,32,0,0 +BRDA:90,32,1,0 +BRDA:92,33,0,0 +BRDA:92,33,1,0 +BRDA:105,34,0,0 +BRDA:105,34,1,0 +BRDA:105,35,0,0 +BRDA:105,35,1,0 +BRDA:118,36,0,0 +BRDA:118,36,1,0 +BRDA:119,37,0,0 +BRDA:119,37,1,0 +BRDA:120,38,0,0 +BRDA:120,38,1,0 +BRDA:121,39,0,0 +BRDA:121,39,1,0 +BRDA:125,40,0,0 +BRDA:125,40,1,0 +BRDA:132,41,0,0 +BRDA:132,41,1,0 +BRDA:139,42,0,0 +BRDA:139,42,1,0 +BRDA:146,43,0,0 +BRDA:146,43,1,0 +BRDA:153,44,0,0 +BRDA:153,44,1,0 +BRDA:195,45,0,1 +BRDA:195,45,1,0 +BRF:92 +BRH:1 +end_of_record +TN: +SF:src\main\server\adapter\ceasn\ceasn.js +FN:33,ceasnExportUriTransform +FN:59,competencyPromise +FN:60,(anonymous_2) +FN:69,(anonymous_3) +FN:172,cassFrameworkAsCeasn +FN:240,(anonymous_5) +FN:392,(anonymous_6) +FN:556,stripNonCe +FN:591,(anonymous_8) +FN:604,orderFields +FN:606,(anonymous_10) +FN:610,(anonymous_11) +FN:616,competencyInCollectionPromise +FN:617,(anonymous_13) +FN:726,cassFrameworkAsCeasnCollection +FN:748,(anonymous_15) +FN:872,(anonymous_16) +FN:977,conceptArrays +FN:1005,(anonymous_18) +FN:1014,conceptPromise +FN:1015,(anonymous_20) +FN:1080,levelPromise +FN:1081,(anonymous_22) +FN:1136,cassConceptSchemeAsCeasn +FN:1146,(anonymous_24) +FN:1156,getSubConcepts +FN:1157,(anonymous_26) +FN:1179,(anonymous_27) +FN:1257,cassConceptSchemeAsCeasnProgression +FN:1267,(anonymous_29) +FN:1277,getSubConcepts +FN:1278,(anonymous_31) +FN:1300,(anonymous_32) +FN:1380,createEachRelation +FN:1402,createRelations +FN:1411,importCompetencyPromise +FN:1412,(anonymous_36) +FN:1538,importCeFrameworkToCass +FN:1544,(anonymous_38) +FN:1590,(anonymous_39) +FN:1656,importCompetencyToCollectionPromise +FN:1657,(anonymous_41) +FN:1739,importCeCollectionToCass +FN:1745,(anonymous_43) +FN:1791,(anonymous_44) +FN:1850,ceasnFrameworkToCass +FN:1908,ceasnEndpoint +FNF:47 +FNH:0 +FNDA:0,ceasnExportUriTransform +FNDA:0,competencyPromise +FNDA:0,(anonymous_2) +FNDA:0,(anonymous_3) +FNDA:0,cassFrameworkAsCeasn +FNDA:0,(anonymous_5) +FNDA:0,(anonymous_6) +FNDA:0,stripNonCe +FNDA:0,(anonymous_8) +FNDA:0,orderFields FNDA:0,(anonymous_10) FNDA:0,(anonymous_11) FNDA:0,competencyInCollectionPromise @@ -5433,12 +5394,12 @@ FNDA:0,(anonymous_43) FNDA:0,(anonymous_44) FNDA:0,ceasnFrameworkToCass FNDA:0,ceasnEndpoint -DA:1,0 -DA:3,0 -DA:5,0 -DA:27,0 -DA:28,0 -DA:30,0 +DA:1,1 +DA:3,1 +DA:5,1 +DA:27,1 +DA:28,1 +DA:30,1 DA:34,0 DA:35,0 DA:36,0 @@ -5739,55 +5700,52 @@ DA:463,0 DA:464,0 DA:465,0 DA:466,0 -DA:468,0 DA:469,0 +DA:470,0 DA:473,0 DA:474,0 DA:475,0 -DA:477,0 -DA:478,0 DA:480,0 DA:481,0 -DA:483,0 +DA:482,0 DA:484,0 DA:485,0 -DA:486,0 DA:487,0 -DA:489,0 +DA:488,0 +DA:490,0 DA:491,0 DA:492,0 +DA:493,0 DA:494,0 -DA:495,0 DA:496,0 -DA:497,0 -DA:500,0 +DA:498,0 +DA:499,0 +DA:501,0 DA:502,0 +DA:503,0 DA:504,0 -DA:506,0 DA:507,0 -DA:508,0 DA:509,0 -DA:510,0 DA:511,0 -DA:512,0 +DA:513,0 DA:514,0 DA:515,0 DA:516,0 DA:517,0 DA:518,0 -DA:520,0 +DA:519,0 DA:521,0 DA:522,0 DA:523,0 DA:524,0 +DA:525,0 DA:527,0 +DA:528,0 DA:529,0 +DA:530,0 DA:531,0 -DA:532,0 -DA:533,0 DA:534,0 -DA:535,0 -DA:537,0 +DA:536,0 DA:538,0 DA:539,0 DA:540,0 @@ -5796,13 +5754,12 @@ DA:542,0 DA:544,0 DA:545,0 DA:546,0 -DA:550,0 +DA:547,0 +DA:548,0 +DA:549,0 DA:551,0 DA:552,0 DA:553,0 -DA:554,0 -DA:555,0 -DA:556,0 DA:557,0 DA:558,0 DA:559,0 @@ -5824,282 +5781,282 @@ DA:574,0 DA:575,0 DA:576,0 DA:577,0 +DA:578,0 DA:579,0 DA:580,0 DA:581,0 DA:582,0 +DA:583,0 +DA:584,0 DA:585,0 +DA:586,0 +DA:587,0 DA:588,0 DA:590,0 -DA:594,0 -DA:595,0 +DA:591,0 +DA:592,0 +DA:593,0 DA:596,0 -DA:597,0 DA:599,0 -DA:600,0 -DA:602,0 +DA:601,0 +DA:605,0 DA:606,0 DA:607,0 DA:608,0 -DA:609,0 DA:610,0 DA:611,0 DA:613,0 -DA:614,0 DA:617,0 DA:618,0 DA:619,0 DA:620,0 DA:621,0 DA:622,0 -DA:623,0 DA:624,0 DA:625,0 -DA:626,0 DA:628,0 +DA:629,0 +DA:630,0 +DA:631,0 DA:632,0 DA:633,0 DA:634,0 DA:635,0 DA:636,0 DA:637,0 -DA:638,0 DA:639,0 -DA:641,0 -DA:642,0 DA:643,0 DA:644,0 +DA:645,0 +DA:646,0 DA:647,0 DA:648,0 DA:649,0 +DA:650,0 DA:652,0 DA:653,0 DA:654,0 -DA:656,0 -DA:657,0 +DA:655,0 DA:658,0 DA:659,0 -DA:661,0 -DA:662,0 +DA:660,0 +DA:663,0 +DA:664,0 DA:665,0 -DA:666,0 DA:667,0 +DA:668,0 DA:669,0 DA:670,0 DA:672,0 DA:673,0 DA:676,0 +DA:677,0 DA:678,0 -DA:679,0 DA:680,0 -DA:682,0 +DA:681,0 +DA:683,0 DA:684,0 -DA:685,0 -DA:686,0 DA:687,0 -DA:688,0 +DA:689,0 DA:690,0 DA:691,0 -DA:692,0 -DA:694,0 +DA:693,0 DA:695,0 DA:696,0 +DA:697,0 +DA:698,0 DA:699,0 -DA:700,0 DA:701,0 +DA:702,0 +DA:703,0 DA:705,0 DA:706,0 DA:707,0 -DA:709,0 DA:710,0 +DA:711,0 +DA:712,0 DA:716,0 DA:717,0 -DA:719,0 +DA:718,0 DA:720,0 DA:721,0 -DA:722,0 -DA:723,0 -DA:724,0 -DA:726,0 DA:727,0 DA:728,0 -DA:729,0 +DA:730,0 DA:731,0 DA:732,0 DA:733,0 DA:734,0 DA:735,0 DA:737,0 +DA:738,0 DA:739,0 DA:740,0 DA:742,0 DA:743,0 DA:744,0 DA:745,0 -DA:749,0 +DA:746,0 +DA:748,0 DA:750,0 DA:751,0 -DA:752,0 DA:753,0 DA:754,0 DA:755,0 DA:756,0 -DA:758,0 -DA:759,0 DA:760,0 +DA:761,0 DA:762,0 DA:763,0 DA:764,0 +DA:765,0 DA:766,0 -DA:768,0 +DA:767,0 DA:769,0 DA:770,0 -DA:772,0 +DA:771,0 DA:773,0 DA:774,0 -DA:776,0 +DA:775,0 +DA:777,0 DA:779,0 DA:780,0 DA:781,0 -DA:782,0 +DA:783,0 DA:784,0 DA:785,0 -DA:786,0 -DA:788,0 -DA:789,0 +DA:787,0 DA:790,0 +DA:791,0 DA:792,0 -DA:794,0 +DA:793,0 DA:795,0 DA:796,0 -DA:798,0 +DA:797,0 +DA:799,0 DA:800,0 DA:801,0 -DA:802,0 DA:803,0 -DA:804,0 +DA:805,0 DA:806,0 DA:807,0 -DA:808,0 -DA:810,0 +DA:809,0 DA:811,0 DA:812,0 +DA:813,0 DA:814,0 -DA:816,0 +DA:815,0 DA:817,0 DA:818,0 -DA:820,0 +DA:819,0 +DA:821,0 DA:822,0 DA:823,0 -DA:824,0 DA:825,0 -DA:826,0 +DA:827,0 DA:828,0 DA:829,0 -DA:830,0 -DA:832,0 +DA:831,0 DA:833,0 DA:834,0 +DA:835,0 DA:836,0 -DA:838,0 +DA:837,0 DA:839,0 DA:840,0 -DA:842,0 +DA:841,0 +DA:843,0 DA:844,0 DA:845,0 -DA:846,0 DA:847,0 -DA:848,0 +DA:849,0 DA:850,0 DA:851,0 -DA:852,0 -DA:854,0 +DA:853,0 +DA:855,0 +DA:856,0 +DA:857,0 DA:858,0 -DA:860,0 +DA:859,0 DA:861,0 -DA:864,0 +DA:862,0 +DA:863,0 DA:865,0 -DA:867,0 -DA:868,0 DA:869,0 -DA:870,0 DA:871,0 DA:872,0 DA:875,0 DA:876,0 -DA:877,0 +DA:878,0 +DA:879,0 DA:880,0 DA:881,0 DA:882,0 DA:883,0 -DA:884,0 DA:886,0 DA:887,0 DA:888,0 -DA:889,0 DA:891,0 DA:892,0 -DA:896,0 +DA:893,0 +DA:894,0 +DA:895,0 DA:897,0 DA:898,0 +DA:899,0 DA:900,0 -DA:901,0 +DA:902,0 DA:903,0 -DA:904,0 -DA:906,0 DA:907,0 DA:908,0 -DA:910,0 +DA:909,0 +DA:911,0 DA:912,0 -DA:913,0 +DA:914,0 DA:915,0 -DA:916,0 DA:917,0 DA:918,0 +DA:919,0 DA:921,0 DA:923,0 -DA:925,0 +DA:924,0 +DA:926,0 DA:927,0 DA:928,0 DA:929,0 -DA:930,0 -DA:931,0 DA:932,0 -DA:933,0 DA:934,0 -DA:935,0 DA:936,0 DA:938,0 DA:939,0 DA:940,0 DA:941,0 DA:942,0 +DA:943,0 +DA:944,0 DA:945,0 +DA:946,0 DA:947,0 DA:949,0 DA:950,0 +DA:951,0 DA:952,0 DA:953,0 -DA:954,0 -DA:955,0 DA:956,0 -DA:957,0 DA:958,0 -DA:959,0 +DA:960,0 DA:961,0 -DA:962,0 DA:963,0 +DA:964,0 +DA:965,0 +DA:966,0 DA:967,0 DA:968,0 DA:969,0 DA:970,0 -DA:971,0 DA:972,0 DA:973,0 DA:974,0 -DA:975,0 -DA:976,0 -DA:977,0 DA:978,0 DA:979,0 DA:980,0 @@ -6114,586 +6071,597 @@ DA:988,0 DA:989,0 DA:990,0 DA:991,0 +DA:992,0 DA:993,0 DA:994,0 DA:995,0 DA:996,0 +DA:997,0 +DA:998,0 +DA:999,0 DA:1000,0 +DA:1001,0 +DA:1002,0 DA:1004,0 DA:1005,0 DA:1006,0 DA:1007,0 -DA:1008,0 -DA:1009,0 -DA:1010,0 DA:1011,0 -DA:1012,0 -DA:1013,0 DA:1015,0 DA:1016,0 DA:1017,0 DA:1018,0 DA:1019,0 +DA:1020,0 +DA:1021,0 DA:1022,0 +DA:1023,0 DA:1024,0 DA:1026,0 DA:1027,0 DA:1028,0 DA:1029,0 -DA:1031,0 -DA:1032,0 +DA:1030,0 DA:1033,0 -DA:1034,0 DA:1035,0 -DA:1036,0 DA:1037,0 DA:1038,0 +DA:1039,0 DA:1040,0 -DA:1041,0 +DA:1042,0 +DA:1043,0 DA:1044,0 +DA:1045,0 DA:1046,0 DA:1047,0 DA:1048,0 -DA:1050,0 -DA:1054,0 +DA:1049,0 +DA:1051,0 +DA:1052,0 DA:1055,0 DA:1057,0 +DA:1058,0 DA:1059,0 DA:1061,0 -DA:1063,0 -DA:1064,0 +DA:1065,0 +DA:1066,0 +DA:1068,0 DA:1070,0 -DA:1071,0 DA:1072,0 -DA:1073,0 DA:1074,0 DA:1075,0 -DA:1076,0 -DA:1077,0 -DA:1078,0 -DA:1079,0 DA:1081,0 DA:1082,0 DA:1083,0 DA:1084,0 +DA:1085,0 DA:1086,0 DA:1087,0 DA:1088,0 DA:1089,0 DA:1090,0 -DA:1091,0 DA:1092,0 DA:1093,0 +DA:1094,0 DA:1095,0 -DA:1096,0 +DA:1097,0 +DA:1098,0 DA:1099,0 +DA:1100,0 DA:1101,0 DA:1102,0 DA:1103,0 -DA:1105,0 -DA:1109,0 +DA:1104,0 +DA:1106,0 +DA:1107,0 DA:1110,0 DA:1112,0 +DA:1113,0 DA:1114,0 -DA:1115,0 -DA:1117,0 -DA:1119,0 +DA:1116,0 DA:1120,0 +DA:1121,0 +DA:1123,0 +DA:1125,0 DA:1126,0 -DA:1127,0 DA:1128,0 DA:1130,0 DA:1131,0 -DA:1132,0 -DA:1133,0 -DA:1135,0 DA:1137,0 DA:1138,0 -DA:1140,0 +DA:1139,0 DA:1141,0 DA:1142,0 DA:1143,0 DA:1144,0 DA:1146,0 -DA:1147,0 DA:1148,0 DA:1149,0 -DA:1150,0 DA:1151,0 DA:1152,0 DA:1153,0 +DA:1154,0 +DA:1155,0 +DA:1157,0 +DA:1158,0 DA:1159,0 +DA:1160,0 +DA:1161,0 +DA:1162,0 +DA:1163,0 DA:1164,0 -DA:1165,0 -DA:1167,0 -DA:1168,0 -DA:1171,0 -DA:1173,0 -DA:1174,0 +DA:1170,0 DA:1175,0 DA:1176,0 -DA:1177,0 DA:1178,0 DA:1179,0 -DA:1180,0 -DA:1181,0 DA:1182,0 DA:1184,0 DA:1185,0 +DA:1186,0 +DA:1187,0 DA:1188,0 DA:1189,0 DA:1190,0 +DA:1191,0 DA:1192,0 DA:1193,0 -DA:1194,0 +DA:1195,0 DA:1196,0 DA:1199,0 DA:1200,0 +DA:1201,0 DA:1203,0 DA:1204,0 DA:1205,0 -DA:1206,0 -DA:1209,0 +DA:1207,0 +DA:1210,0 DA:1211,0 -DA:1213,0 +DA:1214,0 DA:1215,0 +DA:1216,0 DA:1217,0 -DA:1218,0 -DA:1219,0 DA:1220,0 -DA:1221,0 DA:1222,0 -DA:1223,0 DA:1224,0 -DA:1225,0 +DA:1226,0 DA:1228,0 DA:1229,0 DA:1230,0 +DA:1231,0 +DA:1232,0 DA:1233,0 DA:1234,0 DA:1235,0 DA:1236,0 -DA:1237,0 -DA:1238,0 +DA:1239,0 DA:1240,0 DA:1241,0 -DA:1243,0 +DA:1244,0 +DA:1245,0 +DA:1246,0 DA:1247,0 DA:1248,0 DA:1249,0 DA:1251,0 DA:1252,0 -DA:1253,0 DA:1254,0 -DA:1256,0 DA:1258,0 DA:1259,0 -DA:1261,0 +DA:1260,0 DA:1262,0 DA:1263,0 DA:1264,0 DA:1265,0 DA:1267,0 -DA:1268,0 DA:1269,0 DA:1270,0 -DA:1271,0 DA:1272,0 DA:1273,0 DA:1274,0 +DA:1275,0 +DA:1276,0 +DA:1278,0 +DA:1279,0 DA:1280,0 +DA:1281,0 +DA:1282,0 +DA:1283,0 +DA:1284,0 DA:1285,0 -DA:1286,0 -DA:1288,0 -DA:1289,0 -DA:1292,0 -DA:1294,0 -DA:1295,0 +DA:1291,0 DA:1296,0 DA:1297,0 -DA:1298,0 DA:1299,0 DA:1300,0 -DA:1301,0 -DA:1302,0 DA:1303,0 DA:1305,0 DA:1306,0 +DA:1307,0 +DA:1308,0 DA:1309,0 DA:1310,0 DA:1311,0 +DA:1312,0 DA:1313,0 DA:1314,0 -DA:1315,0 +DA:1316,0 DA:1317,0 DA:1320,0 DA:1321,0 +DA:1322,0 DA:1324,0 DA:1325,0 DA:1326,0 -DA:1327,0 -DA:1330,0 +DA:1328,0 +DA:1331,0 DA:1332,0 -DA:1334,0 DA:1335,0 +DA:1336,0 DA:1337,0 -DA:1339,0 -DA:1340,0 +DA:1338,0 DA:1341,0 -DA:1342,0 DA:1343,0 -DA:1344,0 DA:1345,0 DA:1346,0 -DA:1347,0 +DA:1348,0 DA:1350,0 DA:1351,0 DA:1352,0 +DA:1353,0 +DA:1354,0 DA:1355,0 DA:1356,0 DA:1357,0 DA:1358,0 -DA:1359,0 -DA:1360,0 +DA:1361,0 DA:1362,0 DA:1363,0 -DA:1365,0 +DA:1366,0 +DA:1367,0 +DA:1368,0 +DA:1369,0 DA:1370,0 DA:1371,0 -DA:1372,0 DA:1373,0 DA:1374,0 -DA:1375,0 -DA:1377,0 -DA:1378,0 -DA:1379,0 -DA:1380,0 +DA:1376,0 +DA:1381,0 +DA:1382,0 DA:1383,0 DA:1384,0 -DA:1387,0 +DA:1385,0 +DA:1386,0 DA:1388,0 -DA:1392,0 -DA:1393,0 +DA:1389,0 +DA:1390,0 +DA:1391,0 +DA:1394,0 DA:1395,0 -DA:1396,0 -DA:1401,0 -DA:1402,0 +DA:1398,0 +DA:1399,0 DA:1403,0 -DA:1405,0 +DA:1404,0 DA:1406,0 DA:1407,0 -DA:1408,0 -DA:1409,0 -DA:1410,0 -DA:1411,0 DA:1412,0 DA:1413,0 -DA:1415,0 +DA:1414,0 DA:1416,0 +DA:1417,0 DA:1418,0 DA:1419,0 DA:1420,0 DA:1421,0 DA:1422,0 +DA:1423,0 +DA:1424,0 +DA:1426,0 DA:1427,0 -DA:1428,0 +DA:1429,0 DA:1430,0 DA:1431,0 DA:1432,0 DA:1433,0 -DA:1434,0 -DA:1436,0 -DA:1437,0 -DA:1440,0 +DA:1438,0 +DA:1439,0 DA:1441,0 +DA:1442,0 DA:1443,0 DA:1444,0 DA:1445,0 DA:1447,0 DA:1448,0 -DA:1449,0 DA:1451,0 +DA:1452,0 DA:1454,0 DA:1455,0 -DA:1457,0 +DA:1456,0 +DA:1458,0 DA:1459,0 DA:1460,0 DA:1462,0 -DA:1464,0 +DA:1465,0 DA:1466,0 -DA:1467,0 -DA:1469,0 +DA:1468,0 DA:1470,0 -DA:1472,0 +DA:1471,0 DA:1473,0 DA:1475,0 -DA:1476,0 +DA:1477,0 DA:1478,0 -DA:1479,0 +DA:1480,0 DA:1481,0 -DA:1482,0 +DA:1483,0 DA:1484,0 -DA:1485,0 DA:1486,0 DA:1487,0 -DA:1488,0 DA:1489,0 -DA:1491,0 +DA:1490,0 DA:1492,0 -DA:1494,0 +DA:1493,0 DA:1495,0 +DA:1496,0 DA:1497,0 DA:1498,0 +DA:1499,0 DA:1500,0 -DA:1501,0 +DA:1502,0 DA:1503,0 -DA:1504,0 +DA:1505,0 DA:1506,0 -DA:1507,0 +DA:1508,0 DA:1509,0 -DA:1510,0 DA:1511,0 DA:1512,0 -DA:1513,0 DA:1514,0 -DA:1516,0 +DA:1515,0 DA:1517,0 DA:1518,0 -DA:1519,0 +DA:1520,0 DA:1521,0 DA:1522,0 +DA:1523,0 +DA:1524,0 +DA:1525,0 +DA:1527,0 DA:1528,0 DA:1529,0 DA:1530,0 -DA:1531,0 +DA:1532,0 DA:1533,0 -DA:1534,0 -DA:1535,0 +DA:1539,0 +DA:1540,0 DA:1541,0 DA:1542,0 -DA:1549,0 +DA:1544,0 +DA:1545,0 +DA:1546,0 DA:1552,0 -DA:1554,0 -DA:1556,0 -DA:1557,0 -DA:1558,0 -DA:1559,0 -DA:1561,0 -DA:1562,0 -DA:1564,0 +DA:1553,0 +DA:1560,0 +DA:1563,0 DA:1565,0 -DA:1566,0 +DA:1567,0 DA:1568,0 DA:1569,0 DA:1570,0 -DA:1571,0 DA:1572,0 +DA:1573,0 +DA:1575,0 +DA:1576,0 DA:1577,0 -DA:1578,0 DA:1579,0 +DA:1580,0 +DA:1581,0 DA:1582,0 DA:1583,0 -DA:1585,0 -DA:1586,0 -DA:1587,0 DA:1588,0 DA:1589,0 -DA:1591,0 -DA:1592,0 -DA:1595,0 +DA:1590,0 +DA:1593,0 +DA:1594,0 DA:1596,0 +DA:1597,0 DA:1598,0 DA:1599,0 -DA:1601,0 +DA:1600,0 DA:1602,0 +DA:1603,0 DA:1606,0 DA:1607,0 -DA:1608,0 +DA:1609,0 DA:1610,0 -DA:1611,0 +DA:1612,0 DA:1613,0 -DA:1614,0 -DA:1615,0 +DA:1617,0 DA:1618,0 +DA:1619,0 +DA:1621,0 DA:1622,0 +DA:1624,0 DA:1625,0 DA:1626,0 -DA:1628,0 -DA:1630,0 -DA:1631,0 +DA:1629,0 DA:1633,0 -DA:1635,0 -DA:1638,0 -DA:1640,0 +DA:1636,0 +DA:1637,0 +DA:1639,0 DA:1641,0 +DA:1642,0 +DA:1644,0 DA:1646,0 -DA:1647,0 -DA:1648,0 -DA:1650,0 +DA:1649,0 DA:1651,0 DA:1652,0 -DA:1653,0 -DA:1656,0 DA:1657,0 DA:1658,0 DA:1659,0 -DA:1660,0 +DA:1661,0 DA:1662,0 DA:1663,0 -DA:1666,0 +DA:1664,0 DA:1667,0 +DA:1668,0 DA:1669,0 DA:1670,0 DA:1671,0 DA:1673,0 DA:1674,0 -DA:1675,0 DA:1677,0 +DA:1678,0 DA:1680,0 DA:1681,0 -DA:1683,0 +DA:1682,0 +DA:1684,0 DA:1685,0 DA:1686,0 DA:1688,0 -DA:1690,0 +DA:1691,0 DA:1692,0 -DA:1693,0 -DA:1695,0 +DA:1694,0 DA:1696,0 -DA:1698,0 +DA:1697,0 DA:1699,0 DA:1701,0 -DA:1702,0 +DA:1703,0 DA:1704,0 -DA:1705,0 +DA:1706,0 DA:1707,0 -DA:1708,0 +DA:1709,0 DA:1710,0 -DA:1711,0 DA:1712,0 DA:1713,0 -DA:1714,0 DA:1715,0 -DA:1717,0 +DA:1716,0 DA:1718,0 DA:1719,0 -DA:1720,0 +DA:1721,0 DA:1722,0 DA:1723,0 +DA:1724,0 +DA:1725,0 +DA:1726,0 +DA:1728,0 DA:1729,0 DA:1730,0 DA:1731,0 -DA:1732,0 +DA:1733,0 DA:1734,0 -DA:1735,0 -DA:1736,0 +DA:1740,0 +DA:1741,0 DA:1742,0 DA:1743,0 -DA:1750,0 +DA:1745,0 +DA:1746,0 +DA:1747,0 DA:1753,0 -DA:1755,0 -DA:1757,0 -DA:1758,0 -DA:1759,0 -DA:1760,0 -DA:1762,0 -DA:1763,0 -DA:1765,0 +DA:1754,0 +DA:1761,0 +DA:1764,0 DA:1766,0 -DA:1767,0 +DA:1768,0 DA:1769,0 DA:1770,0 DA:1771,0 -DA:1772,0 DA:1773,0 +DA:1774,0 +DA:1776,0 +DA:1777,0 DA:1778,0 -DA:1779,0 DA:1780,0 +DA:1781,0 +DA:1782,0 DA:1783,0 DA:1784,0 -DA:1786,0 -DA:1787,0 -DA:1788,0 DA:1789,0 DA:1790,0 -DA:1792,0 -DA:1793,0 -DA:1796,0 +DA:1791,0 +DA:1794,0 +DA:1795,0 DA:1797,0 +DA:1798,0 DA:1799,0 DA:1800,0 -DA:1802,0 +DA:1801,0 DA:1803,0 DA:1804,0 -DA:1805,0 -DA:1806,0 +DA:1807,0 DA:1808,0 -DA:1809,0 DA:1810,0 -DA:1812,0 +DA:1811,0 DA:1813,0 +DA:1814,0 DA:1815,0 -DA:1818,0 +DA:1816,0 +DA:1817,0 DA:1819,0 +DA:1820,0 DA:1821,0 DA:1823,0 DA:1824,0 DA:1826,0 -DA:1828,0 -DA:1831,0 -DA:1833,0 +DA:1829,0 +DA:1830,0 +DA:1832,0 DA:1834,0 DA:1835,0 -DA:1840,0 -DA:1843,0 +DA:1837,0 +DA:1839,0 +DA:1842,0 DA:1844,0 DA:1845,0 DA:1846,0 -DA:1847,0 -DA:1850,0 DA:1851,0 -DA:1852,0 DA:1854,0 DA:1855,0 DA:1856,0 +DA:1857,0 +DA:1858,0 DA:1861,0 DA:1862,0 DA:1863,0 DA:1865,0 DA:1866,0 -DA:1868,0 -DA:1869,0 -DA:1871,0 +DA:1867,0 DA:1872,0 DA:1873,0 DA:1874,0 -DA:1875,0 DA:1876,0 DA:1877,0 -DA:1878,0 DA:1879,0 +DA:1880,0 +DA:1882,0 DA:1883,0 DA:1884,0 DA:1885,0 DA:1886,0 DA:1887,0 DA:1888,0 +DA:1889,0 DA:1890,0 -DA:1893,0 +DA:1894,0 +DA:1895,0 +DA:1896,0 +DA:1897,0 DA:1898,0 DA:1899,0 -DA:1900,0 DA:1901,0 -DA:1902,0 -DA:1903,0 -DA:1905,0 -DA:1906,0 -DA:1908,0 +DA:1904,0 DA:1909,0 DA:1910,0 DA:1911,0 -LF:1259 -LH:0 +DA:1912,0 +DA:1913,0 +DA:1914,0 +DA:1916,0 +DA:1917,0 +DA:1919,1 +DA:1920,1 +DA:1921,1 +DA:1922,1 +LF:1266 +LH:10 BRDA:34,0,0,0 BRDA:34,0,1,0 BRDA:34,1,0,0 @@ -6748,1049 +6716,1023 @@ BRDA:103,24,0,0 BRDA:103,24,1,0 BRDA:112,25,0,0 BRDA:112,25,1,0 -BRDA:116,26,0,0 -BRDA:116,26,1,0 -BRDA:122,27,0,0 -BRDA:122,27,1,0 -BRDA:125,28,0,0 -BRDA:125,28,1,0 -BRDA:128,29,0,0 -BRDA:128,29,1,0 -BRDA:132,30,0,0 -BRDA:132,30,1,0 -BRDA:135,31,0,0 -BRDA:135,31,1,0 -BRDA:136,32,0,0 -BRDA:136,32,1,0 -BRDA:141,33,0,0 -BRDA:141,33,1,0 -BRDA:143,34,0,0 -BRDA:143,34,1,0 -BRDA:147,35,0,0 -BRDA:147,35,1,0 -BRDA:151,36,0,0 -BRDA:151,36,1,0 -BRDA:152,37,0,0 -BRDA:152,37,1,0 -BRDA:175,38,0,0 -BRDA:175,38,1,0 +BRDA:112,26,0,0 +BRDA:112,26,1,0 +BRDA:116,27,0,0 +BRDA:116,27,1,0 +BRDA:122,28,0,0 +BRDA:122,28,1,0 +BRDA:125,29,0,0 +BRDA:125,29,1,0 +BRDA:128,30,0,0 +BRDA:128,30,1,0 +BRDA:132,31,0,0 +BRDA:132,31,1,0 +BRDA:135,32,0,0 +BRDA:135,32,1,0 +BRDA:136,33,0,0 +BRDA:136,33,1,0 +BRDA:141,34,0,0 +BRDA:141,34,1,0 +BRDA:143,35,0,0 +BRDA:143,35,1,0 +BRDA:147,36,0,0 +BRDA:147,36,1,0 +BRDA:151,37,0,0 +BRDA:151,37,1,0 +BRDA:152,38,0,0 +BRDA:152,38,1,0 BRDA:175,39,0,0 BRDA:175,39,1,0 -BRDA:179,40,0,0 -BRDA:179,40,1,0 -BRDA:181,41,0,0 -BRDA:181,41,1,0 +BRDA:175,40,0,0 +BRDA:175,40,1,0 +BRDA:179,41,0,0 +BRDA:179,41,1,0 BRDA:181,42,0,0 BRDA:181,42,1,0 -BRDA:181,42,2,0 -BRDA:181,42,3,0 -BRDA:184,43,0,0 -BRDA:184,43,1,0 +BRDA:181,43,0,0 +BRDA:181,43,1,0 +BRDA:181,43,2,0 +BRDA:181,43,3,0 BRDA:184,44,0,0 BRDA:184,44,1,0 -BRDA:184,44,2,0 -BRDA:187,45,0,0 -BRDA:187,45,1,0 +BRDA:184,45,0,0 +BRDA:184,45,1,0 +BRDA:184,45,2,0 BRDA:187,46,0,0 BRDA:187,46,1,0 -BRDA:190,47,0,0 -BRDA:190,47,1,0 +BRDA:187,47,0,0 +BRDA:187,47,1,0 BRDA:190,48,0,0 BRDA:190,48,1,0 -BRDA:193,49,0,0 -BRDA:193,49,1,0 +BRDA:190,49,0,0 +BRDA:190,49,1,0 BRDA:193,50,0,0 BRDA:193,50,1,0 -BRDA:197,51,0,0 -BRDA:197,51,1,0 +BRDA:193,51,0,0 +BRDA:193,51,1,0 BRDA:197,52,0,0 BRDA:197,52,1,0 -BRDA:197,52,2,0 -BRDA:200,53,0,0 -BRDA:200,53,1,0 -BRDA:202,54,0,0 -BRDA:202,54,1,0 +BRDA:197,53,0,0 +BRDA:197,53,1,0 +BRDA:197,53,2,0 +BRDA:200,54,0,0 +BRDA:200,54,1,0 BRDA:202,55,0,0 BRDA:202,55,1,0 -BRDA:204,56,0,0 -BRDA:204,56,1,0 -BRDA:209,57,0,0 -BRDA:209,57,1,0 +BRDA:202,56,0,0 +BRDA:202,56,1,0 +BRDA:204,57,0,0 +BRDA:204,57,1,0 BRDA:209,58,0,0 BRDA:209,58,1,0 -BRDA:213,59,0,0 -BRDA:213,59,1,0 -BRDA:220,60,0,0 -BRDA:220,60,1,0 -BRDA:226,61,0,0 -BRDA:226,61,1,0 -BRDA:231,62,0,0 -BRDA:231,62,1,0 -BRDA:232,63,0,0 -BRDA:232,63,1,0 -BRDA:235,64,0,0 -BRDA:235,64,1,0 -BRDA:237,65,0,0 -BRDA:237,65,1,0 -BRDA:247,66,0,0 -BRDA:247,66,1,0 -BRDA:254,67,0,0 -BRDA:254,67,1,0 -BRDA:255,68,0,0 -BRDA:255,68,1,0 +BRDA:209,59,0,0 +BRDA:209,59,1,0 +BRDA:213,60,0,0 +BRDA:213,60,1,0 +BRDA:220,61,0,0 +BRDA:220,61,1,0 +BRDA:226,62,0,0 +BRDA:226,62,1,0 +BRDA:231,63,0,0 +BRDA:231,63,1,0 +BRDA:232,64,0,0 +BRDA:232,64,1,0 +BRDA:235,65,0,0 +BRDA:235,65,1,0 +BRDA:237,66,0,0 +BRDA:237,66,1,0 +BRDA:247,67,0,0 +BRDA:247,67,1,0 +BRDA:254,68,0,0 +BRDA:254,68,1,0 BRDA:255,69,0,0 BRDA:255,69,1,0 -BRDA:256,70,0,0 -BRDA:256,70,1,0 +BRDA:255,70,0,0 +BRDA:255,70,1,0 BRDA:256,71,0,0 BRDA:256,71,1,0 -BRDA:257,72,0,0 -BRDA:257,72,1,0 -BRDA:258,73,0,0 -BRDA:258,73,1,0 +BRDA:256,72,0,0 +BRDA:256,72,1,0 +BRDA:257,73,0,0 +BRDA:257,73,1,0 BRDA:258,74,0,0 BRDA:258,74,1,0 -BRDA:259,75,0,0 -BRDA:259,75,1,0 +BRDA:258,75,0,0 +BRDA:258,75,1,0 BRDA:259,76,0,0 BRDA:259,76,1,0 -BRDA:261,77,0,0 -BRDA:261,77,1,0 -BRDA:262,78,0,0 -BRDA:262,78,1,0 -BRDA:265,79,0,0 -BRDA:265,79,1,0 -BRDA:266,80,0,0 -BRDA:266,80,1,0 -BRDA:271,81,0,0 -BRDA:271,81,1,0 -BRDA:272,82,0,0 -BRDA:272,82,1,0 -BRDA:275,83,0,0 -BRDA:275,83,1,0 -BRDA:276,84,0,0 -BRDA:276,84,1,0 -BRDA:283,85,0,0 -BRDA:283,85,1,0 +BRDA:259,77,0,0 +BRDA:259,77,1,0 +BRDA:261,78,0,0 +BRDA:261,78,1,0 +BRDA:262,79,0,0 +BRDA:262,79,1,0 +BRDA:265,80,0,0 +BRDA:265,80,1,0 +BRDA:266,81,0,0 +BRDA:266,81,1,0 +BRDA:271,82,0,0 +BRDA:271,82,1,0 +BRDA:272,83,0,0 +BRDA:272,83,1,0 +BRDA:275,84,0,0 +BRDA:275,84,1,0 +BRDA:276,85,0,0 +BRDA:276,85,1,0 BRDA:283,86,0,0 BRDA:283,86,1,0 -BRDA:285,87,0,0 -BRDA:285,87,1,0 -BRDA:286,88,0,0 -BRDA:286,88,1,0 +BRDA:283,87,0,0 +BRDA:283,87,1,0 +BRDA:285,88,0,0 +BRDA:285,88,1,0 BRDA:286,89,0,0 BRDA:286,89,1,0 -BRDA:289,90,0,0 -BRDA:289,90,1,0 -BRDA:290,91,0,0 -BRDA:290,91,1,0 -BRDA:295,92,0,0 -BRDA:295,92,1,0 -BRDA:296,93,0,0 -BRDA:296,93,1,0 -BRDA:301,94,0,0 -BRDA:301,94,1,0 -BRDA:302,95,0,0 -BRDA:302,95,1,0 -BRDA:308,96,0,0 -BRDA:308,96,1,0 -BRDA:309,97,0,0 -BRDA:309,97,1,0 -BRDA:310,98,0,0 -BRDA:310,98,1,0 -BRDA:313,99,0,0 -BRDA:313,99,1,0 -BRDA:314,100,0,0 -BRDA:314,100,1,0 -BRDA:317,101,0,0 -BRDA:317,101,1,0 -BRDA:318,102,0,0 -BRDA:318,102,1,0 -BRDA:323,103,0,0 -BRDA:323,103,1,0 -BRDA:324,104,0,0 -BRDA:324,104,1,0 -BRDA:329,105,0,0 -BRDA:329,105,1,0 -BRDA:331,106,0,0 -BRDA:331,106,1,0 -BRDA:332,107,0,0 -BRDA:332,107,1,0 -BRDA:335,108,0,0 -BRDA:335,108,1,0 -BRDA:336,109,0,0 -BRDA:336,109,1,0 -BRDA:339,110,0,0 -BRDA:339,110,1,0 -BRDA:340,111,0,0 -BRDA:340,111,1,0 -BRDA:345,112,0,0 -BRDA:345,112,1,0 -BRDA:346,113,0,0 -BRDA:346,113,1,0 -BRDA:351,114,0,0 -BRDA:351,114,1,0 -BRDA:353,115,0,0 -BRDA:353,115,1,0 -BRDA:354,116,0,0 -BRDA:354,116,1,0 -BRDA:357,117,0,0 -BRDA:357,117,1,0 -BRDA:358,118,0,0 -BRDA:358,118,1,0 -BRDA:361,119,0,0 -BRDA:361,119,1,0 -BRDA:362,120,0,0 -BRDA:362,120,1,0 -BRDA:367,121,0,0 -BRDA:367,121,1,0 -BRDA:368,122,0,0 -BRDA:368,122,1,0 -BRDA:373,123,0,0 -BRDA:373,123,1,0 -BRDA:375,124,0,0 -BRDA:375,124,1,0 -BRDA:376,125,0,0 -BRDA:376,125,1,0 -BRDA:379,126,0,0 -BRDA:379,126,1,0 -BRDA:380,127,0,0 -BRDA:380,127,1,0 -BRDA:396,128,0,0 -BRDA:396,128,1,0 -BRDA:402,129,0,0 -BRDA:402,129,1,0 +BRDA:286,90,0,0 +BRDA:286,90,1,0 +BRDA:289,91,0,0 +BRDA:289,91,1,0 +BRDA:290,92,0,0 +BRDA:290,92,1,0 +BRDA:295,93,0,0 +BRDA:295,93,1,0 +BRDA:296,94,0,0 +BRDA:296,94,1,0 +BRDA:301,95,0,0 +BRDA:301,95,1,0 +BRDA:302,96,0,0 +BRDA:302,96,1,0 +BRDA:308,97,0,0 +BRDA:308,97,1,0 +BRDA:309,98,0,0 +BRDA:309,98,1,0 +BRDA:310,99,0,0 +BRDA:310,99,1,0 +BRDA:313,100,0,0 +BRDA:313,100,1,0 +BRDA:314,101,0,0 +BRDA:314,101,1,0 +BRDA:317,102,0,0 +BRDA:317,102,1,0 +BRDA:318,103,0,0 +BRDA:318,103,1,0 +BRDA:323,104,0,0 +BRDA:323,104,1,0 +BRDA:324,105,0,0 +BRDA:324,105,1,0 +BRDA:329,106,0,0 +BRDA:329,106,1,0 +BRDA:331,107,0,0 +BRDA:331,107,1,0 +BRDA:332,108,0,0 +BRDA:332,108,1,0 +BRDA:335,109,0,0 +BRDA:335,109,1,0 +BRDA:336,110,0,0 +BRDA:336,110,1,0 +BRDA:339,111,0,0 +BRDA:339,111,1,0 +BRDA:340,112,0,0 +BRDA:340,112,1,0 +BRDA:345,113,0,0 +BRDA:345,113,1,0 +BRDA:346,114,0,0 +BRDA:346,114,1,0 +BRDA:351,115,0,0 +BRDA:351,115,1,0 +BRDA:353,116,0,0 +BRDA:353,116,1,0 +BRDA:354,117,0,0 +BRDA:354,117,1,0 +BRDA:357,118,0,0 +BRDA:357,118,1,0 +BRDA:358,119,0,0 +BRDA:358,119,1,0 +BRDA:361,120,0,0 +BRDA:361,120,1,0 +BRDA:362,121,0,0 +BRDA:362,121,1,0 +BRDA:367,122,0,0 +BRDA:367,122,1,0 +BRDA:368,123,0,0 +BRDA:368,123,1,0 +BRDA:373,124,0,0 +BRDA:373,124,1,0 +BRDA:375,125,0,0 +BRDA:375,125,1,0 +BRDA:376,126,0,0 +BRDA:376,126,1,0 +BRDA:379,127,0,0 +BRDA:379,127,1,0 +BRDA:380,128,0,0 +BRDA:380,128,1,0 +BRDA:396,129,0,0 +BRDA:396,129,1,0 BRDA:402,130,0,0 BRDA:402,130,1,0 -BRDA:403,131,0,0 -BRDA:403,131,1,0 +BRDA:402,131,0,0 +BRDA:402,131,1,0 BRDA:403,132,0,0 BRDA:403,132,1,0 -BRDA:412,133,0,0 -BRDA:412,133,1,0 -BRDA:420,134,0,0 -BRDA:420,134,1,0 +BRDA:403,133,0,0 +BRDA:403,133,1,0 +BRDA:412,134,0,0 +BRDA:412,134,1,0 BRDA:420,135,0,0 BRDA:420,135,1,0 -BRDA:420,135,2,0 -BRDA:421,136,0,0 -BRDA:421,136,1,0 -BRDA:426,137,0,0 -BRDA:426,137,1,0 +BRDA:420,136,0,0 +BRDA:420,136,1,0 +BRDA:420,136,2,0 +BRDA:421,137,0,0 +BRDA:421,137,1,0 BRDA:426,138,0,0 BRDA:426,138,1,0 -BRDA:428,139,0,0 -BRDA:428,139,1,0 -BRDA:429,140,0,0 -BRDA:429,140,1,0 -BRDA:439,141,0,0 -BRDA:439,141,1,0 +BRDA:426,139,0,0 +BRDA:426,139,1,0 +BRDA:428,140,0,0 +BRDA:428,140,1,0 +BRDA:429,141,0,0 +BRDA:429,141,1,0 BRDA:439,142,0,0 BRDA:439,142,1,0 -BRDA:439,142,2,0 -BRDA:441,143,0,0 -BRDA:441,143,1,0 -BRDA:442,144,0,0 -BRDA:442,144,1,0 -BRDA:446,145,0,0 -BRDA:446,145,1,0 -BRDA:454,146,0,0 -BRDA:454,146,1,0 +BRDA:439,143,0,0 +BRDA:439,143,1,0 +BRDA:439,143,2,0 +BRDA:441,144,0,0 +BRDA:441,144,1,0 +BRDA:442,145,0,0 +BRDA:442,145,1,0 +BRDA:446,146,0,0 +BRDA:446,146,1,0 BRDA:454,147,0,0 BRDA:454,147,1,0 -BRDA:464,148,0,0 -BRDA:464,148,1,0 -BRDA:468,149,0,0 -BRDA:468,149,1,0 -BRDA:474,150,0,0 -BRDA:474,150,1,0 -BRDA:477,151,0,0 -BRDA:477,151,1,0 -BRDA:480,152,0,0 -BRDA:480,152,1,0 -BRDA:483,153,0,0 -BRDA:483,153,1,0 -BRDA:485,154,0,0 -BRDA:485,154,1,0 -BRDA:486,155,0,0 -BRDA:486,155,1,0 -BRDA:491,156,0,0 -BRDA:491,156,1,0 -BRDA:494,157,0,0 -BRDA:494,157,1,0 -BRDA:495,158,0,0 -BRDA:495,158,1,0 -BRDA:496,159,0,0 -BRDA:496,159,1,0 -BRDA:511,160,0,0 -BRDA:511,160,1,0 -BRDA:516,161,0,0 -BRDA:516,161,1,0 -BRDA:520,162,0,0 -BRDA:520,162,1,0 -BRDA:521,163,0,0 -BRDA:521,163,1,0 -BRDA:522,164,0,0 -BRDA:522,164,1,0 -BRDA:523,165,0,0 -BRDA:523,165,1,0 -BRDA:533,166,0,0 -BRDA:533,166,1,0 -BRDA:534,167,0,0 -BRDA:534,167,1,0 -BRDA:534,168,0,0 -BRDA:534,168,1,0 -BRDA:540,169,0,0 -BRDA:540,169,1,0 -BRDA:541,170,0,0 -BRDA:541,170,1,0 -BRDA:551,171,0,0 -BRDA:551,171,1,0 -BRDA:552,172,0,0 -BRDA:552,172,1,0 -BRDA:553,173,0,0 -BRDA:553,173,1,0 -BRDA:554,174,0,0 -BRDA:554,174,1,0 -BRDA:555,175,0,0 -BRDA:555,175,1,0 -BRDA:556,176,0,0 -BRDA:556,176,1,0 -BRDA:557,177,0,0 -BRDA:557,177,1,0 -BRDA:558,178,0,0 -BRDA:558,178,1,0 -BRDA:559,179,0,0 -BRDA:559,179,1,0 -BRDA:560,180,0,0 -BRDA:560,180,1,0 -BRDA:561,181,0,0 -BRDA:561,181,1,0 -BRDA:562,182,0,0 -BRDA:562,182,1,0 -BRDA:563,183,0,0 -BRDA:563,183,1,0 -BRDA:564,184,0,0 -BRDA:564,184,1,0 -BRDA:565,185,0,0 -BRDA:565,185,1,0 -BRDA:566,186,0,0 -BRDA:566,186,1,0 -BRDA:567,187,0,0 -BRDA:567,187,1,0 -BRDA:568,188,0,0 -BRDA:568,188,1,0 -BRDA:569,189,0,0 -BRDA:569,189,1,0 -BRDA:570,190,0,0 -BRDA:570,190,1,0 -BRDA:571,191,0,0 -BRDA:571,191,1,0 -BRDA:572,192,0,0 -BRDA:572,192,1,0 -BRDA:573,193,0,0 -BRDA:573,193,1,0 -BRDA:574,194,0,0 -BRDA:574,194,1,0 -BRDA:575,195,0,0 -BRDA:575,195,1,0 -BRDA:576,196,0,0 -BRDA:576,196,1,0 -BRDA:579,197,0,0 -BRDA:579,197,1,0 +BRDA:454,148,0,0 +BRDA:454,148,1,0 +BRDA:464,149,0,0 +BRDA:464,149,1,0 +BRDA:464,150,0,0 +BRDA:464,150,1,0 +BRDA:469,151,0,0 +BRDA:469,151,1,0 +BRDA:473,152,0,0 +BRDA:473,152,1,0 +BRDA:473,153,0,0 +BRDA:473,153,1,0 +BRDA:474,154,0,0 +BRDA:474,154,1,0 +BRDA:474,155,0,0 +BRDA:474,155,1,0 +BRDA:481,156,0,0 +BRDA:481,156,1,0 +BRDA:484,157,0,0 +BRDA:484,157,1,0 +BRDA:487,158,0,0 +BRDA:487,158,1,0 +BRDA:490,159,0,0 +BRDA:490,159,1,0 +BRDA:492,160,0,0 +BRDA:492,160,1,0 +BRDA:493,161,0,0 +BRDA:493,161,1,0 +BRDA:498,162,0,0 +BRDA:498,162,1,0 +BRDA:501,163,0,0 +BRDA:501,163,1,0 +BRDA:502,164,0,0 +BRDA:502,164,1,0 +BRDA:503,165,0,0 +BRDA:503,165,1,0 +BRDA:518,166,0,0 +BRDA:518,166,1,0 +BRDA:523,167,0,0 +BRDA:523,167,1,0 +BRDA:527,168,0,0 +BRDA:527,168,1,0 +BRDA:528,169,0,0 +BRDA:528,169,1,0 +BRDA:529,170,0,0 +BRDA:529,170,1,0 +BRDA:530,171,0,0 +BRDA:530,171,1,0 +BRDA:540,172,0,0 +BRDA:540,172,1,0 +BRDA:541,173,0,0 +BRDA:541,173,1,0 +BRDA:541,174,0,0 +BRDA:541,174,1,0 +BRDA:547,175,0,0 +BRDA:547,175,1,0 +BRDA:548,176,0,0 +BRDA:548,176,1,0 +BRDA:558,177,0,0 +BRDA:558,177,1,0 +BRDA:559,178,0,0 +BRDA:559,178,1,0 +BRDA:560,179,0,0 +BRDA:560,179,1,0 +BRDA:561,180,0,0 +BRDA:561,180,1,0 +BRDA:562,181,0,0 +BRDA:562,181,1,0 +BRDA:563,182,0,0 +BRDA:563,182,1,0 +BRDA:564,183,0,0 +BRDA:564,183,1,0 +BRDA:565,184,0,0 +BRDA:565,184,1,0 +BRDA:566,185,0,0 +BRDA:566,185,1,0 +BRDA:567,186,0,0 +BRDA:567,186,1,0 +BRDA:568,187,0,0 +BRDA:568,187,1,0 +BRDA:569,188,0,0 +BRDA:569,188,1,0 +BRDA:570,189,0,0 +BRDA:570,189,1,0 +BRDA:571,190,0,0 +BRDA:571,190,1,0 +BRDA:572,191,0,0 +BRDA:572,191,1,0 +BRDA:573,192,0,0 +BRDA:573,192,1,0 +BRDA:574,193,0,0 +BRDA:574,193,1,0 +BRDA:575,194,0,0 +BRDA:575,194,1,0 +BRDA:576,195,0,0 +BRDA:576,195,1,0 +BRDA:577,196,0,0 +BRDA:577,196,1,0 +BRDA:578,197,0,0 +BRDA:578,197,1,0 BRDA:579,198,0,0 BRDA:579,198,1,0 -BRDA:579,198,2,0 -BRDA:579,198,3,0 -BRDA:581,199,0,0 -BRDA:581,199,1,0 -BRDA:585,200,0,0 -BRDA:585,200,1,0 -BRDA:585,201,0,0 -BRDA:585,201,1,0 -BRDA:585,201,2,0 -BRDA:585,201,3,0 -BRDA:585,201,4,0 -BRDA:585,201,5,0 -BRDA:585,201,6,0 -BRDA:609,202,0,0 -BRDA:609,202,1,0 -BRDA:613,203,0,0 -BRDA:613,203,1,0 -BRDA:613,204,0,0 -BRDA:613,204,1,0 -BRDA:620,205,0,0 -BRDA:620,205,1,0 -BRDA:620,206,0,0 -BRDA:620,206,1,0 -BRDA:622,207,0,0 -BRDA:622,207,1,0 -BRDA:636,208,0,0 -BRDA:636,208,1,0 -BRDA:636,209,0,0 -BRDA:636,209,1,0 -BRDA:637,210,0,0 -BRDA:637,210,1,0 -BRDA:637,211,0,0 -BRDA:637,211,1,0 -BRDA:641,212,0,0 -BRDA:641,212,1,0 -BRDA:648,213,0,0 -BRDA:648,213,1,0 -BRDA:648,214,0,0 -BRDA:648,214,1,0 -BRDA:657,215,0,0 -BRDA:657,215,1,0 -BRDA:661,216,0,0 -BRDA:661,216,1,0 -BRDA:666,217,0,0 -BRDA:666,217,1,0 -BRDA:669,218,0,0 -BRDA:669,218,1,0 -BRDA:672,219,0,0 -BRDA:672,219,1,0 -BRDA:678,220,0,0 -BRDA:678,220,1,0 -BRDA:679,221,0,0 -BRDA:679,221,1,0 -BRDA:684,222,0,0 -BRDA:684,222,1,0 -BRDA:686,223,0,0 -BRDA:686,223,1,0 -BRDA:690,224,0,0 -BRDA:690,224,1,0 -BRDA:694,225,0,0 -BRDA:694,225,1,0 -BRDA:695,226,0,0 -BRDA:695,226,1,0 -BRDA:728,227,0,0 -BRDA:728,227,1,0 -BRDA:729,228,0,0 -BRDA:729,228,1,0 -BRDA:732,229,0,0 -BRDA:732,229,1,0 -BRDA:734,230,0,0 -BRDA:734,230,1,0 -BRDA:744,231,0,0 -BRDA:744,231,1,0 -BRDA:751,232,0,0 -BRDA:751,232,1,0 -BRDA:752,233,0,0 -BRDA:752,233,1,0 -BRDA:752,234,0,0 -BRDA:752,234,1,0 -BRDA:753,235,0,0 -BRDA:753,235,1,0 -BRDA:753,236,0,0 -BRDA:753,236,1,0 -BRDA:754,237,0,0 -BRDA:754,237,1,0 -BRDA:755,238,0,0 -BRDA:755,238,1,0 -BRDA:755,239,0,0 -BRDA:755,239,1,0 -BRDA:756,240,0,0 -BRDA:756,240,1,0 -BRDA:756,241,0,0 -BRDA:756,241,1,0 -BRDA:758,242,0,0 -BRDA:758,242,1,0 -BRDA:759,243,0,0 -BRDA:759,243,1,0 -BRDA:762,244,0,0 -BRDA:762,244,1,0 +BRDA:580,199,0,0 +BRDA:580,199,1,0 +BRDA:581,200,0,0 +BRDA:581,200,1,0 +BRDA:582,201,0,0 +BRDA:582,201,1,0 +BRDA:583,202,0,0 +BRDA:583,202,1,0 +BRDA:584,203,0,0 +BRDA:584,203,1,0 +BRDA:585,204,0,0 +BRDA:585,204,1,0 +BRDA:586,205,0,0 +BRDA:586,205,1,0 +BRDA:587,206,0,0 +BRDA:587,206,1,0 +BRDA:590,207,0,0 +BRDA:590,207,1,0 +BRDA:590,208,0,0 +BRDA:590,208,1,0 +BRDA:590,208,2,0 +BRDA:590,208,3,0 +BRDA:592,209,0,0 +BRDA:592,209,1,0 +BRDA:596,210,0,0 +BRDA:596,210,1,0 +BRDA:596,211,0,0 +BRDA:596,211,1,0 +BRDA:596,211,2,0 +BRDA:596,211,3,0 +BRDA:596,211,4,0 +BRDA:596,211,5,0 +BRDA:596,211,6,0 +BRDA:620,212,0,0 +BRDA:620,212,1,0 +BRDA:624,213,0,0 +BRDA:624,213,1,0 +BRDA:624,214,0,0 +BRDA:624,214,1,0 +BRDA:631,215,0,0 +BRDA:631,215,1,0 +BRDA:631,216,0,0 +BRDA:631,216,1,0 +BRDA:633,217,0,0 +BRDA:633,217,1,0 +BRDA:647,218,0,0 +BRDA:647,218,1,0 +BRDA:647,219,0,0 +BRDA:647,219,1,0 +BRDA:648,220,0,0 +BRDA:648,220,1,0 +BRDA:648,221,0,0 +BRDA:648,221,1,0 +BRDA:652,222,0,0 +BRDA:652,222,1,0 +BRDA:659,223,0,0 +BRDA:659,223,1,0 +BRDA:659,224,0,0 +BRDA:659,224,1,0 +BRDA:668,225,0,0 +BRDA:668,225,1,0 +BRDA:668,226,0,0 +BRDA:668,226,1,0 +BRDA:672,227,0,0 +BRDA:672,227,1,0 +BRDA:677,228,0,0 +BRDA:677,228,1,0 +BRDA:680,229,0,0 +BRDA:680,229,1,0 +BRDA:683,230,0,0 +BRDA:683,230,1,0 +BRDA:689,231,0,0 +BRDA:689,231,1,0 +BRDA:690,232,0,0 +BRDA:690,232,1,0 +BRDA:695,233,0,0 +BRDA:695,233,1,0 +BRDA:697,234,0,0 +BRDA:697,234,1,0 +BRDA:701,235,0,0 +BRDA:701,235,1,0 +BRDA:705,236,0,0 +BRDA:705,236,1,0 +BRDA:706,237,0,0 +BRDA:706,237,1,0 +BRDA:739,238,0,0 +BRDA:739,238,1,0 +BRDA:740,239,0,0 +BRDA:740,239,1,0 +BRDA:743,240,0,0 +BRDA:743,240,1,0 +BRDA:745,241,0,0 +BRDA:745,241,1,0 +BRDA:755,242,0,0 +BRDA:755,242,1,0 +BRDA:762,243,0,0 +BRDA:762,243,1,0 +BRDA:763,244,0,0 +BRDA:763,244,1,0 BRDA:763,245,0,0 BRDA:763,245,1,0 -BRDA:768,246,0,0 -BRDA:768,246,1,0 -BRDA:769,247,0,0 -BRDA:769,247,1,0 -BRDA:772,248,0,0 -BRDA:772,248,1,0 -BRDA:773,249,0,0 -BRDA:773,249,1,0 -BRDA:779,250,0,0 -BRDA:779,250,1,0 -BRDA:780,251,0,0 -BRDA:780,251,1,0 -BRDA:781,252,0,0 -BRDA:781,252,1,0 -BRDA:784,253,0,0 -BRDA:784,253,1,0 -BRDA:785,254,0,0 -BRDA:785,254,1,0 -BRDA:788,255,0,0 -BRDA:788,255,1,0 -BRDA:789,256,0,0 -BRDA:789,256,1,0 -BRDA:794,257,0,0 -BRDA:794,257,1,0 -BRDA:795,258,0,0 -BRDA:795,258,1,0 -BRDA:800,259,0,0 -BRDA:800,259,1,0 -BRDA:802,260,0,0 -BRDA:802,260,1,0 -BRDA:803,261,0,0 -BRDA:803,261,1,0 -BRDA:806,262,0,0 -BRDA:806,262,1,0 -BRDA:807,263,0,0 -BRDA:807,263,1,0 -BRDA:810,264,0,0 -BRDA:810,264,1,0 -BRDA:811,265,0,0 -BRDA:811,265,1,0 -BRDA:816,266,0,0 -BRDA:816,266,1,0 -BRDA:817,267,0,0 -BRDA:817,267,1,0 -BRDA:822,268,0,0 -BRDA:822,268,1,0 -BRDA:824,269,0,0 -BRDA:824,269,1,0 -BRDA:825,270,0,0 -BRDA:825,270,1,0 -BRDA:828,271,0,0 -BRDA:828,271,1,0 -BRDA:829,272,0,0 -BRDA:829,272,1,0 -BRDA:832,273,0,0 -BRDA:832,273,1,0 -BRDA:833,274,0,0 -BRDA:833,274,1,0 -BRDA:838,275,0,0 -BRDA:838,275,1,0 -BRDA:839,276,0,0 -BRDA:839,276,1,0 -BRDA:844,277,0,0 -BRDA:844,277,1,0 -BRDA:846,278,0,0 -BRDA:846,278,1,0 -BRDA:847,279,0,0 -BRDA:847,279,1,0 -BRDA:850,280,0,0 -BRDA:850,280,1,0 -BRDA:851,281,0,0 -BRDA:851,281,1,0 -BRDA:867,282,0,0 -BRDA:867,282,1,0 -BRDA:876,283,0,0 -BRDA:876,283,1,0 -BRDA:876,284,0,0 -BRDA:876,284,1,0 -BRDA:887,285,0,0 -BRDA:887,285,1,0 -BRDA:891,286,0,0 -BRDA:891,286,1,0 -BRDA:897,287,0,0 -BRDA:897,287,1,0 -BRDA:900,288,0,0 -BRDA:900,288,1,0 -BRDA:903,289,0,0 -BRDA:903,289,1,0 -BRDA:906,290,0,0 -BRDA:906,290,1,0 -BRDA:907,291,0,0 -BRDA:907,291,1,0 -BRDA:912,292,0,0 -BRDA:912,292,1,0 -BRDA:915,293,0,0 -BRDA:915,293,1,0 -BRDA:916,294,0,0 -BRDA:916,294,1,0 -BRDA:917,295,0,0 -BRDA:917,295,1,0 -BRDA:934,296,0,0 -BRDA:934,296,1,0 -BRDA:938,297,0,0 -BRDA:938,297,1,0 -BRDA:939,298,0,0 -BRDA:939,298,1,0 -BRDA:940,299,0,0 -BRDA:940,299,1,0 -BRDA:941,300,0,0 -BRDA:941,300,1,0 -BRDA:957,301,0,0 -BRDA:957,301,1,0 -BRDA:958,302,0,0 -BRDA:958,302,1,0 -BRDA:968,303,0,0 -BRDA:968,303,1,0 -BRDA:969,304,0,0 -BRDA:969,304,1,0 -BRDA:970,305,0,0 -BRDA:970,305,1,0 -BRDA:971,306,0,0 -BRDA:971,306,1,0 -BRDA:972,307,0,0 -BRDA:972,307,1,0 -BRDA:973,308,0,0 -BRDA:973,308,1,0 -BRDA:974,309,0,0 -BRDA:974,309,1,0 -BRDA:975,310,0,0 -BRDA:975,310,1,0 -BRDA:976,311,0,0 -BRDA:976,311,1,0 -BRDA:977,312,0,0 -BRDA:977,312,1,0 -BRDA:978,313,0,0 -BRDA:978,313,1,0 -BRDA:979,314,0,0 -BRDA:979,314,1,0 -BRDA:980,315,0,0 -BRDA:980,315,1,0 -BRDA:981,316,0,0 -BRDA:981,316,1,0 -BRDA:982,317,0,0 -BRDA:982,317,1,0 -BRDA:983,318,0,0 -BRDA:983,318,1,0 -BRDA:984,319,0,0 -BRDA:984,319,1,0 -BRDA:985,320,0,0 -BRDA:985,320,1,0 -BRDA:986,321,0,0 -BRDA:986,321,1,0 -BRDA:987,322,0,0 -BRDA:987,322,1,0 -BRDA:988,323,0,0 -BRDA:988,323,1,0 -BRDA:989,324,0,0 -BRDA:989,324,1,0 -BRDA:990,325,0,0 -BRDA:990,325,1,0 -BRDA:993,326,0,0 -BRDA:993,326,1,0 -BRDA:993,327,0,0 -BRDA:993,327,1,0 -BRDA:993,327,2,0 -BRDA:993,327,3,0 -BRDA:993,327,4,0 -BRDA:995,328,0,0 -BRDA:995,328,1,0 -BRDA:1008,329,0,0 -BRDA:1008,329,1,0 -BRDA:1008,330,0,0 -BRDA:1008,330,1,0 -BRDA:1016,331,0,0 -BRDA:1016,331,1,0 -BRDA:1017,332,0,0 -BRDA:1017,332,1,0 -BRDA:1018,333,0,0 -BRDA:1018,333,1,0 -BRDA:1028,334,0,0 -BRDA:1028,334,1,0 -BRDA:1031,335,0,0 -BRDA:1031,335,1,0 -BRDA:1036,336,0,0 -BRDA:1036,336,1,0 -BRDA:1040,337,0,0 -BRDA:1040,337,1,0 -BRDA:1046,338,0,0 -BRDA:1046,338,1,0 -BRDA:1047,339,0,0 -BRDA:1047,339,1,0 -BRDA:1054,340,0,0 -BRDA:1054,340,1,0 -BRDA:1074,341,0,0 -BRDA:1074,341,1,0 -BRDA:1074,342,0,0 -BRDA:1074,342,1,0 -BRDA:1083,343,0,0 -BRDA:1083,343,1,0 -BRDA:1086,344,0,0 -BRDA:1086,344,1,0 -BRDA:1091,345,0,0 -BRDA:1091,345,1,0 -BRDA:1095,346,0,0 -BRDA:1095,346,1,0 -BRDA:1101,347,0,0 -BRDA:1101,347,1,0 -BRDA:1102,348,0,0 -BRDA:1102,348,1,0 -BRDA:1109,349,0,0 -BRDA:1109,349,1,0 -BRDA:1127,350,0,0 -BRDA:1127,350,1,0 -BRDA:1132,351,0,0 -BRDA:1132,351,1,0 -BRDA:1142,352,0,0 -BRDA:1142,352,1,0 -BRDA:1144,353,0,0 -BRDA:1144,353,1,0 -BRDA:1149,354,0,0 -BRDA:1149,354,1,0 -BRDA:1152,355,0,0 -BRDA:1152,355,1,0 -BRDA:1180,356,0,0 -BRDA:1180,356,1,0 -BRDA:1184,357,0,0 -BRDA:1184,357,1,0 -BRDA:1189,358,0,0 -BRDA:1189,358,1,0 -BRDA:1192,359,0,0 -BRDA:1192,359,1,0 -BRDA:1193,360,0,0 -BRDA:1193,360,1,0 -BRDA:1199,361,0,0 -BRDA:1199,361,1,0 -BRDA:1203,362,0,0 -BRDA:1203,362,1,0 -BRDA:1204,363,0,0 -BRDA:1204,363,1,0 -BRDA:1205,364,0,0 -BRDA:1205,364,1,0 -BRDA:1223,365,0,0 -BRDA:1223,365,1,0 -BRDA:1228,366,0,0 -BRDA:1228,366,1,0 -BRDA:1236,367,0,0 -BRDA:1236,367,1,0 -BRDA:1237,368,0,0 -BRDA:1237,368,1,0 -BRDA:1248,369,0,0 -BRDA:1248,369,1,0 -BRDA:1253,370,0,0 -BRDA:1253,370,1,0 -BRDA:1263,371,0,0 -BRDA:1263,371,1,0 -BRDA:1265,372,0,0 -BRDA:1265,372,1,0 -BRDA:1270,373,0,0 -BRDA:1270,373,1,0 -BRDA:1273,374,0,0 -BRDA:1273,374,1,0 -BRDA:1301,375,0,0 -BRDA:1301,375,1,0 -BRDA:1305,376,0,0 -BRDA:1305,376,1,0 -BRDA:1310,377,0,0 -BRDA:1310,377,1,0 -BRDA:1313,378,0,0 -BRDA:1313,378,1,0 -BRDA:1314,379,0,0 -BRDA:1314,379,1,0 -BRDA:1320,380,0,0 -BRDA:1320,380,1,0 -BRDA:1324,381,0,0 -BRDA:1324,381,1,0 -BRDA:1325,382,0,0 -BRDA:1325,382,1,0 -BRDA:1326,383,0,0 -BRDA:1326,383,1,0 -BRDA:1345,384,0,0 -BRDA:1345,384,1,0 -BRDA:1350,385,0,0 -BRDA:1350,385,1,0 -BRDA:1358,386,0,0 -BRDA:1358,386,1,0 -BRDA:1359,387,0,0 -BRDA:1359,387,1,0 -BRDA:1371,388,0,0 -BRDA:1371,388,1,0 -BRDA:1372,389,0,0 -BRDA:1372,389,1,0 -BRDA:1374,390,0,0 -BRDA:1374,390,1,0 -BRDA:1378,391,0,0 -BRDA:1378,391,1,0 -BRDA:1392,392,0,0 -BRDA:1392,392,1,0 -BRDA:1406,393,0,0 -BRDA:1406,393,1,0 -BRDA:1406,394,0,0 -BRDA:1406,394,1,0 -BRDA:1415,395,0,0 -BRDA:1415,395,1,0 -BRDA:1418,396,0,0 -BRDA:1418,396,1,0 -BRDA:1432,397,0,0 -BRDA:1432,397,1,0 -BRDA:1436,398,0,0 -BRDA:1436,398,1,0 -BRDA:1443,399,0,0 -BRDA:1443,399,1,0 -BRDA:1444,400,0,0 -BRDA:1444,400,1,0 -BRDA:1445,401,0,0 -BRDA:1445,401,1,0 -BRDA:1451,402,0,0 -BRDA:1451,402,1,0 -BRDA:1451,403,0,0 -BRDA:1451,403,1,0 -BRDA:1454,404,0,0 -BRDA:1454,404,1,0 -BRDA:1459,405,0,0 -BRDA:1459,405,1,0 -BRDA:1466,406,0,0 -BRDA:1466,406,1,0 -BRDA:1469,407,0,0 -BRDA:1469,407,1,0 -BRDA:1472,408,0,0 -BRDA:1472,408,1,0 -BRDA:1475,409,0,0 -BRDA:1475,409,1,0 -BRDA:1478,410,0,0 -BRDA:1478,410,1,0 -BRDA:1481,411,0,0 -BRDA:1481,411,1,0 -BRDA:1491,412,0,0 -BRDA:1491,412,1,0 -BRDA:1494,413,0,0 -BRDA:1494,413,1,0 -BRDA:1497,414,0,0 -BRDA:1497,414,1,0 -BRDA:1500,415,0,0 -BRDA:1500,415,1,0 -BRDA:1503,416,0,0 -BRDA:1503,416,1,0 -BRDA:1506,417,0,0 -BRDA:1506,417,1,0 -BRDA:1516,418,0,0 -BRDA:1516,418,1,0 -BRDA:1534,419,0,0 -BRDA:1534,419,1,0 -BRDA:1541,420,0,0 -BRDA:1541,420,1,0 -BRDA:1561,421,0,0 -BRDA:1561,421,1,0 -BRDA:1561,422,0,0 -BRDA:1561,422,1,0 -BRDA:1568,423,0,0 -BRDA:1568,423,1,0 -BRDA:1569,424,0,0 -BRDA:1569,424,1,0 -BRDA:1570,425,0,0 -BRDA:1570,425,1,0 -BRDA:1570,426,0,0 -BRDA:1570,426,1,0 -BRDA:1582,427,0,0 -BRDA:1582,427,1,0 -BRDA:1587,428,0,0 -BRDA:1587,428,1,0 -BRDA:1591,429,0,0 -BRDA:1591,429,1,0 -BRDA:1610,430,0,0 -BRDA:1610,430,1,0 -BRDA:1613,431,0,0 -BRDA:1613,431,1,0 -BRDA:1613,432,0,0 -BRDA:1613,432,1,0 -BRDA:1614,433,0,0 -BRDA:1614,433,1,0 -BRDA:1614,434,0,0 -BRDA:1614,434,1,0 -BRDA:1622,435,0,0 -BRDA:1622,435,1,0 -BRDA:1622,436,0,0 -BRDA:1622,436,1,0 -BRDA:1625,437,0,0 -BRDA:1625,437,1,0 -BRDA:1630,438,0,0 -BRDA:1630,438,1,0 -BRDA:1651,439,0,0 -BRDA:1651,439,1,0 -BRDA:1651,440,0,0 -BRDA:1651,440,1,0 -BRDA:1658,441,0,0 -BRDA:1658,441,1,0 -BRDA:1662,442,0,0 -BRDA:1662,442,1,0 -BRDA:1669,443,0,0 -BRDA:1669,443,1,0 -BRDA:1670,444,0,0 -BRDA:1670,444,1,0 -BRDA:1671,445,0,0 -BRDA:1671,445,1,0 -BRDA:1677,446,0,0 -BRDA:1677,446,1,0 -BRDA:1677,447,0,0 -BRDA:1677,447,1,0 -BRDA:1680,448,0,0 -BRDA:1680,448,1,0 -BRDA:1685,449,0,0 -BRDA:1685,449,1,0 -BRDA:1692,450,0,0 -BRDA:1692,450,1,0 -BRDA:1695,451,0,0 -BRDA:1695,451,1,0 -BRDA:1698,452,0,0 -BRDA:1698,452,1,0 -BRDA:1701,453,0,0 -BRDA:1701,453,1,0 -BRDA:1704,454,0,0 -BRDA:1704,454,1,0 -BRDA:1707,455,0,0 -BRDA:1707,455,1,0 -BRDA:1717,456,0,0 -BRDA:1717,456,1,0 -BRDA:1735,457,0,0 -BRDA:1735,457,1,0 -BRDA:1742,458,0,0 -BRDA:1742,458,1,0 -BRDA:1762,459,0,0 -BRDA:1762,459,1,0 -BRDA:1762,460,0,0 -BRDA:1762,460,1,0 -BRDA:1769,461,0,0 -BRDA:1769,461,1,0 -BRDA:1771,462,0,0 -BRDA:1771,462,1,0 -BRDA:1771,463,0,0 -BRDA:1771,463,1,0 -BRDA:1783,464,0,0 -BRDA:1783,464,1,0 -BRDA:1788,465,0,0 -BRDA:1788,465,1,0 -BRDA:1792,466,0,0 -BRDA:1792,466,1,0 -BRDA:1812,467,0,0 -BRDA:1812,467,1,0 -BRDA:1815,468,0,0 -BRDA:1815,468,1,0 -BRDA:1815,469,0,0 -BRDA:1815,469,1,0 -BRDA:1818,470,0,0 -BRDA:1818,470,1,0 -BRDA:1823,471,0,0 -BRDA:1823,471,1,0 -BRDA:1844,472,0,0 -BRDA:1844,472,1,0 -BRDA:1844,473,0,0 -BRDA:1844,473,1,0 -BRDA:1846,474,0,0 -BRDA:1846,474,1,0 -BRDA:1846,475,0,0 -BRDA:1846,475,1,0 -BRDA:1865,476,0,0 -BRDA:1865,476,1,0 -BRDA:1865,477,0,0 -BRDA:1865,477,1,0 -BRDA:1871,478,0,0 -BRDA:1871,478,1,0 -BRDA:1874,479,0,0 -BRDA:1874,479,1,0 -BRDA:1877,480,0,0 -BRDA:1877,480,1,0 -BRDA:1883,481,0,0 -BRDA:1883,481,1,0 -BRDA:1883,482,0,0 -BRDA:1883,482,1,0 -BRDA:1883,482,2,0 -BRDA:1885,483,0,0 -BRDA:1885,483,1,0 -BRDA:1887,484,0,0 -BRDA:1887,484,1,0 -BRDA:1898,485,0,0 -BRDA:1898,485,1,0 -BRDA:1900,486,0,0 -BRDA:1900,486,1,0 -BRDA:1900,487,0,0 -BRDA:1900,487,1,0 -BRDA:1902,488,0,0 -BRDA:1902,488,1,0 -BRDA:1908,489,0,0 -BRDA:1908,489,1,0 -BRF:999 -BRH:0 +BRDA:764,246,0,0 +BRDA:764,246,1,0 +BRDA:764,247,0,0 +BRDA:764,247,1,0 +BRDA:765,248,0,0 +BRDA:765,248,1,0 +BRDA:766,249,0,0 +BRDA:766,249,1,0 +BRDA:766,250,0,0 +BRDA:766,250,1,0 +BRDA:767,251,0,0 +BRDA:767,251,1,0 +BRDA:767,252,0,0 +BRDA:767,252,1,0 +BRDA:769,253,0,0 +BRDA:769,253,1,0 +BRDA:770,254,0,0 +BRDA:770,254,1,0 +BRDA:773,255,0,0 +BRDA:773,255,1,0 +BRDA:774,256,0,0 +BRDA:774,256,1,0 +BRDA:779,257,0,0 +BRDA:779,257,1,0 +BRDA:780,258,0,0 +BRDA:780,258,1,0 +BRDA:783,259,0,0 +BRDA:783,259,1,0 +BRDA:784,260,0,0 +BRDA:784,260,1,0 +BRDA:790,261,0,0 +BRDA:790,261,1,0 +BRDA:791,262,0,0 +BRDA:791,262,1,0 +BRDA:792,263,0,0 +BRDA:792,263,1,0 +BRDA:795,264,0,0 +BRDA:795,264,1,0 +BRDA:796,265,0,0 +BRDA:796,265,1,0 +BRDA:799,266,0,0 +BRDA:799,266,1,0 +BRDA:800,267,0,0 +BRDA:800,267,1,0 +BRDA:805,268,0,0 +BRDA:805,268,1,0 +BRDA:806,269,0,0 +BRDA:806,269,1,0 +BRDA:811,270,0,0 +BRDA:811,270,1,0 +BRDA:813,271,0,0 +BRDA:813,271,1,0 +BRDA:814,272,0,0 +BRDA:814,272,1,0 +BRDA:817,273,0,0 +BRDA:817,273,1,0 +BRDA:818,274,0,0 +BRDA:818,274,1,0 +BRDA:821,275,0,0 +BRDA:821,275,1,0 +BRDA:822,276,0,0 +BRDA:822,276,1,0 +BRDA:827,277,0,0 +BRDA:827,277,1,0 +BRDA:828,278,0,0 +BRDA:828,278,1,0 +BRDA:833,279,0,0 +BRDA:833,279,1,0 +BRDA:835,280,0,0 +BRDA:835,280,1,0 +BRDA:836,281,0,0 +BRDA:836,281,1,0 +BRDA:839,282,0,0 +BRDA:839,282,1,0 +BRDA:840,283,0,0 +BRDA:840,283,1,0 +BRDA:843,284,0,0 +BRDA:843,284,1,0 +BRDA:844,285,0,0 +BRDA:844,285,1,0 +BRDA:849,286,0,0 +BRDA:849,286,1,0 +BRDA:850,287,0,0 +BRDA:850,287,1,0 +BRDA:855,288,0,0 +BRDA:855,288,1,0 +BRDA:857,289,0,0 +BRDA:857,289,1,0 +BRDA:858,290,0,0 +BRDA:858,290,1,0 +BRDA:861,291,0,0 +BRDA:861,291,1,0 +BRDA:862,292,0,0 +BRDA:862,292,1,0 +BRDA:878,293,0,0 +BRDA:878,293,1,0 +BRDA:887,294,0,0 +BRDA:887,294,1,0 +BRDA:887,295,0,0 +BRDA:887,295,1,0 +BRDA:898,296,0,0 +BRDA:898,296,1,0 +BRDA:898,297,0,0 +BRDA:898,297,1,0 +BRDA:902,298,0,0 +BRDA:902,298,1,0 +BRDA:908,299,0,0 +BRDA:908,299,1,0 +BRDA:911,300,0,0 +BRDA:911,300,1,0 +BRDA:914,301,0,0 +BRDA:914,301,1,0 +BRDA:917,302,0,0 +BRDA:917,302,1,0 +BRDA:918,303,0,0 +BRDA:918,303,1,0 +BRDA:923,304,0,0 +BRDA:923,304,1,0 +BRDA:926,305,0,0 +BRDA:926,305,1,0 +BRDA:927,306,0,0 +BRDA:927,306,1,0 +BRDA:928,307,0,0 +BRDA:928,307,1,0 +BRDA:945,308,0,0 +BRDA:945,308,1,0 +BRDA:949,309,0,0 +BRDA:949,309,1,0 +BRDA:950,310,0,0 +BRDA:950,310,1,0 +BRDA:951,311,0,0 +BRDA:951,311,1,0 +BRDA:952,312,0,0 +BRDA:952,312,1,0 +BRDA:968,313,0,0 +BRDA:968,313,1,0 +BRDA:969,314,0,0 +BRDA:969,314,1,0 +BRDA:979,315,0,0 +BRDA:979,315,1,0 +BRDA:980,316,0,0 +BRDA:980,316,1,0 +BRDA:981,317,0,0 +BRDA:981,317,1,0 +BRDA:982,318,0,0 +BRDA:982,318,1,0 +BRDA:983,319,0,0 +BRDA:983,319,1,0 +BRDA:984,320,0,0 +BRDA:984,320,1,0 +BRDA:985,321,0,0 +BRDA:985,321,1,0 +BRDA:986,322,0,0 +BRDA:986,322,1,0 +BRDA:987,323,0,0 +BRDA:987,323,1,0 +BRDA:988,324,0,0 +BRDA:988,324,1,0 +BRDA:989,325,0,0 +BRDA:989,325,1,0 +BRDA:990,326,0,0 +BRDA:990,326,1,0 +BRDA:991,327,0,0 +BRDA:991,327,1,0 +BRDA:992,328,0,0 +BRDA:992,328,1,0 +BRDA:993,329,0,0 +BRDA:993,329,1,0 +BRDA:994,330,0,0 +BRDA:994,330,1,0 +BRDA:995,331,0,0 +BRDA:995,331,1,0 +BRDA:996,332,0,0 +BRDA:996,332,1,0 +BRDA:997,333,0,0 +BRDA:997,333,1,0 +BRDA:998,334,0,0 +BRDA:998,334,1,0 +BRDA:999,335,0,0 +BRDA:999,335,1,0 +BRDA:1000,336,0,0 +BRDA:1000,336,1,0 +BRDA:1001,337,0,0 +BRDA:1001,337,1,0 +BRDA:1004,338,0,0 +BRDA:1004,338,1,0 +BRDA:1004,339,0,0 +BRDA:1004,339,1,0 +BRDA:1004,339,2,0 +BRDA:1004,339,3,0 +BRDA:1004,339,4,0 +BRDA:1006,340,0,0 +BRDA:1006,340,1,0 +BRDA:1019,341,0,0 +BRDA:1019,341,1,0 +BRDA:1019,342,0,0 +BRDA:1019,342,1,0 +BRDA:1027,343,0,0 +BRDA:1027,343,1,0 +BRDA:1028,344,0,0 +BRDA:1028,344,1,0 +BRDA:1029,345,0,0 +BRDA:1029,345,1,0 +BRDA:1039,346,0,0 +BRDA:1039,346,1,0 +BRDA:1042,347,0,0 +BRDA:1042,347,1,0 +BRDA:1047,348,0,0 +BRDA:1047,348,1,0 +BRDA:1047,349,0,0 +BRDA:1047,349,1,0 +BRDA:1051,350,0,0 +BRDA:1051,350,1,0 +BRDA:1057,351,0,0 +BRDA:1057,351,1,0 +BRDA:1058,352,0,0 +BRDA:1058,352,1,0 +BRDA:1065,353,0,0 +BRDA:1065,353,1,0 +BRDA:1085,354,0,0 +BRDA:1085,354,1,0 +BRDA:1085,355,0,0 +BRDA:1085,355,1,0 +BRDA:1094,356,0,0 +BRDA:1094,356,1,0 +BRDA:1097,357,0,0 +BRDA:1097,357,1,0 +BRDA:1102,358,0,0 +BRDA:1102,358,1,0 +BRDA:1102,359,0,0 +BRDA:1102,359,1,0 +BRDA:1106,360,0,0 +BRDA:1106,360,1,0 +BRDA:1112,361,0,0 +BRDA:1112,361,1,0 +BRDA:1113,362,0,0 +BRDA:1113,362,1,0 +BRDA:1120,363,0,0 +BRDA:1120,363,1,0 +BRDA:1138,364,0,0 +BRDA:1138,364,1,0 +BRDA:1143,365,0,0 +BRDA:1143,365,1,0 +BRDA:1153,366,0,0 +BRDA:1153,366,1,0 +BRDA:1155,367,0,0 +BRDA:1155,367,1,0 +BRDA:1160,368,0,0 +BRDA:1160,368,1,0 +BRDA:1163,369,0,0 +BRDA:1163,369,1,0 +BRDA:1191,370,0,0 +BRDA:1191,370,1,0 +BRDA:1191,371,0,0 +BRDA:1191,371,1,0 +BRDA:1195,372,0,0 +BRDA:1195,372,1,0 +BRDA:1200,373,0,0 +BRDA:1200,373,1,0 +BRDA:1203,374,0,0 +BRDA:1203,374,1,0 +BRDA:1204,375,0,0 +BRDA:1204,375,1,0 +BRDA:1210,376,0,0 +BRDA:1210,376,1,0 +BRDA:1214,377,0,0 +BRDA:1214,377,1,0 +BRDA:1215,378,0,0 +BRDA:1215,378,1,0 +BRDA:1216,379,0,0 +BRDA:1216,379,1,0 +BRDA:1234,380,0,0 +BRDA:1234,380,1,0 +BRDA:1239,381,0,0 +BRDA:1239,381,1,0 +BRDA:1247,382,0,0 +BRDA:1247,382,1,0 +BRDA:1248,383,0,0 +BRDA:1248,383,1,0 +BRDA:1259,384,0,0 +BRDA:1259,384,1,0 +BRDA:1264,385,0,0 +BRDA:1264,385,1,0 +BRDA:1274,386,0,0 +BRDA:1274,386,1,0 +BRDA:1276,387,0,0 +BRDA:1276,387,1,0 +BRDA:1281,388,0,0 +BRDA:1281,388,1,0 +BRDA:1284,389,0,0 +BRDA:1284,389,1,0 +BRDA:1312,390,0,0 +BRDA:1312,390,1,0 +BRDA:1312,391,0,0 +BRDA:1312,391,1,0 +BRDA:1316,392,0,0 +BRDA:1316,392,1,0 +BRDA:1321,393,0,0 +BRDA:1321,393,1,0 +BRDA:1324,394,0,0 +BRDA:1324,394,1,0 +BRDA:1325,395,0,0 +BRDA:1325,395,1,0 +BRDA:1331,396,0,0 +BRDA:1331,396,1,0 +BRDA:1335,397,0,0 +BRDA:1335,397,1,0 +BRDA:1336,398,0,0 +BRDA:1336,398,1,0 +BRDA:1337,399,0,0 +BRDA:1337,399,1,0 +BRDA:1356,400,0,0 +BRDA:1356,400,1,0 +BRDA:1361,401,0,0 +BRDA:1361,401,1,0 +BRDA:1369,402,0,0 +BRDA:1369,402,1,0 +BRDA:1370,403,0,0 +BRDA:1370,403,1,0 +BRDA:1382,404,0,0 +BRDA:1382,404,1,0 +BRDA:1383,405,0,0 +BRDA:1383,405,1,0 +BRDA:1385,406,0,0 +BRDA:1385,406,1,0 +BRDA:1389,407,0,0 +BRDA:1389,407,1,0 +BRDA:1403,408,0,0 +BRDA:1403,408,1,0 +BRDA:1417,409,0,0 +BRDA:1417,409,1,0 +BRDA:1417,410,0,0 +BRDA:1417,410,1,0 +BRDA:1426,411,0,0 +BRDA:1426,411,1,0 +BRDA:1429,412,0,0 +BRDA:1429,412,1,0 +BRDA:1443,413,0,0 +BRDA:1443,413,1,0 +BRDA:1443,414,0,0 +BRDA:1443,414,1,0 +BRDA:1447,415,0,0 +BRDA:1447,415,1,0 +BRDA:1454,416,0,0 +BRDA:1454,416,1,0 +BRDA:1455,417,0,0 +BRDA:1455,417,1,0 +BRDA:1456,418,0,0 +BRDA:1456,418,1,0 +BRDA:1462,419,0,0 +BRDA:1462,419,1,0 +BRDA:1462,420,0,0 +BRDA:1462,420,1,0 +BRDA:1465,421,0,0 +BRDA:1465,421,1,0 +BRDA:1470,422,0,0 +BRDA:1470,422,1,0 +BRDA:1477,423,0,0 +BRDA:1477,423,1,0 +BRDA:1480,424,0,0 +BRDA:1480,424,1,0 +BRDA:1483,425,0,0 +BRDA:1483,425,1,0 +BRDA:1486,426,0,0 +BRDA:1486,426,1,0 +BRDA:1489,427,0,0 +BRDA:1489,427,1,0 +BRDA:1492,428,0,0 +BRDA:1492,428,1,0 +BRDA:1502,429,0,0 +BRDA:1502,429,1,0 +BRDA:1505,430,0,0 +BRDA:1505,430,1,0 +BRDA:1508,431,0,0 +BRDA:1508,431,1,0 +BRDA:1511,432,0,0 +BRDA:1511,432,1,0 +BRDA:1514,433,0,0 +BRDA:1514,433,1,0 +BRDA:1517,434,0,0 +BRDA:1517,434,1,0 +BRDA:1527,435,0,0 +BRDA:1527,435,1,0 +BRDA:1545,436,0,0 +BRDA:1545,436,1,0 +BRDA:1552,437,0,0 +BRDA:1552,437,1,0 +BRDA:1572,438,0,0 +BRDA:1572,438,1,0 +BRDA:1572,439,0,0 +BRDA:1572,439,1,0 +BRDA:1579,440,0,0 +BRDA:1579,440,1,0 +BRDA:1580,441,0,0 +BRDA:1580,441,1,0 +BRDA:1581,442,0,0 +BRDA:1581,442,1,0 +BRDA:1581,443,0,0 +BRDA:1581,443,1,0 +BRDA:1593,444,0,0 +BRDA:1593,444,1,0 +BRDA:1598,445,0,0 +BRDA:1598,445,1,0 +BRDA:1598,446,0,0 +BRDA:1598,446,1,0 +BRDA:1602,447,0,0 +BRDA:1602,447,1,0 +BRDA:1621,448,0,0 +BRDA:1621,448,1,0 +BRDA:1624,449,0,0 +BRDA:1624,449,1,0 +BRDA:1624,450,0,0 +BRDA:1624,450,1,0 +BRDA:1625,451,0,0 +BRDA:1625,451,1,0 +BRDA:1625,452,0,0 +BRDA:1625,452,1,0 +BRDA:1633,453,0,0 +BRDA:1633,453,1,0 +BRDA:1633,454,0,0 +BRDA:1633,454,1,0 +BRDA:1636,455,0,0 +BRDA:1636,455,1,0 +BRDA:1641,456,0,0 +BRDA:1641,456,1,0 +BRDA:1662,457,0,0 +BRDA:1662,457,1,0 +BRDA:1662,458,0,0 +BRDA:1662,458,1,0 +BRDA:1669,459,0,0 +BRDA:1669,459,1,0 +BRDA:1669,460,0,0 +BRDA:1669,460,1,0 +BRDA:1673,461,0,0 +BRDA:1673,461,1,0 +BRDA:1680,462,0,0 +BRDA:1680,462,1,0 +BRDA:1681,463,0,0 +BRDA:1681,463,1,0 +BRDA:1682,464,0,0 +BRDA:1682,464,1,0 +BRDA:1688,465,0,0 +BRDA:1688,465,1,0 +BRDA:1688,466,0,0 +BRDA:1688,466,1,0 +BRDA:1691,467,0,0 +BRDA:1691,467,1,0 +BRDA:1696,468,0,0 +BRDA:1696,468,1,0 +BRDA:1703,469,0,0 +BRDA:1703,469,1,0 +BRDA:1706,470,0,0 +BRDA:1706,470,1,0 +BRDA:1709,471,0,0 +BRDA:1709,471,1,0 +BRDA:1712,472,0,0 +BRDA:1712,472,1,0 +BRDA:1715,473,0,0 +BRDA:1715,473,1,0 +BRDA:1718,474,0,0 +BRDA:1718,474,1,0 +BRDA:1728,475,0,0 +BRDA:1728,475,1,0 +BRDA:1746,476,0,0 +BRDA:1746,476,1,0 +BRDA:1753,477,0,0 +BRDA:1753,477,1,0 +BRDA:1773,478,0,0 +BRDA:1773,478,1,0 +BRDA:1773,479,0,0 +BRDA:1773,479,1,0 +BRDA:1780,480,0,0 +BRDA:1780,480,1,0 +BRDA:1782,481,0,0 +BRDA:1782,481,1,0 +BRDA:1782,482,0,0 +BRDA:1782,482,1,0 +BRDA:1794,483,0,0 +BRDA:1794,483,1,0 +BRDA:1799,484,0,0 +BRDA:1799,484,1,0 +BRDA:1799,485,0,0 +BRDA:1799,485,1,0 +BRDA:1803,486,0,0 +BRDA:1803,486,1,0 +BRDA:1823,487,0,0 +BRDA:1823,487,1,0 +BRDA:1826,488,0,0 +BRDA:1826,488,1,0 +BRDA:1826,489,0,0 +BRDA:1826,489,1,0 +BRDA:1829,490,0,0 +BRDA:1829,490,1,0 +BRDA:1834,491,0,0 +BRDA:1834,491,1,0 +BRDA:1855,492,0,0 +BRDA:1855,492,1,0 +BRDA:1855,493,0,0 +BRDA:1855,493,1,0 +BRDA:1857,494,0,0 +BRDA:1857,494,1,0 +BRDA:1857,495,0,0 +BRDA:1857,495,1,0 +BRDA:1876,496,0,0 +BRDA:1876,496,1,0 +BRDA:1876,497,0,0 +BRDA:1876,497,1,0 +BRDA:1882,498,0,0 +BRDA:1882,498,1,0 +BRDA:1885,499,0,0 +BRDA:1885,499,1,0 +BRDA:1888,500,0,0 +BRDA:1888,500,1,0 +BRDA:1894,501,0,0 +BRDA:1894,501,1,0 +BRDA:1894,502,0,0 +BRDA:1894,502,1,0 +BRDA:1894,502,2,0 +BRDA:1896,503,0,0 +BRDA:1896,503,1,0 +BRDA:1898,504,0,0 +BRDA:1898,504,1,0 +BRDA:1909,505,0,0 +BRDA:1909,505,1,0 +BRDA:1911,506,0,0 +BRDA:1911,506,1,0 +BRDA:1911,507,0,0 +BRDA:1911,507,1,0 +BRDA:1913,508,0,0 +BRDA:1913,508,1,0 +BRDA:1919,509,0,1 +BRDA:1919,509,1,0 +BRF:1039 +BRH:1 end_of_record TN: -SF:src\main\server\adapter\ceasn\ceasn.test.js -FN:9,(anonymous_0) -FN:23,(anonymous_1) -FN:26,(anonymous_2) -FN:40,(anonymous_3) -FN:44,(anonymous_4) -FN:55,(anonymous_5) -FNF:6 +SF:src\main\server\adapter\jsonLd\jsonLd.js +FN:4,importJsonLd +FNF:1 FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -DA:1,0 -DA:2,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:6,0 +FNDA:0,importJsonLd DA:7,0 +DA:8,0 DA:9,0 DA:10,0 DA:11,0 +DA:12,0 +DA:14,0 DA:15,0 DA:18,0 DA:19,0 -DA:20,0 -DA:23,0 -DA:24,0 -DA:26,0 +DA:21,0 +DA:22,0 +DA:25,0 DA:27,0 DA:28,0 +DA:30,0 DA:31,0 DA:32,0 DA:33,0 DA:34,0 -DA:35,0 DA:36,0 -DA:40,0 -DA:41,0 -DA:44,0 -DA:45,0 -DA:46,0 -DA:47,0 -DA:48,0 -DA:49,0 -DA:50,0 -DA:51,0 -DA:52,0 -DA:55,0 -DA:56,0 -DA:57,0 -DA:58,0 -DA:59,0 -DA:60,0 -DA:61,0 -DA:62,0 -DA:63,0 -LF:45 -LH:0 -BRF:0 -BRH:0 -end_of_record -TN: -SF:src\main\server\adapter\jsonLd\jsonLd.js -FN:4,importJsonLd -FNF:1 -FNH:0 -FNDA:0,importJsonLd -DA:7,0 -DA:8,0 -DA:9,0 -DA:10,0 -DA:11,0 -DA:12,0 -DA:14,0 -DA:15,0 -DA:18,0 -DA:19,0 -DA:21,0 -DA:22,0 -DA:25,0 -DA:27,0 -DA:28,0 -DA:30,0 -DA:31,0 -DA:32,0 -DA:33,0 -DA:34,0 -DA:36,0 -DA:37,0 -DA:39,0 +DA:37,0 +DA:39,0 DA:40,0 DA:41,0 DA:42,0 @@ -7819,10 +7761,10 @@ DA:80,0 DA:84,0 DA:85,0 DA:87,0 -DA:91,0 -DA:92,0 +DA:91,1 +DA:92,1 LF:53 -LH:0 +LH:2 BRDA:7,0,0,0 BRDA:7,0,1,0 BRDA:7,1,0,0 @@ -7859,10 +7801,10 @@ BRDA:84,16,0,0 BRDA:84,16,1,0 BRDA:84,17,0,0 BRDA:84,17,1,0 -BRDA:91,18,0,0 +BRDA:91,18,0,1 BRDA:91,18,1,0 BRF:38 -BRH:0 +BRH:1 end_of_record TN: SF:src\main\server\adapter\openbadges\openbadges.js @@ -7886,8 +7828,8 @@ FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) -DA:1,0 -DA:3,0 +DA:1,1 +DA:3,1 DA:4,0 DA:5,0 DA:7,0 @@ -7896,9 +7838,9 @@ DA:10,0 DA:11,0 DA:12,0 DA:13,0 -DA:16,0 +DA:16,1 DA:17,0 -DA:21,0 +DA:21,1 DA:22,0 DA:23,0 DA:24,0 @@ -7907,7 +7849,7 @@ DA:27,0 DA:28,0 DA:29,0 DA:31,0 -DA:34,0 +DA:34,1 DA:35,0 DA:36,0 DA:37,0 @@ -7915,7 +7857,7 @@ DA:38,0 DA:39,0 DA:40,0 DA:42,0 -DA:51,0 +DA:51,1 DA:52,0 DA:53,0 DA:54,0 @@ -7923,7 +7865,7 @@ DA:55,0 DA:56,0 DA:57,0 DA:59,0 -DA:76,0 +DA:76,1 DA:77,0 DA:78,0 DA:79,0 @@ -7948,7 +7890,7 @@ DA:110,0 DA:111,0 DA:112,0 DA:113,0 -DA:122,0 +DA:122,1 DA:123,0 DA:125,0 DA:126,0 @@ -7973,7 +7915,7 @@ DA:150,0 DA:151,0 DA:153,0 DA:154,0 -DA:167,0 +DA:167,1 DA:168,0 DA:170,0 DA:171,0 @@ -8008,7 +7950,7 @@ DA:204,0 DA:205,0 DA:206,0 DA:222,0 -DA:225,0 +DA:225,1 DA:226,0 DA:228,0 DA:229,0 @@ -8029,14 +7971,14 @@ DA:248,0 DA:250,0 DA:251,0 DA:253,0 -DA:260,0 -DA:261,0 -DA:262,0 -DA:263,0 -DA:264,0 -DA:265,0 +DA:260,1 +DA:261,1 +DA:262,1 +DA:263,1 +DA:264,1 +DA:265,1 LF:149 -LH:0 +LH:16 BRDA:4,0,0,0 BRDA:4,0,1,0 BRDA:4,1,0,0 @@ -8115,10 +8057,10 @@ BRDA:247,36,0,0 BRDA:247,36,1,0 BRDA:250,37,0,0 BRDA:250,37,1,0 -BRDA:260,38,0,0 +BRDA:260,38,0,1 BRDA:260,38,1,0 BRF:80 -BRH:0 +BRH:1 end_of_record TN: SF:src\main\server\adapter\replicate\replicate.js @@ -8140,25 +8082,25 @@ FNDA:0,connectWebsocket FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) FNDA:0,(anonymous_7) -DA:1,0 -DA:2,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:8,0 -DA:9,0 -DA:10,0 -DA:11,0 -DA:12,0 -DA:14,0 -DA:15,0 +DA:1,1 +DA:2,1 +DA:3,1 +DA:4,1 +DA:5,1 +DA:6,1 +DA:8,1 +DA:9,1 +DA:10,1 +DA:11,1 +DA:12,1 +DA:14,1 +DA:15,1 DA:16,0 DA:17,0 DA:18,0 DA:21,0 DA:22,0 -DA:25,0 +DA:25,1 DA:26,0 DA:27,0 DA:28,0 @@ -8196,7 +8138,7 @@ DA:83,0 DA:84,0 DA:85,0 DA:88,0 -DA:92,0 +DA:92,1 DA:94,0 DA:95,0 DA:97,0 @@ -8220,11 +8162,11 @@ DA:120,0 DA:121,0 DA:122,0 LF:79 -LH:0 -BRDA:3,0,0,0 -BRDA:3,0,1,0 -BRDA:4,1,0,0 -BRDA:4,1,1,0 +LH:15 +BRDA:3,0,0,1 +BRDA:3,0,1,1 +BRDA:4,1,0,1 +BRDA:4,1,1,1 BRDA:16,2,0,0 BRDA:16,2,1,0 BRDA:17,3,0,0 @@ -8249,7 +8191,7 @@ BRDA:77,10,1,0 BRDA:106,11,0,0 BRDA:106,11,1,0 BRF:27 -BRH:0 +BRH:4 end_of_record TN: SF:src\main\server\adapter\scd\scd.js @@ -8271,12 +8213,12 @@ FNDA:0,cassCompetencyAsScd FNDA:0,cassRelationAsScd FNDA:0,cassToScd FNDA:0,scdEndpoint -DA:1,0 -DA:7,0 -DA:8,0 -DA:16,0 -DA:17,0 -DA:23,0 +DA:1,1 +DA:7,1 +DA:8,1 +DA:16,1 +DA:17,1 +DA:23,1 DA:26,0 DA:27,0 DA:28,0 @@ -8377,9 +8319,9 @@ DA:173,0 DA:174,0 DA:176,0 DA:177,0 -DA:180,0 +DA:180,1 LF:107 -LH:0 +LH:7 BRDA:27,0,0,0 BRDA:27,0,1,0 BRDA:40,1,0,0 @@ -8460,21 +8402,25 @@ SF:src\main\server\adapter\xapi\xapi.js FN:4,(anonymous_0) FN:19,(anonymous_1) FN:41,(anonymous_2) -FN:54,(anonymous_3) -FN:83,(anonymous_4) -FN:97,(anonymous_5) -FN:111,(anonymous_6) -FN:153,(anonymous_7) -FN:155,(anonymous_8) -FN:176,(anonymous_9) -FN:178,(anonymous_10) -FN:206,(anonymous_11) -FN:208,(anonymous_12) -FN:214,(anonymous_13) -FN:233,(anonymous_14) -FN:238,(anonymous_15) -FN:252,(anonymous_16) -FNF:17 +FN:55,(anonymous_3) +FN:58,(anonymous_4) +FN:83,(anonymous_5) +FN:98,(anonymous_6) +FN:101,(anonymous_7) +FN:118,(anonymous_8) +FN:159,(anonymous_9) +FN:161,(anonymous_10) +FN:184,(anonymous_11) +FN:186,(anonymous_12) +FN:197,(anonymous_13) +FN:199,(anonymous_14) +FN:232,(anonymous_15) +FN:234,(anonymous_16) +FN:240,(anonymous_17) +FN:251,(anonymous_18) +FN:256,(anonymous_19) +FN:273,(anonymous_20) +FNF:21 FNH:0 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) @@ -8493,17 +8439,21 @@ FNDA:0,(anonymous_13) FNDA:0,(anonymous_14) FNDA:0,(anonymous_15) FNDA:0,(anonymous_16) -DA:1,0 -DA:2,0 -DA:4,0 +FNDA:0,(anonymous_17) +FNDA:0,(anonymous_18) +FNDA:0,(anonymous_19) +FNDA:0,(anonymous_20) +DA:1,1 +DA:2,1 +DA:4,1 DA:5,0 DA:6,0 DA:7,0 DA:8,0 DA:14,0 DA:15,0 -DA:17,0 -DA:19,0 +DA:17,1 +DA:19,1 DA:21,0 DA:22,0 DA:24,0 @@ -8517,7 +8467,7 @@ DA:32,0 DA:34,0 DA:36,0 DA:37,0 -DA:41,0 +DA:41,1 DA:42,0 DA:43,0 DA:44,0 @@ -8528,11 +8478,11 @@ DA:48,0 DA:49,0 DA:50,0 DA:51,0 -DA:54,0 -DA:55,0 +DA:54,1 +DA:55,1 DA:56,0 -DA:57,0 -DA:58,0 +DA:58,1 +DA:59,0 DA:60,0 DA:61,0 DA:62,0 @@ -8540,15 +8490,16 @@ DA:63,0 DA:64,0 DA:65,0 DA:66,0 -DA:71,0 +DA:67,0 +DA:68,0 DA:72,0 DA:73,0 DA:74,0 DA:75,0 DA:76,0 -DA:77,0 +DA:79,0 DA:80,0 -DA:83,0 +DA:83,1 DA:84,0 DA:85,0 DA:86,0 @@ -8560,61 +8511,63 @@ DA:91,0 DA:92,0 DA:93,0 DA:94,0 -DA:97,0 -DA:98,0 +DA:97,1 +DA:98,1 DA:99,0 -DA:100,0 +DA:101,1 DA:102,0 DA:103,0 DA:104,0 DA:105,0 DA:106,0 +DA:107,0 DA:108,0 +DA:109,0 +DA:110,0 DA:111,0 -DA:112,0 DA:113,0 DA:114,0 -DA:115,0 -DA:116,0 -DA:117,0 -DA:118,0 +DA:117,1 +DA:118,1 DA:119,0 DA:120,0 DA:121,0 DA:122,0 +DA:123,0 DA:124,0 DA:125,0 DA:126,0 DA:127,0 DA:128,0 DA:129,0 -DA:130,0 DA:131,0 DA:132,0 DA:133,0 DA:134,0 -DA:136,0 +DA:135,0 +DA:137,0 DA:138,0 +DA:139,0 DA:140,0 DA:141,0 +DA:142,0 DA:143,0 -DA:144,0 DA:145,0 -DA:146,0 DA:147,0 DA:148,0 DA:149,0 +DA:150,0 DA:151,0 DA:152,0 DA:153,0 DA:154,0 -DA:156,0 +DA:155,0 +DA:157,0 DA:158,0 +DA:159,0 DA:160,0 -DA:161,0 DA:162,0 DA:164,0 -DA:165,0 DA:166,0 DA:167,0 DA:168,0 @@ -8622,80 +8575,112 @@ DA:169,0 DA:170,0 DA:171,0 DA:172,0 +DA:173,0 DA:174,0 DA:175,0 DA:176,0 DA:177,0 +DA:178,0 DA:179,0 -DA:181,0 +DA:180,0 +DA:182,0 DA:183,0 +DA:184,0 DA:185,0 DA:187,0 -DA:188,0 -DA:189,0 -DA:190,0 -DA:191,0 DA:192,0 DA:193,0 -DA:194,0 DA:195,0 DA:196,0 DA:197,0 DA:198,0 -DA:199,0 DA:200,0 -DA:201,0 -DA:202,0 DA:203,0 -DA:204,0 DA:205,0 -DA:206,0 DA:207,0 DA:209,0 +DA:210,0 +DA:211,0 +DA:212,0 +DA:213,0 DA:214,0 DA:215,0 DA:216,0 +DA:217,0 +DA:218,0 +DA:219,0 +DA:220,0 +DA:221,0 +DA:222,0 +DA:223,0 +DA:224,0 +DA:225,0 +DA:226,0 +DA:227,0 +DA:228,0 DA:229,0 DA:230,0 -DA:231,0 DA:232,0 DA:233,0 -DA:234,0 -DA:238,0 -DA:239,0 -DA:240,0 +DA:235,0 +DA:240,1 DA:241,0 DA:242,0 +DA:243,0 DA:244,0 -DA:245,0 -DA:246,0 -DA:248,0 +DA:247,1 +DA:248,1 +DA:249,1 +DA:250,1 +DA:251,1 DA:252,0 -DA:253,0 -DA:254,0 -DA:255,0 -DA:256,0 +DA:256,1 DA:257,0 DA:258,0 DA:259,0 DA:260,0 DA:261,0 DA:262,0 +DA:264,0 DA:265,0 DA:266,0 -DA:267,0 -DA:269,0 -DA:270,0 -DA:272,0 -DA:273,0 +DA:268,0 +DA:272,1 +DA:273,1 +DA:274,0 +DA:275,0 +DA:276,0 +DA:277,0 DA:278,0 -DA:279,0 -DA:280,0 -DA:281,0 -DA:282,0 -DA:283,0 -LF:201 -LH:0 +DA:287,0 +DA:291,0 +DA:294,0 +DA:295,0 +DA:296,0 +DA:297,0 +DA:298,0 +DA:299,0 +DA:300,0 +DA:301,0 +DA:302,0 +DA:303,0 +DA:304,0 +DA:305,0 +DA:309,0 +DA:310,0 +DA:311,0 +DA:313,0 +DA:314,0 +DA:316,0 +DA:317,0 +DA:322,1 +DA:323,1 +DA:324,1 +DA:325,1 +DA:326,1 +DA:327,1 +LF:236 +LH:30 BRDA:5,0,0,0 BRDA:5,0,1,0 BRDA:7,1,0,0 @@ -8716,1687 +8701,250 @@ BRDA:47,8,0,0 BRDA:47,8,1,0 BRDA:49,9,0,0 BRDA:49,9,1,0 -BRDA:55,10,0,0 -BRDA:55,10,1,0 -BRDA:58,11,0,0 -BRDA:58,11,1,0 -BRDA:62,12,0,0 -BRDA:62,12,1,0 -BRDA:63,13,0,0 -BRDA:63,13,1,0 -BRDA:65,14,0,0 -BRDA:65,14,1,0 -BRDA:73,15,0,0 -BRDA:73,15,1,0 -BRDA:74,16,0,0 -BRDA:74,16,1,0 -BRDA:76,17,0,0 -BRDA:76,17,1,0 +BRDA:59,10,0,0 +BRDA:59,10,1,0 +BRDA:60,11,0,0 +BRDA:60,11,1,0 +BRDA:63,12,0,0 +BRDA:63,12,1,0 +BRDA:66,13,0,0 +BRDA:66,13,1,0 +BRDA:67,14,0,0 +BRDA:67,14,1,0 +BRDA:74,15,0,0 +BRDA:74,15,1,0 +BRDA:75,16,0,0 +BRDA:75,16,1,0 +BRDA:79,17,0,0 +BRDA:79,17,1,0 BRDA:85,18,0,0 BRDA:85,18,1,0 BRDA:88,19,0,0 BRDA:88,19,1,0 BRDA:92,20,0,0 BRDA:92,20,1,0 -BRDA:102,21,0,0 -BRDA:102,21,1,0 -BRDA:103,22,0,0 -BRDA:103,22,1,0 -BRDA:112,23,0,0 -BRDA:112,23,1,0 -BRDA:113,24,0,0 -BRDA:113,24,1,0 -BRDA:116,25,0,0 -BRDA:116,25,1,0 -BRDA:117,26,0,0 -BRDA:117,26,1,0 -BRDA:119,27,0,0 -BRDA:119,27,1,0 -BRDA:121,28,0,0 -BRDA:121,28,1,0 -BRDA:125,29,0,0 -BRDA:125,29,1,0 -BRDA:128,30,0,0 -BRDA:128,30,1,0 -BRDA:131,31,0,0 -BRDA:131,31,1,0 -BRDA:133,32,0,0 -BRDA:133,32,1,0 -BRDA:141,33,0,0 -BRDA:141,33,1,0 -BRDA:148,34,0,0 -BRDA:148,34,1,0 -BRDA:160,35,0,0 -BRDA:160,35,1,0 -BRDA:162,36,0,0 -BRDA:162,36,1,0 -BRDA:169,37,0,0 -BRDA:169,37,1,0 -BRDA:170,38,0,0 -BRDA:170,38,1,0 -BRDA:171,39,0,0 -BRDA:171,39,1,0 -BRDA:175,40,0,0 -BRDA:175,40,1,0 -BRDA:175,41,0,0 -BRDA:175,41,1,0 -BRDA:183,42,0,0 -BRDA:183,42,1,0 -BRDA:185,43,0,0 -BRDA:185,43,1,0 -BRDA:199,44,0,0 -BRDA:199,44,1,0 -BRDA:240,45,0,0 -BRDA:240,45,1,0 -BRDA:240,45,2,0 -BRDA:245,46,0,0 -BRDA:245,46,1,0 -BRDA:245,47,0,0 -BRDA:245,47,1,0 -BRDA:261,48,0,0 -BRDA:261,48,1,0 -BRDA:265,49,0,0 -BRDA:265,49,1,0 -BRDA:272,50,0,0 -BRDA:272,50,1,0 -BRDA:272,51,0,0 -BRDA:272,51,1,0 -BRDA:278,52,0,0 -BRDA:278,52,1,0 -BRF:107 -BRH:0 -end_of_record -TN: -SF:src\main\server\profile\calculator.js -FN:11,(anonymous_0) -FN:29,(anonymous_1) -FN:38,(anonymous_2) -FN:41,(anonymous_3) -FN:59,(anonymous_4) -FN:72,(anonymous_5) -FN:78,(anonymous_6) -FN:89,(anonymous_7) -FN:107,(anonymous_8) -FN:108,(anonymous_9) -FN:188,(anonymous_10) -FN:199,(anonymous_11) -FN:210,(anonymous_12) -FN:213,(anonymous_13) -FN:230,handleEdge -FN:300,(anonymous_15) -FN:304,(anonymous_16) -FN:306,(anonymous_17) -FN:318,(anonymous_18) -FN:365,(anonymous_19) -FN:414,(anonymous_20) -FNF:21 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) -FNDA:0,handleEdge -FNDA:0,(anonymous_15) -FNDA:0,(anonymous_16) -FNDA:0,(anonymous_17) -FNDA:0,(anonymous_18) -FNDA:0,(anonymous_19) -FNDA:0,(anonymous_20) -DA:3,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:9,0 -DA:11,0 -DA:15,0 -DA:18,0 -DA:20,0 -DA:23,0 -DA:24,0 -DA:25,0 -DA:27,0 -DA:28,0 -DA:29,0 -DA:30,0 -DA:31,0 -DA:33,0 -DA:34,0 -DA:37,0 -DA:38,0 -DA:40,0 -DA:42,0 -DA:43,0 -DA:44,0 -DA:45,0 -DA:46,0 -DA:47,0 -DA:48,0 -DA:49,0 -DA:50,0 -DA:51,0 -DA:52,0 -DA:53,0 -DA:54,0 -DA:55,0 -DA:60,0 -DA:61,0 -DA:62,0 -DA:67,0 -DA:68,0 -DA:73,0 -DA:74,0 -DA:79,0 -DA:80,0 -DA:81,0 -DA:82,0 -DA:83,0 -DA:86,0 -DA:89,0 -DA:92,0 -DA:94,0 -DA:95,0 -DA:97,0 -DA:98,0 -DA:101,0 -DA:104,0 -DA:106,0 -DA:107,0 -DA:108,0 -DA:109,0 -DA:111,0 -DA:113,0 -DA:114,0 -DA:115,0 -DA:119,0 -DA:120,0 -DA:121,0 -DA:123,0 -DA:124,0 -DA:126,0 -DA:127,0 -DA:128,0 -DA:129,0 -DA:130,0 -DA:132,0 -DA:133,0 -DA:134,0 -DA:135,0 -DA:136,0 -DA:137,0 -DA:139,0 -DA:140,0 -DA:141,0 -DA:142,0 -DA:144,0 -DA:146,0 -DA:149,0 -DA:153,0 -DA:154,0 -DA:157,0 -DA:160,0 -DA:161,0 -DA:165,0 -DA:167,0 -DA:169,0 -DA:170,0 -DA:171,0 -DA:172,0 -DA:173,0 -DA:174,0 -DA:175,0 -DA:176,0 -DA:177,0 -DA:178,0 -DA:179,0 -DA:180,0 -DA:182,0 -DA:184,0 -DA:194,0 -DA:196,0 -DA:198,0 -DA:199,0 -DA:204,0 -DA:210,0 -DA:212,0 -DA:215,0 -DA:216,0 -DA:217,0 -DA:220,0 -DA:222,0 -DA:224,0 -DA:225,0 -DA:231,0 -DA:232,0 -DA:235,0 -DA:237,0 -DA:238,0 -DA:241,0 -DA:242,0 -DA:243,0 -DA:244,0 -DA:246,0 -DA:247,0 -DA:249,0 -DA:250,0 -DA:251,0 -DA:253,0 -DA:254,0 -DA:258,0 -DA:259,0 -DA:261,0 -DA:262,0 -DA:264,0 -DA:265,0 -DA:269,0 -DA:272,0 -DA:280,0 -DA:281,0 -DA:282,0 -DA:284,0 -DA:285,0 -DA:287,0 -DA:289,0 -DA:290,0 -DA:291,0 -DA:292,0 -DA:295,0 -DA:301,0 -DA:303,0 -DA:304,0 -DA:307,0 -DA:310,0 -DA:313,0 -DA:319,0 -DA:320,0 -DA:321,0 -DA:322,0 -DA:323,0 -DA:327,0 -DA:328,0 -DA:329,0 -DA:337,0 -DA:338,0 -DA:339,0 -DA:343,0 -DA:344,0 -DA:347,0 -DA:348,0 -DA:349,0 -DA:352,0 -DA:353,0 -DA:354,0 -DA:358,0 -DA:361,0 -DA:362,0 -DA:365,0 -DA:366,0 -DA:367,0 -DA:368,0 -DA:369,0 -DA:370,0 -DA:371,0 -DA:372,0 -DA:374,0 -DA:375,0 -DA:377,0 -DA:378,0 -DA:381,0 -DA:382,0 -DA:384,0 -DA:388,0 -DA:389,0 -DA:392,0 -DA:393,0 -DA:394,0 -DA:397,0 -DA:398,0 -DA:399,0 -DA:401,0 -DA:404,0 -DA:405,0 -DA:406,0 -DA:407,0 -DA:409,0 -DA:414,0 -DA:415,0 -DA:416,0 -DA:417,0 -DA:418,0 -DA:419,0 -DA:420,0 -DA:421,0 -DA:422,0 -DA:423,0 -DA:424,0 -DA:425,0 -DA:426,0 -DA:427,0 -DA:428,0 -LF:230 -LH:0 -BRDA:20,0,0,0 -BRDA:20,0,1,0 -BRDA:31,1,0,0 -BRDA:31,1,1,0 -BRDA:62,2,0,0 -BRDA:62,2,1,0 -BRDA:74,3,0,0 -BRDA:74,3,1,0 -BRDA:79,4,0,0 -BRDA:79,4,1,0 -BRDA:82,5,0,0 -BRDA:82,5,1,0 -BRDA:113,6,0,0 -BRDA:113,6,1,0 -BRDA:119,7,0,0 -BRDA:119,7,1,0 -BRDA:120,8,0,0 -BRDA:120,8,1,0 -BRDA:126,9,0,0 -BRDA:126,9,1,0 -BRDA:126,10,0,0 -BRDA:126,10,1,0 -BRDA:132,11,0,0 -BRDA:132,11,1,0 -BRDA:135,12,0,0 -BRDA:135,12,1,0 -BRDA:135,13,0,0 -BRDA:135,13,1,0 -BRDA:141,14,0,0 -BRDA:141,14,1,0 -BRDA:169,15,0,0 -BRDA:169,15,1,0 -BRDA:169,16,0,0 -BRDA:169,16,1,0 -BRDA:171,17,0,0 -BRDA:171,17,1,0 -BRDA:192,18,0,0 -BRDA:196,19,0,0 -BRDA:196,19,1,0 -BRDA:216,20,0,0 -BRDA:216,20,1,0 -BRDA:222,21,0,0 -BRDA:222,21,1,0 -BRDA:222,22,0,0 -BRDA:222,22,1,0 -BRDA:232,23,0,0 -BRDA:232,23,1,0 -BRDA:242,24,0,0 -BRDA:242,24,1,0 -BRDA:249,25,0,0 -BRDA:249,25,1,0 -BRDA:258,26,0,0 -BRDA:258,26,1,0 -BRDA:259,27,0,0 -BRDA:259,27,1,0 -BRDA:262,28,0,0 -BRDA:262,28,1,0 -BRDA:265,29,0,0 -BRDA:265,29,1,0 -BRDA:266,30,0,0 -BRDA:266,30,1,0 -BRDA:266,30,2,0 -BRDA:284,31,0,0 -BRDA:284,31,1,0 -BRDA:366,32,0,0 -BRDA:366,32,1,0 -BRDA:371,33,0,0 -BRDA:371,33,1,0 -BRDA:374,34,0,0 -BRDA:374,34,1,0 -BRDA:377,35,0,0 -BRDA:377,35,1,0 -BRDA:381,36,0,0 -BRDA:381,36,1,0 -BRF:74 -BRH:0 -end_of_record -TN: -SF:src\main\server\profile\coordinator.js -FN:11,(anonymous_0) -FN:64,(anonymous_1) -FN:107,(anonymous_2) -FN:114,(anonymous_3) -FNF:4 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -DA:1,0 -DA:2,0 -DA:4,0 -DA:5,0 -DA:7,0 -DA:8,0 -DA:9,0 -DA:11,0 -DA:12,0 -DA:13,0 -DA:14,0 -DA:16,0 -DA:17,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:23,0 -DA:25,0 -DA:26,0 -DA:27,0 -DA:29,0 -DA:30,0 -DA:31,0 -DA:33,0 -DA:34,0 -DA:36,0 -DA:38,0 -DA:39,0 -DA:42,0 -DA:43,0 -DA:45,0 -DA:47,0 -DA:57,0 -DA:58,0 -DA:59,0 -DA:60,0 -DA:61,0 -DA:62,0 -DA:63,0 -DA:64,0 -DA:65,0 -DA:71,0 -DA:72,0 -DA:73,0 -DA:74,0 -DA:75,0 -DA:79,0 -DA:81,0 -DA:82,0 -DA:83,0 -DA:84,0 -DA:86,0 -DA:87,0 -DA:88,0 -DA:89,0 -DA:92,0 -DA:94,0 -DA:96,0 -DA:100,0 -DA:101,0 -DA:105,0 -DA:106,0 -DA:107,0 -DA:108,0 -DA:114,0 -DA:115,0 -DA:116,0 -LF:67 -LH:0 -BRDA:14,0,0,0 -BRDA:14,0,1,0 -BRDA:14,1,0,0 -BRDA:14,1,1,0 -BRDA:20,2,0,0 -BRDA:20,2,1,0 -BRDA:22,3,0,0 -BRDA:22,3,1,0 -BRDA:26,4,0,0 -BRDA:26,4,1,0 -BRDA:31,5,0,0 -BRDA:31,5,1,0 -BRDA:31,6,0,0 -BRDA:31,6,1,0 -BRDA:36,7,0,0 -BRDA:36,7,1,0 -BRDA:42,8,0,0 -BRDA:42,8,1,0 -BRDA:58,9,0,0 -BRDA:58,9,1,0 -BRDA:60,10,0,0 -BRDA:60,10,1,0 -BRDA:61,11,0,0 -BRDA:61,11,1,0 -BRDA:62,12,0,0 -BRDA:62,12,1,0 -BRDA:72,13,0,0 -BRDA:72,13,1,0 -BRDA:72,14,0,0 -BRDA:72,14,1,0 -BRDA:72,14,2,0 -BRDA:72,14,3,0 -BRDA:84,15,0,0 -BRDA:84,15,1,0 -BRDA:86,16,0,0 -BRDA:86,16,1,0 -BRDA:86,17,0,0 -BRDA:86,17,1,0 -BRDA:94,18,0,0 -BRDA:94,18,1,0 -BRDA:100,19,0,0 -BRDA:100,19,1,0 -BRF:42 -BRH:0 -end_of_record -TN: -SF:src\main\server\profile\util.js -FN:4,(anonymous_0) -FN:9,(anonymous_1) -FN:12,(anonymous_2) -FN:15,(anonymous_3) -FN:24,(anonymous_4) -FN:54,(anonymous_5) -FN:57,(anonymous_6) -FNF:7 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -DA:1,0 -DA:4,0 -DA:5,0 -DA:6,0 -DA:9,0 -DA:10,0 -DA:11,0 -DA:12,0 -DA:14,0 -DA:16,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:23,0 -DA:24,0 -DA:26,0 -DA:29,0 -DA:30,0 -DA:33,0 -DA:34,0 -DA:36,0 -DA:37,0 -DA:39,0 -DA:40,0 -DA:43,0 -DA:44,0 -DA:45,0 -DA:48,0 -DA:49,0 -DA:51,0 -DA:53,0 -DA:54,0 -DA:55,0 -DA:56,0 -DA:57,0 -DA:58,0 -DA:59,0 -DA:62,0 -DA:63,0 -DA:64,0 -DA:65,0 -DA:67,0 -DA:68,0 -DA:72,0 -DA:73,0 -DA:74,0 -DA:77,0 -DA:78,0 -DA:81,0 -DA:82,0 -DA:84,0 -DA:85,0 -DA:86,0 -DA:88,0 -DA:89,0 -DA:90,0 -DA:93,0 -DA:96,0 -DA:97,0 -DA:98,0 -DA:99,0 -DA:101,0 -DA:104,0 -DA:105,0 -DA:107,0 -LF:65 -LH:0 -BRDA:5,0,0,0 -BRDA:5,0,1,0 -BRDA:5,1,0,0 -BRDA:5,1,1,0 -BRDA:10,2,0,0 -BRDA:10,2,1,0 -BRDA:11,3,0,0 -BRDA:11,3,1,0 -BRDA:26,4,0,0 -BRDA:26,4,1,0 -BRDA:29,5,0,0 -BRDA:29,5,1,0 -BRDA:33,6,0,0 -BRDA:33,6,1,0 -BRDA:33,7,0,0 -BRDA:33,7,1,0 -BRDA:39,8,0,0 -BRDA:39,8,1,0 -BRDA:43,9,0,0 -BRDA:43,9,1,0 -BRDA:44,10,0,0 -BRDA:44,10,1,0 -BRDA:49,11,0,0 -BRDA:49,11,1,0 -BRDA:49,12,0,0 -BRDA:49,12,1,0 -BRDA:55,13,0,0 -BRDA:55,13,1,0 -BRDA:58,14,0,0 -BRDA:58,14,1,0 -BRDA:59,15,0,0 -BRDA:59,15,1,0 -BRDA:63,16,0,0 -BRDA:63,16,1,0 -BRDA:64,17,0,0 -BRDA:64,17,1,0 -BRDA:67,18,0,0 -BRDA:67,18,1,0 -BRDA:72,19,0,0 -BRDA:72,19,1,0 -BRDA:73,20,0,0 -BRDA:73,20,1,0 -BRDA:78,21,0,0 -BRDA:78,21,1,0 -BRDA:84,22,0,0 -BRDA:84,22,1,0 -BRDA:88,23,0,0 -BRDA:88,23,1,0 -BRDA:88,24,0,0 -BRDA:88,24,1,0 -BRDA:89,25,0,0 -BRDA:89,25,1,0 -BRDA:96,26,0,0 -BRDA:96,26,1,0 -BRDA:97,27,0,0 -BRDA:97,27,1,0 -BRDA:97,28,0,0 -BRDA:97,28,1,0 -BRDA:98,29,0,0 -BRDA:98,29,1,0 -BRDA:104,30,0,0 -BRDA:104,30,1,0 -BRF:62 -BRH:0 -end_of_record -TN: -SF:src\main\server\profile\worker.js -FN:87,(anonymous_0) -FN:169,(anonymous_1) -FN:173,(anonymous_2) -FNF:3 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -DA:40,0 -DA:43,0 -DA:45,0 -DA:49,0 -DA:50,0 -DA:52,0 -DA:54,0 -DA:56,0 -DA:57,0 -DA:58,0 -DA:60,0 -DA:62,0 -DA:64,0 -DA:65,0 -DA:66,0 -DA:68,0 -DA:69,0 -DA:70,0 -DA:73,0 -DA:75,0 -DA:77,0 -DA:78,0 -DA:79,0 -DA:81,0 -DA:83,0 -DA:85,0 -DA:87,0 -DA:88,0 -DA:89,0 -DA:90,0 -DA:92,0 -DA:93,0 -DA:94,0 -DA:95,0 -DA:96,0 -DA:97,0 -DA:99,0 -DA:100,0 -DA:101,0 -DA:103,0 -DA:105,0 -DA:106,0 -DA:107,0 -DA:108,0 -DA:110,0 -DA:112,0 -DA:113,0 -DA:116,0 -DA:117,0 -DA:118,0 -DA:119,0 -DA:121,0 -DA:123,0 -DA:124,0 -DA:125,0 -DA:126,0 -DA:127,0 -DA:128,0 -DA:129,0 -DA:130,0 -DA:135,0 -DA:136,0 -DA:137,0 -DA:138,0 -DA:139,0 -DA:144,0 -DA:145,0 -DA:146,0 -DA:147,0 -DA:148,0 -DA:149,0 -DA:152,0 -DA:153,0 -DA:155,0 -DA:157,0 -DA:158,0 -DA:161,0 -DA:162,0 -DA:165,0 -DA:166,0 -DA:167,0 -DA:168,0 -DA:169,0 -DA:171,0 -DA:172,0 -DA:173,0 -DA:175,0 -DA:177,0 -DA:178,0 -DA:182,0 -DA:183,0 -DA:184,0 -DA:186,0 -DA:187,0 -DA:190,0 -DA:191,0 -DA:194,0 -DA:196,0 -DA:197,0 -DA:198,0 -LF:100 -LH:0 -BRDA:49,0,0,0 -BRDA:49,0,1,0 -BRDA:54,1,0,0 -BRDA:54,1,1,0 -BRDA:57,2,0,0 -BRDA:57,2,1,0 -BRDA:57,3,0,0 -BRDA:57,3,1,0 -BRDA:58,4,0,0 -BRDA:58,4,1,0 -BRDA:62,5,0,0 -BRDA:62,5,1,0 -BRDA:93,6,0,0 -BRDA:93,6,1,0 -BRDA:94,7,0,0 -BRDA:94,7,1,0 -BRDA:97,8,0,0 -BRDA:97,8,1,0 -BRDA:103,9,0,0 -BRDA:103,9,1,0 -BRDA:110,10,0,0 -BRDA:110,10,1,0 -BRDA:123,11,0,0 -BRDA:123,11,1,0 -BRDA:125,12,0,0 -BRDA:125,12,1,0 -BRDA:127,13,0,0 -BRDA:127,13,1,0 -BRDA:135,14,0,0 -BRDA:135,14,1,0 -BRDA:137,15,0,0 -BRDA:137,15,1,0 -BRDA:144,16,0,0 -BRDA:144,16,1,0 -BRDA:155,17,0,0 -BRDA:155,17,1,0 -BRDA:168,18,0,0 -BRDA:168,18,1,0 -BRDA:172,19,0,0 -BRDA:172,19,1,0 -BRF:40 -BRH:0 -end_of_record -TN: -SF:src\main\server\profile\coprocessors\default.js -FN:6,(anonymous_0) -FN:13,(anonymous_1) -FN:15,(anonymous_2) -FN:22,(anonymous_3) -FN:24,(anonymous_4) -FN:37,(anonymous_5) -FN:82,(anonymous_6) -FN:104,(anonymous_7) -FN:153,(anonymous_8) -FN:160,(anonymous_9) -FN:162,(anonymous_10) -FN:213,(anonymous_11) -FN:257,(anonymous_12) -FN:310,(anonymous_13) -FN:336,(anonymous_14) -FN:396,(anonymous_15) -FN:401,(anonymous_16) -FN:456,(anonymous_17) -FNF:18 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) -FNDA:0,(anonymous_14) -FNDA:0,(anonymous_15) -FNDA:0,(anonymous_16) -FNDA:0,(anonymous_17) -DA:1,0 -DA:2,0 -DA:3,0 -DA:6,0 -DA:7,0 -DA:14,0 -DA:15,0 -DA:16,0 -DA:17,0 -DA:18,0 -DA:19,0 -DA:20,0 -DA:22,0 -DA:23,0 -DA:24,0 -DA:25,0 -DA:27,0 -DA:28,0 -DA:29,0 -DA:30,0 -DA:31,0 -DA:37,0 -DA:39,0 -DA:40,0 -DA:41,0 -DA:42,0 -DA:43,0 -DA:44,0 -DA:45,0 -DA:46,0 -DA:47,0 -DA:49,0 -DA:50,0 -DA:51,0 -DA:52,0 -DA:53,0 -DA:59,0 -DA:62,0 -DA:63,0 -DA:65,0 -DA:66,0 -DA:67,0 -DA:70,0 -DA:71,0 -DA:72,0 -DA:74,0 -DA:75,0 -DA:78,0 -DA:82,0 -DA:83,0 -DA:85,0 -DA:86,0 -DA:89,0 -DA:91,0 -DA:92,0 -DA:93,0 -DA:94,0 -DA:96,0 -DA:97,0 -DA:103,0 -DA:105,0 -DA:109,0 -DA:114,0 -DA:116,0 -DA:117,0 -DA:119,0 -DA:122,0 -DA:123,0 -DA:124,0 -DA:127,0 -DA:132,0 -DA:141,0 -DA:144,0 -DA:145,0 -DA:146,0 -DA:153,0 -DA:154,0 -DA:155,0 -DA:156,0 -DA:160,0 -DA:162,0 -DA:163,0 -DA:164,0 -DA:165,0 -DA:166,0 -DA:167,0 -DA:168,0 -DA:169,0 -DA:171,0 -DA:172,0 -DA:173,0 -DA:175,0 -DA:176,0 -DA:177,0 -DA:178,0 -DA:180,0 -DA:197,0 -DA:199,0 -DA:200,0 -DA:201,0 -DA:202,0 -DA:203,0 -DA:210,0 -DA:211,0 -DA:212,0 -DA:213,0 -DA:214,0 -DA:215,0 -DA:217,0 -DA:218,0 -DA:219,0 -DA:221,0 -DA:222,0 -DA:226,0 -DA:227,0 -DA:231,0 -DA:232,0 -DA:233,0 -DA:237,0 -DA:254,0 -DA:255,0 -DA:257,0 -DA:258,0 -DA:259,0 -DA:260,0 -DA:261,0 -DA:262,0 -DA:263,0 -DA:264,0 -DA:265,0 -DA:267,0 -DA:269,0 -DA:270,0 -DA:273,0 -DA:276,0 -DA:277,0 -DA:278,0 -DA:279,0 -DA:281,0 -DA:282,0 -DA:283,0 -DA:284,0 -DA:287,0 -DA:288,0 -DA:291,0 -DA:295,0 -DA:296,0 -DA:297,0 -DA:298,0 -DA:300,0 -DA:301,0 -DA:302,0 -DA:303,0 -DA:304,0 -DA:305,0 -DA:310,0 -DA:312,0 -DA:313,0 -DA:314,0 -DA:315,0 -DA:317,0 -DA:318,0 -DA:319,0 -DA:322,0 -DA:323,0 -DA:324,0 -DA:325,0 -DA:329,0 -DA:330,0 -DA:331,0 -DA:332,0 -DA:336,0 -DA:337,0 -DA:339,0 -DA:340,0 -DA:341,0 -DA:342,0 -DA:343,0 -DA:344,0 -DA:346,0 -DA:352,0 -DA:354,0 -DA:358,0 -DA:360,0 -DA:363,0 -DA:365,0 -DA:368,0 -DA:372,0 -DA:373,0 -DA:374,0 -DA:375,0 -DA:376,0 -DA:377,0 -DA:381,0 -DA:382,0 -DA:383,0 -DA:384,0 -DA:385,0 -DA:386,0 -DA:387,0 -DA:388,0 -DA:389,0 -DA:390,0 -DA:391,0 -DA:392,0 -DA:396,0 -DA:397,0 -DA:398,0 -DA:399,0 -DA:401,0 -DA:402,0 -DA:403,0 -DA:404,0 -DA:405,0 -DA:406,0 -DA:408,0 -DA:416,0 -DA:417,0 -DA:418,0 -DA:419,0 -DA:420,0 -DA:421,0 -DA:424,0 -DA:425,0 -DA:428,0 -DA:429,0 -DA:434,0 -DA:435,0 -DA:436,0 -DA:439,0 -DA:440,0 -DA:444,0 -DA:445,0 -DA:447,0 -DA:449,0 -DA:454,0 -DA:456,0 -DA:457,0 -DA:458,0 -DA:459,0 -DA:461,0 -DA:462,0 -DA:463,0 -DA:464,0 -DA:468,0 -LF:245 -LH:0 -BRDA:17,0,0,0 -BRDA:17,0,1,0 -BRDA:18,1,0,0 -BRDA:18,1,1,0 -BRDA:44,2,0,0 -BRDA:44,2,1,0 -BRDA:51,3,0,0 -BRDA:51,3,1,0 -BRDA:62,4,0,0 -BRDA:62,4,1,0 -BRDA:71,5,0,0 -BRDA:71,5,1,0 -BRDA:74,6,0,0 -BRDA:74,6,1,0 -BRDA:91,7,0,0 -BRDA:91,7,1,0 -BRDA:93,8,0,0 -BRDA:93,8,1,0 -BRDA:109,9,0,0 -BRDA:109,9,1,0 -BRDA:109,10,0,0 -BRDA:109,10,1,0 -BRDA:109,10,2,0 -BRDA:122,11,0,0 -BRDA:122,11,1,0 -BRDA:134,12,0,0 -BRDA:134,12,1,0 -BRDA:141,13,0,0 -BRDA:141,13,1,0 -BRDA:144,14,0,0 -BRDA:144,14,1,0 -BRDA:155,15,0,0 -BRDA:155,15,1,0 -BRDA:163,16,0,0 -BRDA:163,16,1,0 -BRDA:165,17,0,0 -BRDA:165,17,1,0 -BRDA:176,18,0,0 -BRDA:176,18,1,0 -BRDA:197,19,0,0 -BRDA:197,19,1,0 -BRDA:199,20,0,0 -BRDA:199,20,1,0 -BRDA:201,21,0,0 -BRDA:201,21,1,0 -BRDA:212,22,0,0 -BRDA:212,22,1,0 -BRDA:217,23,0,0 -BRDA:217,23,1,0 -BRDA:231,24,0,0 -BRDA:231,24,1,0 -BRDA:263,25,0,0 -BRDA:263,25,1,0 -BRDA:263,26,0,0 -BRDA:263,26,1,0 -BRDA:267,27,0,0 -BRDA:267,27,1,0 -BRDA:276,28,0,0 -BRDA:276,28,1,0 -BRDA:278,29,0,0 -BRDA:278,29,1,0 -BRDA:281,30,0,0 -BRDA:281,30,1,0 -BRDA:283,31,0,0 -BRDA:283,31,1,0 -BRDA:287,32,0,0 -BRDA:287,32,1,0 -BRDA:287,33,0,0 -BRDA:287,33,1,0 -BRDA:287,33,2,0 -BRDA:287,33,3,0 -BRDA:295,34,0,0 -BRDA:295,34,1,0 -BRDA:298,35,0,0 -BRDA:298,35,1,0 -BRDA:300,36,0,0 -BRDA:300,36,1,0 -BRDA:302,37,0,0 -BRDA:302,37,1,0 -BRDA:314,38,0,0 -BRDA:314,38,1,0 -BRDA:314,39,0,0 -BRDA:314,39,1,0 -BRDA:317,40,0,0 -BRDA:317,40,1,0 -BRDA:322,41,0,0 -BRDA:322,41,1,0 -BRDA:324,42,0,0 -BRDA:324,42,1,0 -BRDA:329,43,0,0 -BRDA:329,43,1,0 -BRDA:331,44,0,0 -BRDA:331,44,1,0 -BRDA:339,45,0,0 -BRDA:339,45,1,0 -BRDA:342,46,0,0 -BRDA:342,46,1,0 -BRDA:346,47,0,0 -BRDA:346,47,1,0 -BRDA:347,48,0,0 -BRDA:347,48,1,0 -BRDA:347,48,2,0 -BRDA:354,49,0,0 -BRDA:354,49,1,0 -BRDA:355,50,0,0 -BRDA:355,50,1,0 -BRDA:360,51,0,0 -BRDA:360,51,1,0 -BRDA:361,52,0,0 -BRDA:361,52,1,0 -BRDA:365,53,0,0 -BRDA:365,53,1,0 -BRDA:366,54,0,0 -BRDA:366,54,1,0 -BRDA:372,55,0,0 -BRDA:372,55,1,0 -BRDA:375,56,0,0 -BRDA:375,56,1,0 -BRDA:381,57,0,0 -BRDA:381,57,1,0 -BRDA:383,58,0,0 -BRDA:383,58,1,0 -BRDA:385,59,0,0 -BRDA:385,59,1,0 -BRDA:387,60,0,0 -BRDA:387,60,1,0 -BRDA:389,61,0,0 -BRDA:389,61,1,0 -BRDA:391,62,0,0 -BRDA:391,62,1,0 -BRDA:402,63,0,0 -BRDA:402,63,1,0 -BRDA:404,64,0,0 -BRDA:404,64,1,0 -BRDA:404,65,0,0 -BRDA:404,65,1,0 -BRDA:413,66,0,0 -BRDA:413,66,1,0 -BRDA:416,67,0,0 -BRDA:416,67,1,0 -BRDA:416,68,0,0 -BRDA:416,68,1,0 -BRDA:418,69,0,0 -BRDA:418,69,1,0 -BRDA:420,70,0,0 -BRDA:420,70,1,0 -BRDA:434,71,0,0 -BRDA:434,71,1,0 -BRDA:457,72,0,0 -BRDA:457,72,1,0 -BRDA:458,73,0,0 -BRDA:458,73,1,0 -BRDA:458,74,0,0 -BRDA:458,74,1,0 -BRDA:458,74,2,0 -BRDA:461,75,0,0 -BRDA:461,75,1,0 -BRDA:462,76,0,0 -BRDA:462,76,1,0 -BRDA:462,77,0,0 -BRDA:462,77,1,0 -BRDA:462,77,2,0 -BRF:162 -BRH:0 -end_of_record -TN: -SF:src\main\server\profile\coprocessors\explainer.js -FN:2,(anonymous_0) -FN:10,(anonymous_1) -FN:12,(anonymous_2) -FN:19,(anonymous_3) -FN:32,(anonymous_4) -FN:79,(anonymous_5) -FN:102,(anonymous_6) -FN:151,(anonymous_7) -FN:158,(anonymous_8) -FN:161,(anonymous_9) -FN:181,(anonymous_10) -FN:217,(anonymous_11) -FN:229,(anonymous_12) -FN:253,(anonymous_13) -FN:258,(anonymous_14) -FN:293,(anonymous_15) -FNF:16 -FNH:0 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) -FNDA:0,(anonymous_14) -FNDA:0,(anonymous_15) -DA:2,0 -DA:3,0 -DA:4,0 -DA:11,0 -DA:12,0 -DA:13,0 -DA:14,0 -DA:15,0 -DA:16,0 -DA:18,0 -DA:19,0 -DA:20,0 -DA:22,0 -DA:23,0 -DA:24,0 -DA:25,0 -DA:26,0 -DA:32,0 -DA:34,0 -DA:35,0 -DA:37,0 -DA:38,0 -DA:39,0 -DA:40,0 -DA:41,0 -DA:42,0 -DA:43,0 -DA:44,0 -DA:46,0 -DA:47,0 -DA:48,0 -DA:49,0 -DA:50,0 -DA:56,0 -DA:59,0 -DA:60,0 -DA:62,0 -DA:63,0 -DA:64,0 -DA:67,0 -DA:68,0 -DA:69,0 -DA:71,0 -DA:72,0 -DA:75,0 -DA:79,0 -DA:80,0 -DA:82,0 -DA:83,0 -DA:84,0 -DA:87,0 -DA:89,0 -DA:90,0 -DA:91,0 -DA:92,0 -DA:94,0 -DA:95,0 -DA:101,0 -DA:103,0 -DA:107,0 -DA:112,0 -DA:114,0 -DA:115,0 -DA:117,0 -DA:120,0 -DA:121,0 -DA:122,0 -DA:125,0 -DA:130,0 -DA:139,0 -DA:142,0 -DA:143,0 -DA:144,0 -DA:151,0 -DA:152,0 -DA:153,0 -DA:154,0 -DA:158,0 -DA:159,0 -DA:161,0 -DA:162,0 -DA:163,0 -DA:164,0 -DA:165,0 -DA:166,0 -DA:167,0 -DA:168,0 -DA:170,0 -DA:172,0 -DA:173,0 -DA:174,0 -DA:176,0 -DA:179,0 -DA:181,0 -DA:182,0 -DA:183,0 -DA:184,0 -DA:185,0 -DA:186,0 -DA:187,0 -DA:188,0 -DA:189,0 -DA:191,0 -DA:192,0 -DA:194,0 -DA:195,0 -DA:198,0 -DA:201,0 -DA:204,0 -DA:205,0 -DA:206,0 -DA:207,0 -DA:209,0 -DA:210,0 -DA:211,0 -DA:212,0 -DA:213,0 -DA:214,0 -DA:217,0 -DA:218,0 -DA:219,0 -DA:220,0 -DA:221,0 -DA:223,0 -DA:224,0 -DA:225,0 -DA:226,0 -DA:229,0 -DA:230,0 -DA:231,0 -DA:233,0 -DA:234,0 -DA:235,0 -DA:236,0 -DA:237,0 -DA:238,0 -DA:239,0 -DA:243,0 -DA:244,0 -DA:245,0 -DA:246,0 -DA:247,0 -DA:248,0 -DA:249,0 -DA:253,0 -DA:254,0 -DA:255,0 -DA:256,0 -DA:258,0 -DA:259,0 -DA:260,0 -DA:261,0 -DA:262,0 -DA:263,0 -DA:265,0 -DA:267,0 -DA:270,0 -DA:271,0 -DA:274,0 -DA:275,0 -DA:280,0 -DA:281,0 -DA:282,0 -DA:285,0 -DA:286,0 -DA:290,0 -DA:291,0 -DA:293,0 -DA:294,0 -DA:298,0 -LF:170 -LH:0 -BRDA:14,0,0,0 -BRDA:14,0,1,0 -BRDA:41,1,0,0 -BRDA:41,1,1,0 -BRDA:48,2,0,0 -BRDA:48,2,1,0 -BRDA:59,3,0,0 -BRDA:59,3,1,0 -BRDA:68,4,0,0 -BRDA:68,4,1,0 -BRDA:71,5,0,0 -BRDA:71,5,1,0 -BRDA:89,6,0,0 -BRDA:89,6,1,0 -BRDA:91,7,0,0 -BRDA:91,7,1,0 -BRDA:107,8,0,0 -BRDA:107,8,1,0 -BRDA:109,9,0,0 -BRDA:109,9,1,0 -BRDA:120,10,0,0 -BRDA:120,10,1,0 -BRDA:132,11,0,0 -BRDA:132,11,1,0 -BRDA:139,12,0,0 -BRDA:139,12,1,0 -BRDA:142,13,0,0 -BRDA:142,13,1,0 -BRDA:153,14,0,0 -BRDA:153,14,1,0 -BRDA:162,15,0,0 -BRDA:162,15,1,0 -BRDA:164,16,0,0 -BRDA:164,16,1,0 -BRDA:187,17,0,0 -BRDA:187,17,1,0 -BRDA:187,18,0,0 -BRDA:187,18,1,0 -BRDA:192,19,0,0 -BRDA:192,19,1,0 -BRDA:204,20,0,0 -BRDA:204,20,1,0 -BRDA:207,21,0,0 -BRDA:207,21,1,0 -BRDA:209,22,0,0 -BRDA:209,22,1,0 -BRDA:211,23,0,0 -BRDA:211,23,1,0 -BRDA:220,24,0,0 -BRDA:220,24,1,0 -BRDA:220,25,0,0 -BRDA:220,25,1,0 -BRDA:224,26,0,0 -BRDA:224,26,1,0 -BRDA:233,27,0,0 -BRDA:233,27,1,0 -BRDA:236,28,0,0 -BRDA:236,28,1,0 -BRDA:243,29,0,0 -BRDA:243,29,1,0 -BRDA:246,30,0,0 -BRDA:246,30,1,0 -BRDA:259,31,0,0 -BRDA:259,31,1,0 -BRDA:261,32,0,0 -BRDA:261,32,1,0 -BRDA:261,33,0,0 -BRDA:261,33,1,0 -BRDA:280,34,0,0 -BRDA:280,34,1,0 -BRF:70 -BRH:0 +BRDA:103,21,0,0 +BRDA:103,21,1,0 +BRDA:107,22,0,0 +BRDA:107,22,1,0 +BRDA:108,23,0,0 +BRDA:108,23,1,0 +BRDA:119,24,0,0 +BRDA:119,24,1,0 +BRDA:120,25,0,0 +BRDA:120,25,1,0 +BRDA:123,26,0,0 +BRDA:123,26,1,0 +BRDA:124,27,0,0 +BRDA:124,27,1,0 +BRDA:126,28,0,0 +BRDA:126,28,1,0 +BRDA:128,29,0,0 +BRDA:128,29,1,0 +BRDA:132,30,0,0 +BRDA:132,30,1,0 +BRDA:134,31,0,0 +BRDA:134,31,1,0 +BRDA:138,32,0,0 +BRDA:138,32,1,0 +BRDA:141,33,0,0 +BRDA:141,33,1,0 +BRDA:148,34,0,0 +BRDA:148,34,1,0 +BRDA:154,35,0,0 +BRDA:154,35,1,0 +BRDA:166,36,0,0 +BRDA:166,36,1,0 +BRDA:168,37,0,0 +BRDA:168,37,1,0 +BRDA:174,38,0,0 +BRDA:174,38,1,0 +BRDA:175,39,0,0 +BRDA:175,39,1,0 +BRDA:177,40,0,0 +BRDA:177,40,1,0 +BRDA:179,41,0,0 +BRDA:179,41,1,0 +BRDA:183,42,0,0 +BRDA:183,42,1,0 +BRDA:183,43,0,0 +BRDA:183,43,1,0 +BRDA:192,44,0,0 +BRDA:192,44,1,0 +BRDA:196,45,0,0 +BRDA:196,45,1,0 +BRDA:196,46,0,0 +BRDA:196,46,1,0 +BRDA:205,47,0,0 +BRDA:205,47,1,0 +BRDA:207,48,0,0 +BRDA:207,48,1,0 +BRDA:222,49,0,0 +BRDA:222,49,1,0 +BRDA:229,50,0,0 +BRDA:229,50,1,0 +BRDA:260,51,0,0 +BRDA:260,51,1,0 +BRDA:260,51,2,0 +BRDA:265,52,0,0 +BRDA:265,52,1,0 +BRDA:265,53,0,0 +BRDA:265,53,1,0 +BRDA:275,54,0,0 +BRDA:275,54,1,0 +BRDA:282,55,0,0 +BRDA:282,55,1,0 +BRDA:302,56,0,0 +BRDA:302,56,1,0 +BRDA:304,57,0,0 +BRDA:304,57,1,0 +BRDA:309,58,0,0 +BRDA:309,58,1,0 +BRDA:316,59,0,0 +BRDA:316,59,1,0 +BRDA:316,60,0,0 +BRDA:316,60,1,0 +BRDA:322,61,0,1 +BRDA:322,61,1,0 +BRF:125 +BRH:1 end_of_record TN: -SF:src\main\server\profile\coprocessors\template.js -FN:2,(anonymous_0) -FN:5,(anonymous_1) -FN:8,(anonymous_2) -FN:11,(anonymous_3) -FN:14,(anonymous_4) -FN:17,(anonymous_5) -FN:20,(anonymous_6) -FN:23,(anonymous_7) -FN:26,(anonymous_8) -FN:29,(anonymous_9) -FN:40,(anonymous_10) -FNF:11 -FNH:0 +SF:src\main\server\profile\coordinator.js +FN:11,(anonymous_0) +FN:64,(anonymous_1) +FN:107,(anonymous_2) +FN:114,(anonymous_3) +FNF:4 +FNH:1 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) +FNDA:1,(anonymous_2) FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -DA:2,0 -DA:3,0 -DA:5,0 -DA:6,0 -DA:8,0 -DA:9,0 -DA:11,0 +DA:1,1 +DA:2,1 +DA:4,1 +DA:5,1 +DA:7,1 +DA:8,1 +DA:9,1 +DA:11,1 DA:12,0 +DA:13,0 DA:14,0 -DA:15,0 +DA:16,0 DA:17,0 -DA:18,0 DA:20,0 DA:21,0 +DA:22,0 DA:23,0 -DA:24,0 +DA:25,0 DA:26,0 DA:27,0 DA:29,0 DA:30,0 -DA:32,0 +DA:31,0 DA:33,0 -DA:37,0 +DA:34,0 +DA:36,0 DA:38,0 -DA:40,0 -DA:41,0 -DA:44,0 -LF:27 -LH:0 -BRF:0 -BRH:0 +DA:39,0 +DA:42,0 +DA:43,0 +DA:45,0 +DA:47,0 +DA:57,0 +DA:58,0 +DA:59,0 +DA:60,0 +DA:61,0 +DA:62,0 +DA:63,0 +DA:64,0 +DA:65,0 +DA:71,0 +DA:72,0 +DA:73,0 +DA:74,0 +DA:75,0 +DA:79,0 +DA:81,0 +DA:82,0 +DA:83,0 +DA:84,0 +DA:86,0 +DA:87,0 +DA:88,0 +DA:89,0 +DA:92,0 +DA:94,0 +DA:96,0 +DA:100,1 +DA:101,1 +DA:105,1 +DA:106,1 +DA:107,1 +DA:108,1 +DA:114,1 +DA:115,0 +DA:116,0 +LF:67 +LH:15 +BRDA:14,0,0,0 +BRDA:14,0,1,0 +BRDA:14,1,0,0 +BRDA:14,1,1,0 +BRDA:20,2,0,0 +BRDA:20,2,1,0 +BRDA:22,3,0,0 +BRDA:22,3,1,0 +BRDA:26,4,0,0 +BRDA:26,4,1,0 +BRDA:31,5,0,0 +BRDA:31,5,1,0 +BRDA:31,6,0,0 +BRDA:31,6,1,0 +BRDA:36,7,0,0 +BRDA:36,7,1,0 +BRDA:42,8,0,0 +BRDA:42,8,1,0 +BRDA:58,9,0,0 +BRDA:58,9,1,0 +BRDA:60,10,0,0 +BRDA:60,10,1,0 +BRDA:61,11,0,0 +BRDA:61,11,1,0 +BRDA:62,12,0,0 +BRDA:62,12,1,0 +BRDA:72,13,0,0 +BRDA:72,13,1,0 +BRDA:72,14,0,0 +BRDA:72,14,1,0 +BRDA:72,14,2,0 +BRDA:72,14,3,0 +BRDA:84,15,0,0 +BRDA:84,15,1,0 +BRDA:86,16,0,0 +BRDA:86,16,1,0 +BRDA:86,17,0,0 +BRDA:86,17,1,0 +BRDA:94,18,0,0 +BRDA:94,18,1,0 +BRDA:100,19,0,1 +BRDA:100,19,1,0 +BRF:42 +BRH:1 end_of_record TN: -SF:src\main\server\profile\coprocessors\timeBounding.js -FN:2,(anonymous_0) -FN:15,(anonymous_1) -FN:17,(anonymous_2) -FN:62,(anonymous_3) -FN:64,(anonymous_4) -FN:66,(anonymous_5) -FN:68,(anonymous_6) -FN:70,(anonymous_7) -FN:72,(anonymous_8) -FN:74,(anonymous_9) -FN:77,(anonymous_10) -FNF:11 +SF:src\main\server\profile\util.js +FN:4,(anonymous_0) +FN:9,(anonymous_1) +FN:12,(anonymous_2) +FN:15,(anonymous_3) +FN:24,(anonymous_4) +FN:54,(anonymous_5) +FN:57,(anonymous_6) +FNF:7 FNH:0 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) @@ -10405,103 +8953,136 @@ FNDA:0,(anonymous_3) FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -DA:2,0 -DA:3,0 -DA:4,0 +DA:1,1 +DA:4,1 DA:5,0 DA:6,0 -DA:7,0 -DA:8,0 DA:9,0 DA:10,0 DA:11,0 DA:12,0 -DA:13,0 -DA:15,0 -DA:17,0 -DA:18,0 -DA:19,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:23,0 -DA:24,0 -DA:25,0 +DA:14,0 +DA:16,0 +DA:20,1 +DA:21,1 +DA:22,1 +DA:23,1 +DA:24,1 DA:26,0 -DA:27,0 -DA:28,0 DA:29,0 DA:30,0 -DA:31,0 DA:33,0 DA:34,0 DA:36,0 DA:37,0 DA:39,0 -DA:41,0 -DA:42,0 +DA:40,0 +DA:43,0 +DA:44,0 DA:45,0 -DA:46,0 DA:48,0 DA:49,0 DA:51,0 -DA:52,0 +DA:53,0 DA:54,0 +DA:55,0 DA:56,0 DA:57,0 +DA:58,0 +DA:59,0 DA:62,0 +DA:63,0 DA:64,0 -DA:66,0 +DA:65,0 +DA:67,0 DA:68,0 -DA:70,0 DA:72,0 +DA:73,0 DA:74,0 -DA:75,0 DA:77,0 -DA:80,0 -LF:54 -LH:0 -BRDA:6,0,0,0 -BRDA:6,0,1,0 -BRDA:8,1,0,0 -BRDA:8,1,1,0 +DA:78,0 +DA:81,0 +DA:82,0 +DA:84,0 +DA:85,0 +DA:86,0 +DA:88,0 +DA:89,0 +DA:90,0 +DA:93,0 +DA:96,0 +DA:97,0 +DA:98,0 +DA:99,0 +DA:101,0 +DA:104,0 +DA:105,0 +DA:107,1 +LF:65 +LH:8 +BRDA:5,0,0,0 +BRDA:5,0,1,0 +BRDA:5,1,0,0 +BRDA:5,1,1,0 BRDA:10,2,0,0 BRDA:10,2,1,0 -BRDA:10,3,0,0 -BRDA:10,3,1,0 -BRDA:21,4,0,0 -BRDA:21,4,1,0 -BRDA:23,5,0,0 -BRDA:23,5,1,0 -BRDA:25,6,0,0 -BRDA:25,6,1,0 -BRDA:25,7,0,0 -BRDA:25,7,1,0 -BRDA:30,8,0,0 -BRDA:30,8,1,0 -BRDA:34,9,0,0 -BRDA:34,9,1,0 -BRDA:34,10,0,0 -BRDA:34,10,1,0 -BRDA:39,11,0,0 -BRDA:39,11,1,0 -BRDA:39,12,0,0 -BRDA:39,12,1,0 -BRDA:45,13,0,0 -BRDA:45,13,1,0 -BRDA:49,14,0,0 -BRDA:49,14,1,0 -BRDA:49,15,0,0 -BRDA:49,15,1,0 -BRDA:54,16,0,0 -BRDA:54,16,1,0 -BRDA:54,17,0,0 -BRDA:54,17,1,0 -BRF:36 +BRDA:11,3,0,0 +BRDA:11,3,1,0 +BRDA:26,4,0,0 +BRDA:26,4,1,0 +BRDA:29,5,0,0 +BRDA:29,5,1,0 +BRDA:33,6,0,0 +BRDA:33,6,1,0 +BRDA:33,7,0,0 +BRDA:33,7,1,0 +BRDA:39,8,0,0 +BRDA:39,8,1,0 +BRDA:43,9,0,0 +BRDA:43,9,1,0 +BRDA:44,10,0,0 +BRDA:44,10,1,0 +BRDA:49,11,0,0 +BRDA:49,11,1,0 +BRDA:49,12,0,0 +BRDA:49,12,1,0 +BRDA:55,13,0,0 +BRDA:55,13,1,0 +BRDA:58,14,0,0 +BRDA:58,14,1,0 +BRDA:59,15,0,0 +BRDA:59,15,1,0 +BRDA:63,16,0,0 +BRDA:63,16,1,0 +BRDA:64,17,0,0 +BRDA:64,17,1,0 +BRDA:67,18,0,0 +BRDA:67,18,1,0 +BRDA:72,19,0,0 +BRDA:72,19,1,0 +BRDA:73,20,0,0 +BRDA:73,20,1,0 +BRDA:78,21,0,0 +BRDA:78,21,1,0 +BRDA:84,22,0,0 +BRDA:84,22,1,0 +BRDA:88,23,0,0 +BRDA:88,23,1,0 +BRDA:88,24,0,0 +BRDA:88,24,1,0 +BRDA:89,25,0,0 +BRDA:89,25,1,0 +BRDA:96,26,0,0 +BRDA:96,26,1,0 +BRDA:97,27,0,0 +BRDA:97,27,1,0 +BRDA:97,28,0,0 +BRDA:97,28,1,0 +BRDA:98,29,0,0 +BRDA:98,29,1,0 +BRDA:104,30,0,0 +BRDA:104,30,1,0 +BRF:62 BRH:0 end_of_record TN: @@ -10512,11 +9093,11 @@ FN:85,(anonymous_2) FN:94,(anonymous_3) FN:162,(anonymous_4) FNF:5 -FNH:0 -FNDA:0,(anonymous_0) +FNH:2 +FNDA:2,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) +FNDA:55,(anonymous_3) FNDA:0,(anonymous_4) DA:1,1 DA:3,1 @@ -10527,8 +9108,8 @@ DA:46,1 DA:58,1 DA:60,1 DA:63,1 -DA:64,0 -DA:65,0 +DA:64,2 +DA:65,2 DA:66,0 DA:67,0 DA:68,0 @@ -10544,7 +9125,7 @@ DA:85,1 DA:87,0 DA:88,0 DA:94,1 -DA:95,0 +DA:95,55 DA:96,0 DA:97,0 DA:98,0 @@ -10554,12 +9135,12 @@ DA:102,0 DA:104,0 DA:105,0 DA:109,0 -DA:112,0 -DA:113,0 -DA:115,0 -DA:116,0 -DA:117,0 -DA:118,0 +DA:112,55 +DA:113,49 +DA:115,55 +DA:116,49 +DA:117,49 +DA:118,49 DA:120,0 DA:126,1 DA:127,1 @@ -10592,27 +9173,27 @@ DA:170,0 DA:172,0 DA:175,1 LF:73 -LH:20 +LH:29 BRDA:65,0,0,0 -BRDA:65,0,1,0 +BRDA:65,0,1,2 BRDA:68,1,0,0 BRDA:68,1,1,0 BRDA:95,2,0,0 -BRDA:95,2,1,0 +BRDA:95,2,1,55 BRDA:97,3,0,0 BRDA:97,3,1,0 BRDA:101,4,0,0 BRDA:101,4,1,0 BRDA:104,5,0,0 BRDA:104,5,1,0 -BRDA:112,6,0,0 -BRDA:112,6,1,0 -BRDA:115,7,0,0 -BRDA:115,7,1,0 -BRDA:115,8,0,0 -BRDA:115,8,1,0 +BRDA:112,6,0,49 +BRDA:112,6,1,6 +BRDA:115,7,0,49 +BRDA:115,7,1,6 +BRDA:115,8,0,55 +BRDA:115,8,1,6 BRDA:117,9,0,0 -BRDA:117,9,1,0 +BRDA:117,9,1,49 BRDA:129,10,0,0 BRDA:129,10,1,1 BRDA:140,11,0,0 @@ -10626,7 +9207,7 @@ BRDA:166,14,1,0 BRDA:169,15,0,0 BRDA:169,15,1,0 BRF:32 -BRH:3 +BRH:12 end_of_record TN: SF:src\main\server\shims\auth.js @@ -10656,10 +9237,10 @@ FN:544,(anonymous_22) FN:546,(anonymous_23) FN:551,(anonymous_24) FNF:25 -FNH:0 +FNH:1 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) -FNDA:0,interpretAdminCSV +FNDA:1,interpretAdminCSV FNDA:0,(anonymous_3) FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) @@ -10684,23 +9265,23 @@ FNDA:0,(anonymous_23) FNDA:0,(anonymous_24) DA:1,1 DA:2,1 -DA:4,0 -DA:6,0 -DA:7,0 -DA:8,0 +DA:4,1 +DA:6,1 +DA:7,1 +DA:8,1 DA:9,0 DA:10,0 DA:11,0 -DA:13,0 +DA:13,1 DA:14,0 DA:15,0 DA:17,0 -DA:21,0 -DA:22,0 +DA:21,1 +DA:22,1 DA:24,0 -DA:28,0 -DA:29,0 -DA:31,0 +DA:28,1 +DA:29,1 +DA:31,1 DA:32,0 DA:34,0 DA:36,0 @@ -10771,7 +9352,7 @@ DA:114,0 DA:115,0 DA:117,0 DA:118,0 -DA:121,0 +DA:121,1 DA:123,0 DA:125,0 DA:127,0 @@ -10780,10 +9361,10 @@ DA:141,0 DA:142,0 DA:149,0 DA:150,0 -DA:156,0 +DA:156,1 DA:158,0 DA:159,0 -DA:168,0 +DA:168,1 DA:176,0 DA:177,0 DA:179,0 @@ -10854,7 +9435,7 @@ DA:309,0 DA:310,0 DA:313,0 DA:316,0 -DA:320,0 +DA:320,1 DA:321,0 DA:322,0 DA:323,0 @@ -10942,8 +9523,8 @@ DA:437,0 DA:439,0 DA:440,0 DA:442,0 -DA:444,0 -DA:446,0 +DA:444,1 +DA:446,1 DA:448,0 DA:449,0 DA:450,0 @@ -10994,9 +9575,9 @@ DA:505,0 DA:509,0 DA:510,0 DA:514,0 -DA:518,0 -DA:544,0 -DA:546,0 +DA:518,1 +DA:544,1 +DA:546,1 DA:547,0 DA:550,0 DA:551,0 @@ -11011,14 +9592,14 @@ DA:563,0 DA:566,0 DA:569,0 LF:328 -LH:2 +LH:21 BRDA:9,0,0,0 BRDA:9,0,1,0 BRDA:14,1,0,0 BRDA:14,1,1,0 -BRDA:21,2,0,0 +BRDA:21,2,0,1 BRDA:21,2,1,0 -BRDA:21,3,0,0 +BRDA:21,3,0,1 BRDA:21,3,1,0 BRDA:21,3,2,0 BRDA:32,4,0,0 @@ -11050,9 +9631,9 @@ BRDA:102,16,1,0 BRDA:105,17,0,0 BRDA:105,17,1,0 BRDA:121,18,0,0 -BRDA:121,18,1,0 -BRDA:121,19,0,0 -BRDA:121,19,1,0 +BRDA:121,18,1,1 +BRDA:121,19,0,1 +BRDA:121,19,1,1 BRDA:123,20,0,0 BRDA:123,20,1,0 BRDA:130,21,0,0 @@ -11068,13 +9649,13 @@ BRDA:143,25,1,0 BRDA:151,26,0,0 BRDA:151,26,1,0 BRDA:156,27,0,0 -BRDA:156,27,1,0 +BRDA:156,27,1,1 BRDA:161,28,0,0 BRDA:161,28,1,0 BRDA:162,29,0,0 BRDA:162,29,1,0 BRDA:168,30,0,0 -BRDA:168,30,1,0 +BRDA:168,30,1,1 BRDA:176,31,0,0 BRDA:176,31,1,0 BRDA:176,32,0,0 @@ -11171,9 +9752,9 @@ BRDA:415,76,1,0 BRDA:415,77,0,0 BRDA:415,77,1,0 BRDA:446,78,0,0 -BRDA:446,78,1,0 -BRDA:446,79,0,0 -BRDA:446,79,1,0 +BRDA:446,78,1,1 +BRDA:446,79,0,1 +BRDA:446,79,1,1 BRDA:450,80,0,0 BRDA:450,80,1,0 BRDA:454,81,0,0 @@ -11318,7 +9899,7 @@ BRDA:557,146,2,0 BRDA:562,147,0,0 BRDA:562,147,1,0 BRF:305 -BRH:0 +BRH:10 end_of_record TN: SF:src\main\server\shims\cassproject.js @@ -11390,49 +9971,49 @@ FNDA:0,(anonymous_29) FNDA:0,(anonymous_30) FNDA:0,(anonymous_31) FNDA:0,(anonymous_32) -DA:1,0 +DA:1,1 DA:2,0 DA:4,0 DA:6,0 DA:7,0 -DA:13,0 +DA:13,1 DA:14,0 DA:16,0 DA:19,0 DA:20,0 -DA:26,0 +DA:26,1 DA:27,0 DA:29,0 DA:31,0 DA:32,0 -DA:38,0 +DA:38,1 DA:39,0 DA:41,0 DA:43,0 DA:44,0 -DA:50,0 +DA:50,1 DA:51,0 DA:53,0 DA:57,0 DA:58,0 -DA:63,0 +DA:63,1 DA:64,0 DA:66,0 DA:68,0 DA:69,0 -DA:76,0 +DA:76,1 DA:77,0 DA:79,0 DA:81,0 DA:82,0 -DA:89,0 +DA:89,1 DA:90,0 DA:92,0 DA:94,0 DA:95,0 -DA:101,0 +DA:101,1 LF:41 -LH:0 +LH:9 BRF:0 BRH:0 end_of_record @@ -11507,12 +10088,12 @@ FN:654,(anonymous_42) FN:662,(anonymous_43) FN:668,(anonymous_44) FNF:45 -FNH:0 -FNDA:0,(anonymous_0) +FNH:6 +FNDA:8,(anonymous_0) FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) +FNDA:8,(anonymous_2) FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) +FNDA:43,(anonymous_4) FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) FNDA:0,(anonymous_7) @@ -11532,9 +10113,9 @@ FNDA:0,(anonymous_20) FNDA:0,(anonymous_21) FNDA:0,(anonymous_22) FNDA:0,(anonymous_23) -FNDA:0,(anonymous_24) +FNDA:2,(anonymous_24) FNDA:0,(anonymous_25) -FNDA:0,(anonymous_26) +FNDA:4,(anonymous_26) FNDA:0,(anonymous_27) FNDA:0,(anonymous_28) FNDA:0,(anonymous_29) @@ -11552,33 +10133,33 @@ FNDA:0,(anonymous_40) FNDA:0,(anonymous_41) FNDA:0,(anonymous_42) FNDA:0,(anonymous_43) -FNDA:0,(anonymous_44) -DA:1,0 -DA:2,0 -DA:3,0 -DA:4,0 -DA:5,0 -DA:8,0 -DA:9,0 -DA:10,0 -DA:14,0 -DA:15,0 +FNDA:445,(anonymous_44) +DA:1,1 +DA:2,1 +DA:3,1 +DA:4,1 +DA:5,1 +DA:8,1 +DA:9,1 +DA:10,8 +DA:14,1 +DA:15,1 DA:16,0 -DA:20,0 -DA:21,0 -DA:22,0 -DA:23,0 -DA:27,0 -DA:28,0 -DA:29,0 +DA:20,1 +DA:21,1 +DA:22,8 +DA:23,8 +DA:27,1 +DA:28,1 +DA:29,1 DA:30,0 DA:33,0 -DA:36,0 -DA:37,0 +DA:36,1 +DA:37,1 DA:38,0 -DA:42,0 -DA:43,0 -DA:44,0 +DA:42,1 +DA:43,1 +DA:44,43 DA:45,0 DA:47,0 DA:50,0 @@ -11602,7 +10183,7 @@ DA:78,0 DA:80,0 DA:82,0 DA:84,0 -DA:86,0 +DA:86,43 DA:87,0 DA:89,0 DA:92,0 @@ -11634,7 +10215,7 @@ DA:132,0 DA:134,0 DA:136,0 DA:138,0 -DA:140,0 +DA:140,43 DA:141,0 DA:143,0 DA:146,0 @@ -11658,7 +10239,7 @@ DA:174,0 DA:176,0 DA:178,0 DA:180,0 -DA:182,0 +DA:182,43 DA:183,0 DA:185,0 DA:188,0 @@ -11702,45 +10283,45 @@ DA:250,0 DA:251,0 DA:253,0 DA:255,0 -DA:258,0 -DA:259,0 -DA:260,0 -DA:261,0 -DA:262,0 -DA:266,0 -DA:267,0 +DA:258,43 +DA:259,43 +DA:260,43 +DA:261,43 +DA:262,43 +DA:266,1 +DA:267,1 DA:268,0 DA:269,0 DA:270,0 DA:272,0 DA:273,0 DA:275,0 -DA:279,0 -DA:280,0 +DA:279,1 +DA:280,1 DA:281,0 -DA:285,0 -DA:286,0 -DA:287,0 -DA:288,0 -DA:289,0 -DA:290,0 -DA:291,0 +DA:285,1 +DA:286,1 +DA:287,2 +DA:288,2 +DA:289,2 +DA:290,2 +DA:291,2 DA:293,0 -DA:295,0 -DA:296,0 -DA:297,0 -DA:298,0 -DA:299,0 -DA:300,0 +DA:295,2 +DA:296,2 +DA:297,2 +DA:298,2 +DA:299,2 +DA:300,2 DA:302,0 DA:303,0 DA:304,0 -DA:310,0 +DA:310,2 DA:311,0 -DA:316,0 +DA:316,2 DA:317,0 -DA:319,0 -DA:320,0 +DA:319,2 +DA:320,2 DA:322,0 DA:323,0 DA:324,0 @@ -11758,10 +10339,10 @@ DA:341,0 DA:343,0 DA:344,0 DA:345,0 -DA:353,0 -DA:354,0 -DA:357,0 -DA:358,0 +DA:353,1 +DA:354,1 +DA:357,1 +DA:358,1 DA:359,0 DA:360,0 DA:361,0 @@ -11792,40 +10373,40 @@ DA:402,0 DA:403,0 DA:404,0 DA:407,0 -DA:412,0 -DA:413,0 -DA:414,0 -DA:415,0 -DA:416,0 +DA:412,1 +DA:413,1 +DA:414,4 +DA:415,4 +DA:416,4 DA:418,0 -DA:420,0 -DA:421,0 -DA:429,0 -DA:430,0 -DA:431,0 -DA:432,0 +DA:420,4 +DA:421,4 +DA:429,4 +DA:430,4 +DA:431,4 +DA:432,4 DA:434,0 DA:435,0 DA:436,0 -DA:442,0 -DA:443,0 -DA:448,0 +DA:442,4 +DA:443,3 +DA:448,1 DA:449,0 -DA:451,0 -DA:452,0 -DA:454,0 -DA:455,0 -DA:456,0 -DA:457,0 -DA:458,0 -DA:461,0 +DA:451,1 +DA:452,1 +DA:454,3 +DA:455,3 +DA:456,3 +DA:457,3 +DA:458,3 +DA:461,3 DA:462,0 -DA:464,0 +DA:464,3 DA:465,0 DA:466,0 -DA:469,0 -DA:474,0 -DA:475,0 +DA:469,3 +DA:474,1 +DA:475,1 DA:476,0 DA:477,0 DA:478,0 @@ -11863,37 +10444,37 @@ DA:538,0 DA:539,0 DA:540,0 DA:541,0 -DA:549,0 -DA:550,0 +DA:549,1 +DA:550,1 DA:551,0 DA:552,0 DA:553,0 DA:554,0 DA:555,0 DA:556,0 -DA:560,0 -DA:561,0 +DA:560,1 +DA:561,1 DA:562,0 DA:563,0 DA:564,0 DA:565,0 DA:566,0 -DA:570,0 -DA:571,0 +DA:570,1 +DA:571,1 DA:572,0 -DA:576,0 -DA:577,0 +DA:576,1 +DA:577,1 DA:578,0 -DA:582,0 -DA:583,0 +DA:582,1 +DA:583,1 DA:584,0 DA:585,0 DA:586,0 DA:587,0 DA:589,0 DA:590,0 -DA:596,0 -DA:597,0 +DA:596,1 +DA:597,1 DA:598,0 DA:599,0 DA:600,0 @@ -11903,46 +10484,46 @@ DA:604,0 DA:605,0 DA:607,0 DA:608,0 -DA:631,0 -DA:632,0 -DA:633,0 +DA:631,1 +DA:632,1 +DA:633,1 DA:634,0 DA:635,0 DA:636,0 DA:637,0 DA:638,0 -DA:644,0 -DA:645,0 +DA:644,1 +DA:645,1 DA:646,0 -DA:650,0 +DA:650,1 DA:651,0 DA:652,0 DA:653,0 DA:654,0 DA:655,0 DA:656,0 -DA:661,0 -DA:662,0 +DA:661,1 +DA:662,1 DA:663,0 -DA:668,0 -DA:669,0 +DA:668,1 +DA:669,445 LF:373 -LH:0 -BRDA:8,0,0,0 +LH:103 +BRDA:8,0,0,1 BRDA:8,0,1,0 -BRDA:14,1,0,0 +BRDA:14,1,0,1 BRDA:14,1,1,0 -BRDA:20,2,0,0 +BRDA:20,2,0,1 BRDA:20,2,1,0 BRDA:22,3,0,0 -BRDA:22,3,1,0 -BRDA:22,4,0,0 -BRDA:22,4,1,0 +BRDA:22,3,1,8 +BRDA:22,4,0,8 +BRDA:22,4,1,8 BRDA:29,5,0,0 -BRDA:29,5,1,0 -BRDA:36,6,0,0 +BRDA:29,5,1,1 +BRDA:36,6,0,1 BRDA:36,6,1,0 -BRDA:42,7,0,0 +BRDA:42,7,0,1 BRDA:42,7,1,0 BRDA:59,8,0,0 BRDA:59,8,1,0 @@ -12041,7 +10622,7 @@ BRDA:250,54,0,0 BRDA:250,54,1,0 BRDA:255,55,0,0 BRDA:255,55,1,0 -BRDA:266,56,0,0 +BRDA:266,56,0,1 BRDA:266,56,1,0 BRDA:268,57,0,0 BRDA:268,57,1,0 @@ -12056,18 +10637,18 @@ BRDA:272,61,0,0 BRDA:272,61,1,0 BRDA:272,62,0,0 BRDA:272,62,1,0 -BRDA:279,63,0,0 +BRDA:279,63,0,1 BRDA:279,63,1,0 -BRDA:285,64,0,0 +BRDA:285,64,0,1 BRDA:285,64,1,0 -BRDA:299,65,0,0 +BRDA:299,65,0,2 BRDA:299,65,1,0 -BRDA:299,66,0,0 -BRDA:299,66,1,0 +BRDA:299,66,0,2 +BRDA:299,66,1,2 BRDA:310,67,0,0 -BRDA:310,67,1,0 +BRDA:310,67,1,2 BRDA:316,68,0,0 -BRDA:316,68,1,0 +BRDA:316,68,1,2 BRDA:324,69,0,0 BRDA:324,69,1,0 BRDA:325,70,0,0 @@ -12088,9 +10669,9 @@ BRDA:344,77,0,0 BRDA:344,77,1,0 BRDA:344,78,0,0 BRDA:344,78,1,0 -BRDA:353,79,0,0 +BRDA:353,79,0,1 BRDA:353,79,1,0 -BRDA:357,80,0,0 +BRDA:357,80,0,1 BRDA:357,80,1,0 BRDA:369,81,0,0 BRDA:369,81,1,0 @@ -12110,29 +10691,29 @@ BRDA:402,88,0,0 BRDA:402,88,1,0 BRDA:403,89,0,0 BRDA:403,89,1,0 -BRDA:412,90,0,0 +BRDA:412,90,0,1 BRDA:412,90,1,0 -BRDA:427,91,0,0 +BRDA:427,91,0,4 BRDA:427,91,1,0 -BRDA:431,92,0,0 +BRDA:431,92,0,4 BRDA:431,92,1,0 -BRDA:431,93,0,0 -BRDA:431,93,1,0 -BRDA:442,94,0,0 -BRDA:442,94,1,0 +BRDA:431,93,0,4 +BRDA:431,93,1,4 +BRDA:442,94,0,3 +BRDA:442,94,1,1 BRDA:448,95,0,0 -BRDA:448,95,1,0 -BRDA:456,96,0,0 +BRDA:448,95,1,1 +BRDA:456,96,0,3 BRDA:456,96,1,0 -BRDA:457,97,0,0 +BRDA:457,97,0,3 BRDA:457,97,1,0 BRDA:461,98,0,0 -BRDA:461,98,1,0 +BRDA:461,98,1,3 BRDA:464,99,0,0 -BRDA:464,99,1,0 +BRDA:464,99,1,3 BRDA:465,100,0,0 BRDA:465,100,1,0 -BRDA:474,101,0,0 +BRDA:474,101,0,1 BRDA:474,101,1,0 BRDA:491,102,0,0 BRDA:491,102,1,0 @@ -12162,33 +10743,33 @@ BRDA:540,114,0,0 BRDA:540,114,1,0 BRDA:540,115,0,0 BRDA:540,115,1,0 -BRDA:549,116,0,0 +BRDA:549,116,0,1 BRDA:549,116,1,0 -BRDA:560,117,0,0 +BRDA:560,117,0,1 BRDA:560,117,1,0 -BRDA:570,118,0,0 +BRDA:570,118,0,1 BRDA:570,118,1,0 -BRDA:576,119,0,0 +BRDA:576,119,0,1 BRDA:576,119,1,0 -BRDA:582,120,0,0 +BRDA:582,120,0,1 BRDA:582,120,1,0 -BRDA:596,121,0,0 +BRDA:596,121,0,1 BRDA:596,121,1,0 -BRDA:632,122,0,0 +BRDA:632,122,0,1 BRDA:632,122,1,0 -BRDA:644,123,0,0 +BRDA:644,123,0,1 BRDA:644,123,1,0 -BRDA:661,124,0,0 +BRDA:661,124,0,1 BRDA:661,124,1,0 BRF:252 -BRH:0 +BRH:41 end_of_record TN: SF:src\main\server\shims\mailer.js FN:21,(anonymous_0) FNF:1 -FNH:0 -FNDA:0,(anonymous_0) +FNH:1 +FNDA:1,(anonymous_0) DA:1,1 DA:3,1 DA:4,1 @@ -12198,28 +10779,28 @@ DA:7,1 DA:9,1 DA:19,1 DA:21,1 -DA:22,0 +DA:22,1 DA:23,0 DA:24,0 DA:32,0 -DA:35,0 -DA:36,0 -DA:37,0 +DA:35,1 +DA:36,1 +DA:37,1 DA:42,1 LF:17 -LH:10 +LH:14 BRDA:4,0,0,1 BRDA:4,0,1,1 BRDA:22,1,0,0 -BRDA:22,1,1,0 -BRDA:22,2,0,0 +BRDA:22,1,1,1 +BRDA:22,2,0,1 BRDA:22,2,1,0 BRDA:22,2,2,0 BRDA:22,2,3,0 -BRDA:35,3,0,0 +BRDA:35,3,0,1 BRDA:35,3,1,0 BRF:10 -BRH:2 +BRH:5 end_of_record TN: SF:src\main\server\shims\stjs.js @@ -12227,18 +10808,18 @@ FN:3,(anonymous_0) FNF:1 FNH:0 FNDA:0,(anonymous_0) -DA:2,0 +DA:2,1 DA:3,0 DA:4,0 DA:5,0 LF:4 -LH:0 +LH:1 BRDA:2,0,0,0 -BRDA:2,0,1,0 +BRDA:2,0,1,1 BRDA:4,1,0,0 BRDA:4,1,1,0 BRF:4 -BRH:0 +BRH:1 end_of_record TN: SF:src\main\server\shims\util\sharedAdminCache.js @@ -12248,8 +10829,8 @@ FNF:2 FNH:0 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) -DA:1,0 -DA:3,0 +DA:1,1 +DA:3,1 DA:7,0 DA:8,0 DA:9,0 @@ -12258,7 +10839,7 @@ DA:13,0 DA:16,0 DA:20,0 LF:9 -LH:0 +LH:2 BRDA:7,0,0,0 BRDA:7,0,1,0 BRDA:12,1,0,0 diff --git a/package-lock.json b/package-lock.json index 378dce8db..66825eef4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "cassproject": "^1.5.66", "check-disk-space": "^3.4.0", "compression": "^1.7.4", + "concurrently": "^9.0.1", "cors": "^2.8.5", "cron": "^3.1.7", "express": "^4.21.1", @@ -3886,6 +3887,82 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/concurrently": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.0.1.tgz", + "integrity": "sha512-wYKvCd/f54sTXJMSfV6Ln/B8UrfLBKOYa+lzc6CHay3Qek+LorVSBdMVfyewFhRbH0Rbabsk4D+3PL/VjQ5gzg==", + "dependencies": { + "chalk": "^4.1.2", + "lodash": "^4.17.21", + "rxjs": "^7.8.1", + "shell-quote": "^1.8.1", + "supports-color": "^8.1.1", + "tree-kill": "^1.2.2", + "yargs": "^17.7.2" + }, + "bin": { + "conc": "dist/bin/concurrently.js", + "concurrently": "dist/bin/concurrently.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/open-cli-tools/concurrently?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/concurrently/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/concurrently/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "engines": { + "node": ">=12" + } + }, "node_modules/console-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", @@ -4371,8 +4448,7 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/encodeurl": { "version": "2.0.0", @@ -4574,7 +4650,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, "engines": { "node": ">=6" } @@ -5913,7 +5988,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -6704,7 +6778,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -10037,7 +10110,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -10191,7 +10263,6 @@ "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, "dependencies": { "tslib": "^2.1.0" } @@ -10393,7 +10464,6 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10997,7 +11067,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -11331,6 +11400,14 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "bin": { + "tree-kill": "cli.js" + } + }, "node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", @@ -11883,7 +11960,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -11965,7 +12041,6 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, "engines": { "node": ">=10" } diff --git a/package.json b/package.json index 0c4d26b70..ccdd73ba9 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "dev:oidc": "npm run dev:oidcdeps && export CASS_OIDC_ENABLED=true|| set CASS_OIDC_ENABLED=true&& npm run dev:nodemon", "dev:nodemon": "nodemon --watch ../cass-npm --watch . --max-old-space-size=512 --ignore etc src/main/server.js", "dev:nodemon:docker": "nodemon --ignore etc --exec \"docker-compose up -d --build\"", + "dev:nyc": "npm run dev:deps && nyc --reporter lcov node src/main/server.js", "mocha": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "mochaEncryption": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/com/eduworks/ec/crypto/*.test.js", "mochafast": "wait-on http://localhost/api/ping && mocha -b src/**/*.test.js", @@ -36,6 +37,7 @@ "run:google": "pm2 start ./pm2.google.config.js", "run:proxy": "pm2 start ./pm2.proxy.config.js", "run:test": "pm2 start ./pm2.test.config.js", + "run:nyc": "concurrently --killOthers \"npm run dev:nyc\" \"npm run mocha\"", "run:cassbase": "pm2 start ./pm2.cassbase.config.js", "run:withTests": "npm run test:start & npm run mochaEncryption", "pm2startup": "pm2 startup", @@ -99,6 +101,7 @@ "cassproject": "^1.5.66", "check-disk-space": "^3.4.0", "compression": "^1.7.4", + "concurrently": "^9.0.1", "cors": "^2.8.5", "cron": "^3.1.7", "express": "^4.21.1", @@ -119,7 +122,7 @@ "ws": "^8.18.0" }, "devDependencies": { - "chai": "4.5.0", + "chai": "4.5.0", "eslint": "^9.13.0", "eslint-config-google": "^0.14.0", "mocha": "^10.7.3", From 954f6d3df7b4fddbe89a64c419f99bda0a1abae7 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Mon, 28 Oct 2024 15:28:57 -0700 Subject: [PATCH 10/21] WIP CI/CD LCOV --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ccdd73ba9..bfcf566b8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "test:mocha": "nyc npm run mocha", "test:start": "node src/main/server.js", "test:sudostart": "sudo pm2 start ./pm2.test.config.js", - "test:deps": "docker-compose up -d elasticsearch-cass", + "test:deps": "docker compose up -d elasticsearch-cass", "test:nodemon": "nodemon src/main/server.js", "test:logs": "pm2 logs --nostream --lines 1000", "dev": "npm run dev:deps && npm run dev:nodemon", @@ -20,11 +20,11 @@ "dev:https": "npm run dev:deps && export HTTPS=true|| set HTTPS=true&& npm run dev:nodemon", "dev:clientSideCertificates": "npm run dev:deps && export HTTPS=true|| set HTTPS=true&& export HTTP2=false|| set HTTP2=false&& export HTTPS_REJECT_UNAUTHORIZED=false|| set HTTPS_REJECT_UNAUTHORIZED=false&& export REQUEST_CLIENT_SIDE_CERTIFICATE=true|| set REQUEST_CLIENT_SIDE_CERTIFICATE=true&& npm run dev:nodemon", "dev:jwt": "npm run dev:deps && export CASS_JWT_ENABLED=true|| set CASS_JWT_ENABLED=true&& npm run dev:nodemon", - "dev:deps": "docker-compose up -d elasticsearch-cass", - "dev:oidcdeps": "docker-compose up --build -d elasticsearch-cass", + "dev:deps": "docker compose up -d elasticsearch-cass", + "dev:oidcdeps": "docker compose up --build -d elasticsearch-cass", "dev:oidc": "npm run dev:oidcdeps && export CASS_OIDC_ENABLED=true|| set CASS_OIDC_ENABLED=true&& npm run dev:nodemon", "dev:nodemon": "nodemon --watch ../cass-npm --watch . --max-old-space-size=512 --ignore etc src/main/server.js", - "dev:nodemon:docker": "nodemon --ignore etc --exec \"docker-compose up -d --build\"", + "dev:nodemon:docker": "nodemon --ignore etc --exec \"docker compose up -d --build\"", "dev:nyc": "npm run dev:deps && nyc --reporter lcov node src/main/server.js", "mocha": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "mochaEncryption": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/com/eduworks/ec/crypto/*.test.js", From 6f520efc2f050a64fc560f86abb2183d79766a7a Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Tue, 29 Oct 2024 07:52:40 -0700 Subject: [PATCH 11/21] WIP CI/CD --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bfcf566b8..e41e11f27 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,11 @@ "dev:oidc": "npm run dev:oidcdeps && export CASS_OIDC_ENABLED=true|| set CASS_OIDC_ENABLED=true&& npm run dev:nodemon", "dev:nodemon": "nodemon --watch ../cass-npm --watch . --max-old-space-size=512 --ignore etc src/main/server.js", "dev:nodemon:docker": "nodemon --ignore etc --exec \"docker compose up -d --build\"", - "dev:nyc": "npm run dev:deps && nyc --reporter lcov node src/main/server.js", + "dev:nyc": "npm run dev:deps && export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&export PORT=8080|| set PORT=8080&&nyc --reporter lcov node src/main/server.js", "mocha": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "mochaEncryption": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/com/eduworks/ec/crypto/*.test.js", "mochafast": "wait-on http://localhost/api/ping && mocha -b src/**/*.test.js", + "mochaNyc": "export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&wait-on http://localhost:8080/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "nyc": "nyc --reporter lcov npm run mocha", "automocha": "nodemon --watch ../cass-npm --watch . --exec \"npm run mocha\"", "automochafast": "nodemon --exec \"npm run mochafast\"", @@ -37,7 +38,7 @@ "run:google": "pm2 start ./pm2.google.config.js", "run:proxy": "pm2 start ./pm2.proxy.config.js", "run:test": "pm2 start ./pm2.test.config.js", - "run:nyc": "concurrently --killOthers \"npm run dev:nyc\" \"npm run mocha\"", + "run:nyc": "concurrently --killOthers \"npm run dev:nyc\" \"npm run mochaNyc\"", "run:cassbase": "pm2 start ./pm2.cassbase.config.js", "run:withTests": "npm run test:start & npm run mochaEncryption", "pm2startup": "pm2 startup", From c411fabb888f9ccc21285380cc1e6564492c9c80 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Tue, 29 Oct 2024 07:57:00 -0700 Subject: [PATCH 12/21] WIP Test --- src/main/server/adapter/asn/asn.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/server/adapter/asn/asn.test.js b/src/main/server/adapter/asn/asn.test.js index de672378a..be14f9462 100644 --- a/src/main/server/adapter/asn/asn.test.js +++ b/src/main/server/adapter/asn/asn.test.js @@ -19,7 +19,7 @@ describe("ASN Adapter", function() { before(async ()=>{ try{ - await fetch("http://localhost/api/data/70d27b782c062d1280b240890141dcf6"); + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}data/70d27b782c062d1280b240890141dcf6`); } catch(err){ let onet = await (await fetch("https://www.onetcenter.org/ctdlasn/graph/ce-07c25f74-9119-11e8-b852-782bcb5df6ac")).json(); @@ -30,6 +30,6 @@ describe("ASN Adapter", function() { }); it('conversion to ASN', async () => { - await fetch("http://localhost/api/asn/70d27b782c062d1280b240890141dcf6") + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}asn/70d27b782c062d1280b240890141dcf6`) }).timeout(30000); }); \ No newline at end of file From 622e294d1b8c9408bc9267b622201490fc2d46fa Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Tue, 29 Oct 2024 08:09:43 -0700 Subject: [PATCH 13/21] WIP Test --- src/main/server/adapter/case/case.test.js | 6 ++--- src/main/server/adapter/ceasn/ceasn.test.js | 27 ++++++++++----------- src/main/server/skyRepo.test.js | 6 ++--- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/main/server/adapter/case/case.test.js b/src/main/server/adapter/case/case.test.js index 5080b7929..b52b653cd 100644 --- a/src/main/server/adapter/case/case.test.js +++ b/src/main/server/adapter/case/case.test.js @@ -19,7 +19,7 @@ describe("CASE Adapter", function() { before(async ()=>{ try{ - await fetch("http://localhost/api/data/70d27b782c062d1280b240890141dcf6"); + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}data/70d27b782c062d1280b240890141dcf6`); } catch(err){ let onet = await (await fetch("https://www.onetcenter.org/ctdlasn/graph/ce-07c25f74-9119-11e8-b852-782bcb5df6ac")).json(); @@ -30,10 +30,10 @@ describe("CASE Adapter", function() { }); it('conversion to CASE', async () => { - await fetch("http://localhost/api/ims/case/v1p0/CFPackages/70d27b782c062d1280b240890141dcf6") + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}ims/case/v1p0/CFPackages/70d27b782c062d1280b240890141dcf6`) }).timeout(10000); it('ACT Collective Problem Solving import', async()=>{ - await fetch("http://localhost/api/ims/case/harvest?caseEndpoint=https://opensalt.net&dId=f0e7396a-7edd-11e9-86d4-23cb22a51e7e") + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}ims/case/harvest?caseEndpoint=https://opensalt.net&dId=f0e7396a-7edd-11e9-86d4-23cb22a51e7e`) }).timeout(30000); }); \ No newline at end of file diff --git a/src/main/server/adapter/ceasn/ceasn.test.js b/src/main/server/adapter/ceasn/ceasn.test.js index 1989b133d..37f436444 100644 --- a/src/main/server/adapter/ceasn/ceasn.test.js +++ b/src/main/server/adapter/ceasn/ceasn.test.js @@ -24,41 +24,40 @@ describe("CEASN Adapter", function() { this.timeout(30000); before(async ()=>{ - try{ - await fetch("http://localhost/api/data/70d27b782c062d1280b240890141dcf6"); - } - catch(err){ + try { + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}data/70d27b782c062d1280b240890141dcf6`); + } catch (err) { console.log('doing things'); let onet = await (await fetch("https://www.onetcenter.org/ctdlasn/graph/ce-07c25f74-9119-11e8-b852-782bcb5df6ac")).json(); console.log('onet', onet); const formData = new FormData(); - formData.append('data',JSON.stringify(onet)); - await fetch("http://localhost/api/ctdlasn",{method: 'POST', body: formData}); + formData.append('data', JSON.stringify(onet)); + await fetch("http://localhost/api/ctdlasn", {method: 'POST', body: formData}); } }); it('conversion to CEASN', async () => { - await fetch("http://localhost/api/ceasn/70d27b782c062d1280b240890141dcf6") + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}ceasn/70d27b782c062d1280b240890141dcf6`) }).timeout(30000); - + it('conversion from CEASN', async () => { let repo = new EcRepository(); - repo.selectedServer = "http://localhost/api/"; + repo.selectedServer = process.env.CASS_LOOPBACK || "http://localhost/api/"; let onet = await (await fetch("https://www.onetcenter.org/ctdlasn/graph/ce-07c264d7-9119-11e8-b852-782bcb5df6ac")).json(); const formData = new FormData(); - formData.append('data',JSON.stringify(onet)); - await fetch("http://localhost/api/ctdlasn",{method: 'POST', body: formData}); + formData.append('data', JSON.stringify(onet)); + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}ctdlasn`, {method: 'POST', body: formData}); let framework = await EcRepository.get("https://www.onetcenter.org/ctdlasn/resources/ce-07c264d7-9119-11e8-b852-782bcb5df6ac"); assert(framework != null, "Framework saved to CaSS."); }).timeout(30000); it('conversion from CEASN (Technology Skills)', async () => { let repo = new EcRepository(); - repo.selectedServer = "http://localhost/api/"; + repo.selectedServer = process.env.CASS_LOOPBACK || "http://localhost/api/"; let onet = await (await fetch("https://www.onetcenter.org/ctdlasn/graph/ce-9fab4187-d8e7-11e9-8250-782bcb5df6ac")).json(); const formData = new FormData(); - formData.append('data',JSON.stringify(onet)); - await fetch("http://localhost/api/ctdlasn",{method: 'POST', body: formData}); + formData.append('data', JSON.stringify(onet)); + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}ctdlasn`, {method: 'POST', body: formData}); let framework = await EcRepository.get("https://www.onetcenter.org/ctdlasn/resources/ce-9fab4187-d8e7-11e9-8250-782bcb5df6ac"); assert(framework != null, "Framework saved to CaSS."); }).timeout(300000); diff --git a/src/main/server/skyRepo.test.js b/src/main/server/skyRepo.test.js index d6de088c1..751477b83 100644 --- a/src/main/server/skyRepo.test.js +++ b/src/main/server/skyRepo.test.js @@ -23,7 +23,7 @@ describe('SkyRepo Adapter', function() { it('Server Move', async () => { // Initial creation. const repo1 = new EcRepository(); - await repo1.init('http://localhost/api/'); + await repo1.init(process.env.CASS_LOOPBACK || "http://localhost/api/"); const thing = new schema.Thing(); thing.name = 'A thing.'; thing.generateId(repo1.selectedServer); @@ -33,7 +33,7 @@ describe('SkyRepo Adapter', function() { // Wipe and create second repo link to alternate url. EcRepository.repos = []; const repo2 = new EcRepository(); - await repo2.init('http://127.0.0.1/api/'); + await repo2.init(process.env.CASS_LOOPBACK || `http://127.0.0.1:${PORT}/api/`); // Get from repo2. Falls back to search (in error case); const thingCopy2 = await EcRepository.get(canonicalUrl); @@ -59,7 +59,7 @@ describe('SkyRepo Adapter', function() { it('Multiput', async () => { const repo = new EcRepository(); - await repo.init('http://localhost/api/'); + await repo.init(process.env.CASS_LOOPBACK || "http://localhost/api/"); let thing1 = new schema.Thing(); thing1.generateId(repo.selectedServer); From c0ae467ed1827f0f78aa924d1adfac753f75dc37 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Tue, 29 Oct 2024 08:21:28 -0700 Subject: [PATCH 14/21] WIP CI/CD --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e41e11f27..5f1bfc31b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "run:google": "pm2 start ./pm2.google.config.js", "run:proxy": "pm2 start ./pm2.proxy.config.js", "run:test": "pm2 start ./pm2.test.config.js", - "run:nyc": "concurrently --killOthers \"npm run dev:nyc\" \"npm run mochaNyc\"", + "run:nyc": "concurrently --killOthers --successCondition last \"npm run dev:nyc\" \"npm run mochaNyc\"", "run:cassbase": "pm2 start ./pm2.cassbase.config.js", "run:withTests": "npm run test:start & npm run mochaEncryption", "pm2startup": "pm2 startup", From 79112ea3c93380f05bf4782036fb65dc69cb2f8c Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Tue, 29 Oct 2024 08:29:29 -0700 Subject: [PATCH 15/21] WIP CI/CD --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f1bfc31b..f42814cd9 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "run:google": "pm2 start ./pm2.google.config.js", "run:proxy": "pm2 start ./pm2.proxy.config.js", "run:test": "pm2 start ./pm2.test.config.js", - "run:nyc": "concurrently --killOthers --successCondition last \"npm run dev:nyc\" \"npm run mochaNyc\"", + "run:nyc": "concurrently --killOthers --successCondition first \"npm run dev:nyc\" \"npm run mochaNyc\"", "run:cassbase": "pm2 start ./pm2.cassbase.config.js", "run:withTests": "npm run test:start & npm run mochaEncryption", "pm2startup": "pm2 startup", From 432c516757b086005c8eb9b685f74b248699b99f Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Tue, 29 Oct 2024 08:54:02 -0700 Subject: [PATCH 16/21] WIP CI/CD --- coverage/lcov-report/index.html | 80 ++++----- coverage/lcov.info | 304 ++++++++++++++------------------ package.json | 2 +- 3 files changed, 177 insertions(+), 209 deletions(-) diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html index 045da990b..c30229a83 100644 --- a/coverage/lcov-report/index.html +++ b/coverage/lcov-report/index.html @@ -23,30 +23,30 @@

All files

- 9.68% + 8.7% Statements - 588/6071 + 527/6055
- 3.15% + 2.31% Branches - 124/3929 + 91/3927
- 4.46% + 4.01% Functions - 19/426 + 17/423
- 10.06% + 9.04% Lines - 588/5843 + 527/5828
@@ -79,33 +79,33 @@

All files

- main - -
+ main + +
- 57.24% - 83/145 - 41.93% - 26/62 - 17.64% - 3/17 - 58.04% - 83/143 + 48.96% + 71/145 + 32.25% + 20/62 + 11.76% + 2/17 + 49.65% + 71/143 main/server - -
+ +
- 8.55% - 164/1917 - 1.33% - 15/1126 - 4.06% - 5/123 - 8.84% - 164/1854 + 7.73% + 147/1901 + 0.53% + 6/1124 + 4.16% + 5/120 + 7.99% + 147/1839 @@ -260,17 +260,17 @@

All files

main/server/shims - -
+ +
- 20.47% - 181/884 - 11.4% - 69/605 - 9% - 10/111 - 21.39% - 181/846 + 16.85% + 149/884 + 8.42% + 51/605 + 8.1% + 9/111 + 17.61% + 149/846 @@ -296,7 +296,7 @@

All files

Code coverage generated by istanbul - at 2024-10-28T21:03:26.779Z + at 2024-10-29T15:41:16.547Z
- - - - - - \ No newline at end of file diff --git a/coverage/lcov.info b/coverage/lcov.info index 8dbf1129a..df83313ae 100644 --- a/coverage/lcov.info +++ b/coverage/lcov.info @@ -6,36 +6,38 @@ FN:67,(anonymous_2) FN:115,(anonymous_3) FN:119,(anonymous_4) FN:122,(anonymous_5) -FN:132,(anonymous_6) +FN:127,(anonymous_6) FN:139,(anonymous_7) -FN:152,(anonymous_8) -FN:163,(anonymous_9) +FN:146,(anonymous_8) +FN:159,(anonymous_9) FN:170,(anonymous_10) -FN:174,(anonymous_11) -FN:195,(anonymous_12) -FN:206,(anonymous_13) -FN:209,(anonymous_14) -FN:228,(anonymous_15) -FN:251,(anonymous_16) -FNF:17 -FNH:2 +FN:177,(anonymous_11) +FN:181,(anonymous_12) +FN:202,(anonymous_13) +FN:213,(anonymous_14) +FN:216,(anonymous_15) +FN:235,(anonymous_16) +FN:258,(anonymous_17) +FNF:18 +FNH:7 FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) +FNDA:313,(anonymous_1) +FNDA:8506,(anonymous_2) FNDA:0,(anonymous_3) FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) +FNDA:1,(anonymous_6) FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) -FNDA:2,(anonymous_9) -FNDA:1,(anonymous_10) -FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) +FNDA:0,(anonymous_9) +FNDA:0,(anonymous_10) +FNDA:1,(anonymous_11) +FNDA:1,(anonymous_12) +FNDA:1,(anonymous_13) FNDA:0,(anonymous_14) FNDA:0,(anonymous_15) FNDA:0,(anonymous_16) +FNDA:11,(anonymous_17) DA:20,1 DA:21,1 DA:22,1 @@ -66,9 +68,9 @@ DA:59,1 DA:61,1 DA:63,1 DA:64,1 -DA:65,0 +DA:65,313 DA:67,1 -DA:68,0 +DA:68,8506 DA:72,1 DA:73,1 DA:74,0 @@ -104,83 +106,87 @@ DA:119,1 DA:120,0 DA:122,1 DA:123,0 -DA:126,1 +DA:125,1 DA:127,1 DA:128,1 -DA:131,1 -DA:132,0 -DA:133,0 -DA:134,0 +DA:129,1 +DA:133,1 +DA:134,1 +DA:135,1 DA:138,1 DA:139,0 +DA:140,0 DA:141,0 -DA:142,0 -DA:143,0 -DA:144,0 -DA:147,0 -DA:151,1 -DA:152,0 -DA:153,0 +DA:145,1 +DA:146,0 +DA:148,0 +DA:149,0 +DA:150,0 +DA:151,0 DA:154,0 DA:158,1 -DA:159,1 -DA:160,1 -DA:161,1 -DA:163,1 -DA:164,2 +DA:159,0 +DA:160,0 +DA:161,0 DA:165,1 DA:166,1 DA:167,1 +DA:168,1 DA:170,1 -DA:171,1 -DA:174,1 -DA:175,0 -DA:177,0 -DA:180,0 -DA:182,0 -DA:185,0 -DA:187,0 -DA:190,0 -DA:192,0 -DA:195,0 -DA:196,0 -DA:197,0 -DA:198,0 +DA:171,0 +DA:172,0 +DA:173,0 +DA:174,0 +DA:177,1 +DA:178,1 +DA:181,1 +DA:182,1 +DA:184,1 +DA:187,1 +DA:189,0 +DA:192,1 +DA:194,1 +DA:197,1 DA:199,0 -DA:200,0 -DA:202,0 -DA:203,0 -DA:204,0 -DA:205,0 -DA:206,0 +DA:202,1 +DA:203,1 +DA:204,1 +DA:205,1 +DA:206,1 DA:207,0 -DA:209,0 -DA:210,0 -DA:212,0 +DA:209,1 +DA:210,1 +DA:211,1 +DA:212,1 +DA:213,1 DA:214,0 -DA:215,0 -DA:216,0 -DA:225,0 -DA:226,0 -DA:227,0 -DA:228,0 -DA:229,0 -DA:230,0 +DA:216,1 +DA:217,0 +DA:219,1 +DA:221,1 +DA:222,0 +DA:223,0 DA:232,0 +DA:233,0 +DA:234,0 DA:235,0 DA:236,0 -DA:238,0 -DA:240,0 -DA:241,0 +DA:237,0 +DA:239,0 DA:242,0 +DA:243,0 DA:245,0 +DA:247,0 DA:248,0 DA:249,0 -DA:251,0 -DA:252,0 -DA:254,0 -LF:143 -LH:71 +DA:252,1 +DA:255,1 +DA:256,0 +DA:258,1 +DA:259,11 +DA:261,1 +LF:147 +LH:97 BRDA:24,0,0,1 BRDA:24,0,1,1 BRDA:25,1,0,0 @@ -211,40 +217,42 @@ BRDA:63,13,0,1 BRDA:63,13,1,1 BRDA:73,14,0,0 BRDA:73,14,1,1 -BRDA:126,15,0,1 -BRDA:126,15,1,0 -BRDA:131,16,0,0 -BRDA:131,16,1,1 +BRDA:125,15,0,1 +BRDA:125,15,1,0 +BRDA:133,16,0,1 +BRDA:133,16,1,0 BRDA:138,17,0,0 BRDA:138,17,1,1 -BRDA:142,18,0,0 -BRDA:142,18,1,0 -BRDA:143,19,0,0 -BRDA:143,19,1,0 -BRDA:143,20,0,0 -BRDA:143,20,1,0 -BRDA:151,21,0,0 -BRDA:151,21,1,1 -BRDA:197,22,0,0 -BRDA:197,22,1,0 -BRDA:199,23,0,0 -BRDA:199,23,1,0 -BRDA:214,24,0,0 -BRDA:214,24,1,0 -BRDA:220,25,0,0 -BRDA:220,25,1,0 -BRDA:221,26,0,0 -BRDA:221,26,1,0 -BRDA:225,27,0,0 -BRDA:225,27,1,0 -BRDA:235,28,0,0 -BRDA:235,28,1,0 -BRDA:240,29,0,0 -BRDA:240,29,1,0 -BRDA:248,30,0,0 -BRDA:248,30,1,0 -BRF:62 -BRH:20 +BRDA:145,18,0,0 +BRDA:145,18,1,1 +BRDA:149,19,0,0 +BRDA:149,19,1,0 +BRDA:150,20,0,0 +BRDA:150,20,1,0 +BRDA:150,21,0,0 +BRDA:150,21,1,0 +BRDA:158,22,0,0 +BRDA:158,22,1,1 +BRDA:204,23,0,0 +BRDA:204,23,1,1 +BRDA:206,24,0,0 +BRDA:206,24,1,1 +BRDA:221,25,0,0 +BRDA:221,25,1,1 +BRDA:227,26,0,0 +BRDA:227,26,1,0 +BRDA:228,27,0,0 +BRDA:228,27,1,0 +BRDA:232,28,0,0 +BRDA:232,28,1,0 +BRDA:242,29,0,0 +BRDA:242,29,1,0 +BRDA:247,30,0,0 +BRDA:247,30,1,0 +BRDA:255,31,0,0 +BRDA:255,31,1,1 +BRF:64 +BRH:25 end_of_record TN: SF:src\main\server\skyId.js @@ -643,106 +651,106 @@ FN:10132,(anonymous_97) FN:10140,(anonymous_98) FN:10146,(anonymous_99) FNF:100 -FNH:2 -FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) -FNDA:2,(anonymous_3) +FNH:82 +FNDA:201,(anonymous_0) +FNDA:23,(anonymous_1) +FNDA:145,(anonymous_2) +FNDA:5,(anonymous_3) FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) -FNDA:1,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) -FNDA:0,(anonymous_14) -FNDA:0,(anonymous_15) -FNDA:0,(anonymous_16) -FNDA:0,(anonymous_17) -FNDA:0,(anonymous_18) -FNDA:0,(anonymous_19) -FNDA:0,(anonymous_20) -FNDA:0,(anonymous_21) -FNDA:0,(anonymous_22) -FNDA:0,(anonymous_23) -FNDA:0,(anonymous_24) -FNDA:0,(anonymous_25) -FNDA:0,(anonymous_26) -FNDA:0,(anonymous_27) -FNDA:0,(anonymous_28) -FNDA:0,(anonymous_29) -FNDA:0,(anonymous_30) -FNDA:0,(anonymous_31) +FNDA:2890,(anonymous_7) +FNDA:156967,(anonymous_8) +FNDA:10036,(anonymous_9) +FNDA:755,(anonymous_10) +FNDA:737,(anonymous_11) +FNDA:25013,(anonymous_12) +FNDA:19198,(anonymous_13) +FNDA:19198,(anonymous_14) +FNDA:19198,(anonymous_15) +FNDA:8776,(anonymous_16) +FNDA:8776,(anonymous_17) +FNDA:172,(anonymous_18) +FNDA:118,(anonymous_19) +FNDA:236,(anonymous_20) +FNDA:236,(anonymous_21) +FNDA:593,(anonymous_22) +FNDA:172,(anonymous_23) +FNDA:166,(anonymous_24) +FNDA:96107,(anonymous_25) +FNDA:8531,(anonymous_26) +FNDA:42651,(anonymous_27) +FNDA:2336,(anonymous_28) +FNDA:118,(anonymous_29) +FNDA:236,(anonymous_30) +FNDA:146,(anonymous_31) FNDA:0,(anonymous_32) FNDA:0,(anonymous_33) FNDA:0,(anonymous_34) FNDA:0,(anonymous_35) -FNDA:0,(anonymous_36) -FNDA:0,(anonymous_37) -FNDA:0,(anonymous_38) -FNDA:0,(anonymous_39) -FNDA:0,(anonymous_40) -FNDA:0,(anonymous_41) -FNDA:0,(anonymous_42) -FNDA:0,(anonymous_43) -FNDA:0,(anonymous_44) -FNDA:0,(anonymous_45) +FNDA:146,(anonymous_36) +FNDA:146,(anonymous_37) +FNDA:2,(anonymous_38) +FNDA:8531,(anonymous_39) +FNDA:8530,(anonymous_40) +FNDA:8530,(anonymous_41) +FNDA:8725,(anonymous_42) +FNDA:118,(anonymous_43) +FNDA:593,(anonymous_44) +FNDA:466,(anonymous_45) FNDA:0,(anonymous_46) -FNDA:0,(anonymous_47) -FNDA:0,(anonymous_48) -FNDA:0,(anonymous_49) -FNDA:0,(anonymous_50) -FNDA:0,(anonymous_51) -FNDA:0,(anonymous_52) -FNDA:0,(anonymous_53) -FNDA:0,(anonymous_54) -FNDA:0,(anonymous_55) -FNDA:0,(anonymous_56) -FNDA:0,(anonymous_57) -FNDA:0,(anonymous_58) -FNDA:0,(anonymous_59) -FNDA:0,(anonymous_60) -FNDA:0,(anonymous_61) -FNDA:0,(anonymous_62) -FNDA:0,(anonymous_63) +FNDA:320,(anonymous_47) +FNDA:118,(anonymous_48) +FNDA:146,(anonymous_49) +FNDA:8530,(anonymous_50) +FNDA:116,(anonymous_51) +FNDA:320,(anonymous_52) +FNDA:477,(anonymous_53) +FNDA:2,(anonymous_54) +FNDA:359,(anonymous_55) +FNDA:2,(anonymous_56) +FNDA:24,(anonymous_57) +FNDA:12,(anonymous_58) +FNDA:320,(anonymous_59) +FNDA:320,(anonymous_60) +FNDA:15,(anonymous_61) +FNDA:160,(anonymous_62) +FNDA:127,(anonymous_63) FNDA:0,(anonymous_64) -FNDA:0,(anonymous_65) -FNDA:0,(anonymous_66) -FNDA:0,(anonymous_67) -FNDA:0,(anonymous_68) -FNDA:0,(anonymous_69) -FNDA:0,(anonymous_70) -FNDA:0,(anonymous_71) -FNDA:0,(anonymous_72) -FNDA:0,(anonymous_73) -FNDA:0,(anonymous_74) +FNDA:118,(anonymous_65) +FNDA:193,(anonymous_66) +FNDA:201,(anonymous_67) +FNDA:193,(anonymous_68) +FNDA:172,(anonymous_69) +FNDA:166,(anonymous_70) +FNDA:83,(anonymous_71) +FNDA:281,(anonymous_72) +FNDA:281,(anonymous_73) +FNDA:135,(anonymous_74) FNDA:0,(anonymous_75) FNDA:0,(anonymous_76) -FNDA:0,(anonymous_77) -FNDA:0,(anonymous_78) -FNDA:0,(anonymous_79) -FNDA:0,(anonymous_80) -FNDA:0,(anonymous_81) +FNDA:127,(anonymous_77) +FNDA:811,(anonymous_78) +FNDA:143,(anonymous_79) +FNDA:346,(anonymous_80) +FNDA:32,(anonymous_81) FNDA:0,(anonymous_82) FNDA:0,(anonymous_83) FNDA:0,(anonymous_84) -FNDA:0,(anonymous_85) -FNDA:0,(anonymous_86) -FNDA:0,(anonymous_87) -FNDA:0,(anonymous_88) -FNDA:0,(anonymous_89) +FNDA:193,(anonymous_85) +FNDA:17198,(anonymous_86) +FNDA:8530,(anonymous_87) +FNDA:23,(anonymous_88) +FNDA:8530,(anonymous_89) FNDA:0,(anonymous_90) -FNDA:0,(anonymous_91) -FNDA:0,(anonymous_92) +FNDA:135,(anonymous_91) +FNDA:135,(anonymous_92) FNDA:0,(anonymous_93) -FNDA:0,(anonymous_94) -FNDA:0,(anonymous_95) -FNDA:0,(anonymous_96) +FNDA:8671,(anonymous_94) +FNDA:6,(anonymous_95) +FNDA:6,(anonymous_96) FNDA:0,(anonymous_97) -FNDA:0,(anonymous_98) +FNDA:6,(anonymous_98) FNDA:0,(anonymous_99) DA:1,1 DA:2,1 @@ -751,17 +759,17 @@ DA:4,1 DA:5,1 DA:6,1 DA:10,1 -DA:11,0 +DA:11,201 DA:13,1 -DA:14,0 +DA:14,23 DA:16,1 DA:21,1 -DA:22,2 +DA:22,5 DA:23,0 -DA:25,2 +DA:25,5 DA:26,0 -DA:28,2 -DA:29,2 +DA:28,5 +DA:29,5 DA:31,0 DA:32,0 DA:34,0 @@ -774,388 +782,388 @@ DA:43,0 DA:46,0 DA:49,0 DA:57,1 -DA:58,1 -DA:59,1 +DA:58,2890 +DA:59,2890 DA:60,0 -DA:62,1 +DA:62,2890 DA:65,1 -DA:66,0 +DA:66,156967 DA:68,1 -DA:69,0 -DA:70,0 -DA:71,0 -DA:72,0 -DA:73,0 -DA:74,0 -DA:76,0 -DA:77,0 -DA:79,0 -DA:80,0 -DA:82,0 -DA:83,0 -DA:85,0 -DA:86,0 -DA:88,0 +DA:69,10036 +DA:70,10036 +DA:71,10036 +DA:72,10036 +DA:73,10036 +DA:74,1260 +DA:76,10036 +DA:77,1260 +DA:79,10036 +DA:80,10005 +DA:82,10036 +DA:83,10036 +DA:85,10036 +DA:86,31 +DA:88,10036 DA:89,0 -DA:91,0 +DA:91,10036 DA:92,0 -DA:94,0 +DA:94,10036 DA:95,0 -DA:97,0 +DA:97,10036 DA:98,0 -DA:100,0 -DA:101,0 -DA:103,0 +DA:100,10036 +DA:101,43 +DA:103,9993 DA:107,1 -DA:108,0 -DA:109,0 -DA:110,0 -DA:111,0 -DA:113,0 -DA:114,0 -DA:115,0 -DA:116,0 -DA:117,0 -DA:118,0 +DA:108,755 +DA:109,755 +DA:110,755 +DA:111,437 +DA:113,318 +DA:114,318 +DA:115,318 +DA:116,318 +DA:117,236 +DA:118,236 DA:120,0 -DA:123,0 -DA:124,0 -DA:125,0 -DA:126,0 +DA:123,318 +DA:124,318 +DA:125,318 +DA:126,318 DA:127,0 -DA:129,0 -DA:130,0 -DA:132,0 -DA:133,0 -DA:134,0 -DA:135,0 +DA:129,318 +DA:130,82 +DA:132,318 +DA:133,315 +DA:134,315 +DA:135,315 DA:136,0 -DA:139,0 -DA:140,0 -DA:141,0 -DA:143,0 -DA:144,0 -DA:145,0 -DA:146,0 -DA:148,0 -DA:149,0 -DA:150,0 -DA:151,0 -DA:152,0 -DA:155,0 +DA:139,315 +DA:140,315 +DA:141,315 +DA:143,315 +DA:144,315 +DA:145,315 +DA:146,315 +DA:148,315 +DA:149,315 +DA:150,315 +DA:151,1260 +DA:152,315 +DA:155,315 DA:156,0 -DA:158,0 +DA:158,315 DA:159,0 -DA:161,0 -DA:162,0 +DA:161,315 +DA:162,315 DA:164,0 DA:165,0 -DA:168,0 -DA:169,0 -DA:170,0 -DA:171,0 -DA:172,0 +DA:168,315 +DA:169,315 +DA:170,315 +DA:171,315 +DA:172,315 DA:173,0 DA:174,0 DA:175,0 DA:176,0 DA:177,0 -DA:180,0 +DA:180,315 DA:181,0 -DA:183,0 -DA:184,0 +DA:183,315 +DA:184,225 DA:185,0 -DA:188,0 -DA:189,0 +DA:188,315 +DA:189,90 DA:190,0 -DA:194,0 -DA:195,0 -DA:197,0 -DA:198,0 +DA:194,315 +DA:195,315 +DA:197,318 +DA:198,318 DA:200,1 -DA:201,0 +DA:201,737 DA:203,1 -DA:204,0 +DA:204,25013 DA:205,0 -DA:207,0 -DA:208,0 -DA:209,0 -DA:210,0 -DA:211,0 -DA:212,0 +DA:207,25013 +DA:208,1525 +DA:209,1525 +DA:210,19198 +DA:211,19198 +DA:212,19198 DA:214,0 DA:215,0 DA:217,0 -DA:220,0 -DA:221,0 -DA:222,0 -DA:223,0 -DA:224,0 -DA:225,0 -DA:226,0 -DA:227,0 -DA:228,0 -DA:229,0 -DA:230,0 -DA:231,0 +DA:220,19198 +DA:221,23488 +DA:222,886 +DA:223,886 +DA:224,886 +DA:225,886 +DA:226,187 +DA:227,187 +DA:228,187 +DA:229,187 +DA:230,187 +DA:231,187 DA:233,0 DA:234,0 DA:235,0 -DA:238,0 +DA:238,187 DA:239,0 -DA:242,0 +DA:242,187 DA:243,0 DA:244,0 DA:245,0 DA:246,0 DA:247,0 DA:250,0 -DA:254,0 -DA:255,0 -DA:256,0 -DA:257,0 -DA:258,0 -DA:259,0 +DA:254,886 +DA:255,886 +DA:256,5498 +DA:257,5498 +DA:258,5498 +DA:259,5498 DA:261,0 DA:262,0 DA:264,0 -DA:266,0 -DA:267,0 +DA:266,5498 +DA:267,5498 DA:269,0 -DA:272,0 -DA:274,0 +DA:272,886 +DA:274,22602 DA:277,1 -DA:278,0 +DA:278,8776 DA:280,1 -DA:283,0 -DA:284,0 +DA:283,8776 +DA:284,8776 DA:285,0 -DA:287,0 -DA:288,0 -DA:289,0 -DA:290,0 -DA:291,0 -DA:292,0 -DA:293,0 -DA:294,0 -DA:295,0 +DA:287,8776 +DA:288,8776 +DA:289,8776 +DA:290,8776 +DA:291,8776 +DA:292,8776 +DA:293,8776 +DA:294,8776 +DA:295,8776 DA:297,1 -DA:298,0 -DA:299,0 +DA:298,172 +DA:299,172 DA:301,0 DA:303,1 -DA:304,0 -DA:305,0 -DA:306,0 -DA:307,0 +DA:304,118 +DA:305,118 +DA:306,118 +DA:307,118 DA:308,0 -DA:310,0 +DA:310,118 DA:311,0 -DA:313,0 -DA:315,0 -DA:316,0 -DA:317,0 -DA:318,0 +DA:313,118 +DA:315,118 +DA:316,118 +DA:317,118 +DA:318,118 DA:320,0 -DA:322,0 -DA:323,0 +DA:322,118 +DA:323,118 DA:324,0 -DA:326,0 +DA:326,118 DA:328,1 -DA:329,0 -DA:330,0 -DA:331,0 +DA:329,236 +DA:330,236 +DA:331,236 DA:332,0 -DA:334,0 +DA:334,236 DA:335,0 -DA:337,0 -DA:339,0 -DA:340,0 -DA:341,0 -DA:342,0 +DA:337,236 +DA:339,236 +DA:340,236 +DA:341,236 +DA:342,236 DA:344,0 -DA:346,0 -DA:347,0 +DA:346,236 +DA:347,236 DA:348,0 -DA:350,0 +DA:350,236 DA:352,1 -DA:353,0 -DA:354,0 -DA:355,0 +DA:353,236 +DA:354,236 +DA:355,236 DA:356,0 -DA:358,0 +DA:358,236 DA:359,0 -DA:361,0 -DA:363,0 -DA:364,0 -DA:365,0 -DA:366,0 +DA:361,236 +DA:363,236 +DA:364,236 +DA:365,236 +DA:366,236 DA:368,0 -DA:370,0 -DA:371,0 +DA:370,236 +DA:371,236 DA:372,0 -DA:374,0 +DA:374,236 DA:376,1 -DA:377,0 -DA:378,0 -DA:379,0 -DA:380,0 +DA:377,593 +DA:378,593 +DA:379,593 +DA:380,593 DA:381,0 DA:382,0 DA:384,0 DA:385,0 -DA:387,0 -DA:388,0 -DA:390,0 -DA:392,0 +DA:387,593 +DA:388,477 +DA:390,116 +DA:392,593 DA:393,0 -DA:395,0 +DA:395,593 DA:397,1 -DA:398,0 -DA:399,0 -DA:400,0 +DA:398,172 +DA:399,172 +DA:400,172 DA:401,0 -DA:403,0 -DA:404,0 -DA:405,0 -DA:406,0 +DA:403,172 +DA:404,172 +DA:405,172 +DA:406,172 DA:408,0 -DA:410,0 -DA:411,0 -DA:412,0 +DA:410,172 +DA:411,172 +DA:412,172 DA:413,0 -DA:415,0 +DA:415,172 DA:417,1 -DA:418,0 -DA:419,0 -DA:420,0 -DA:421,0 +DA:418,166 +DA:419,166 +DA:420,166 +DA:421,166 DA:423,0 -DA:425,0 -DA:426,0 +DA:425,166 +DA:426,166 DA:427,0 -DA:429,0 +DA:429,166 DA:431,1 DA:432,1 -DA:433,0 -DA:434,0 -DA:435,0 -DA:8412,0 -DA:8413,0 -DA:8416,0 -DA:8417,0 -DA:8418,0 -DA:8419,0 -DA:8420,0 -DA:8421,0 +DA:433,96107 +DA:434,1 +DA:435,1 +DA:8412,1 +DA:8413,7975 +DA:8416,96107 +DA:8417,8742 +DA:8418,8742 +DA:8419,8742 +DA:8420,69756 +DA:8421,69756 DA:8422,0 -DA:8424,0 -DA:8425,0 +DA:8424,69756 +DA:8425,8742 DA:8426,0 -DA:8428,0 -DA:8431,0 -DA:8433,0 +DA:8428,8742 +DA:8431,69756 +DA:8433,8742 DA:8434,0 -DA:8436,0 -DA:8437,0 -DA:8438,0 -DA:8439,0 -DA:8442,0 +DA:8436,87365 +DA:8437,17591 +DA:8438,17591 +DA:8439,17702 +DA:8442,96107 DA:8444,1 -DA:8445,0 +DA:8445,8531 DA:8447,1 -DA:8448,0 -DA:8449,0 +DA:8448,42651 +DA:8449,42651 DA:8451,0 DA:8454,1 -DA:8455,0 -DA:8456,0 -DA:8457,0 -DA:8458,0 -DA:8459,0 -DA:8461,0 -DA:8462,0 -DA:8463,0 -DA:8465,0 -DA:8466,0 -DA:8467,0 -DA:8468,0 -DA:8469,0 -DA:8470,0 +DA:8455,2336 +DA:8456,210 +DA:8457,210 +DA:8458,1558 +DA:8459,1558 +DA:8461,210 +DA:8462,104 +DA:8463,104 +DA:8465,210 +DA:8466,210 +DA:8467,2126 +DA:8468,549 +DA:8469,549 +DA:8470,660 DA:8474,1 -DA:8475,0 -DA:8476,0 -DA:8477,0 -DA:8478,0 -DA:8479,0 -DA:8480,0 -DA:8481,0 +DA:8475,118 +DA:8476,118 +DA:8477,118 +DA:8478,118 +DA:8479,116 +DA:8480,116 +DA:8481,116 DA:8482,0 -DA:8486,0 +DA:8486,118 DA:8487,0 DA:8488,0 DA:8489,0 DA:8490,0 -DA:8494,0 -DA:8495,0 -DA:8496,0 +DA:8494,118 +DA:8495,118 +DA:8496,118 DA:8497,0 DA:8500,0 -DA:8502,0 +DA:8502,118 DA:8503,0 -DA:8505,0 -DA:8506,0 +DA:8505,118 +DA:8506,118 DA:8508,1 DA:8509,1 -DA:8510,0 -DA:8511,0 -DA:8512,0 -DA:8513,0 -DA:8514,0 -DA:8516,0 -DA:8517,0 +DA:8510,236 +DA:8511,1 +DA:8512,1 +DA:8513,1 +DA:8514,1 +DA:8516,1 +DA:8517,1 DA:8519,0 -DA:8521,0 -DA:8522,0 -DA:8523,0 +DA:8521,1 +DA:8522,1 +DA:8523,1 DA:8524,0 -DA:8526,0 -DA:8528,0 -DA:8529,0 -DA:8530,0 -DA:8531,0 -DA:8532,0 -DA:8533,0 +DA:8526,1 +DA:8528,236 +DA:8529,236 +DA:8530,236 +DA:8531,236 +DA:8532,236 +DA:8533,236 DA:8534,0 -DA:8536,0 -DA:8537,0 -DA:8538,0 -DA:8540,0 +DA:8536,236 +DA:8537,236 +DA:8538,236 +DA:8540,236 DA:8541,0 -DA:8543,0 +DA:8543,236 DA:8545,1 -DA:8546,0 -DA:8548,0 -DA:8550,0 -DA:8551,0 -DA:8553,0 -DA:8554,0 -DA:8555,0 -DA:8556,0 -DA:8558,0 -DA:8559,0 -DA:8561,0 -DA:8562,0 -DA:8563,0 -DA:8565,0 -DA:8566,0 -DA:8569,0 -DA:8570,0 +DA:8546,146 +DA:8548,146 +DA:8550,146 +DA:8551,8530 +DA:8553,8530 +DA:8554,17060 +DA:8555,17060 +DA:8556,17060 +DA:8558,17060 +DA:8559,17060 +DA:8561,17060 +DA:8562,17060 +DA:8563,17060 +DA:8565,17060 +DA:8566,17060 +DA:8569,146 +DA:8570,146 DA:8571,0 DA:8572,0 DA:8573,0 DA:8575,0 -DA:8579,0 +DA:8579,146 DA:8580,0 DA:8582,0 DA:8583,0 @@ -1181,142 +1189,142 @@ DA:8612,0 DA:8613,0 DA:8614,0 DA:8615,0 -DA:8621,0 +DA:8621,146 DA:8623,1 -DA:8624,0 -DA:8625,0 -DA:8626,0 -DA:8627,0 -DA:8630,0 +DA:8624,146 +DA:8625,146 +DA:8626,146 +DA:8627,146 +DA:8630,146 DA:8632,1 -DA:8633,0 -DA:8634,0 -DA:8635,0 -DA:8636,0 -DA:8638,0 -DA:8639,0 -DA:8640,0 +DA:8633,146 +DA:8634,146 +DA:8635,8531 +DA:8636,8531 +DA:8638,8531 +DA:8639,8531 +DA:8640,8531 DA:8641,0 DA:8642,0 DA:8643,0 DA:8645,0 -DA:8649,0 -DA:8650,0 -DA:8652,0 -DA:8653,0 -DA:8656,0 -DA:8657,0 -DA:8658,0 -DA:8659,0 -DA:8660,0 -DA:8661,0 -DA:8662,0 -DA:8663,0 -DA:8665,0 -DA:8669,0 +DA:8649,8531 +DA:8650,8531 +DA:8652,8531 +DA:8653,8531 +DA:8656,146 +DA:8657,146 +DA:8658,146 +DA:8659,8531 +DA:8660,8531 +DA:8661,8531 +DA:8662,12 +DA:8663,9 +DA:8665,3 +DA:8669,8531 DA:8672,0 DA:8673,0 DA:8674,0 -DA:8679,0 -DA:8681,0 -DA:8682,0 -DA:8683,0 -DA:8684,0 -DA:8685,0 -DA:8686,0 -DA:8687,0 +DA:8679,146 +DA:8681,146 +DA:8682,8531 +DA:8683,8531 +DA:8684,8531 +DA:8685,8520 +DA:8686,8520 +DA:8687,8520 DA:8688,0 -DA:8692,0 +DA:8692,8531 DA:8693,0 DA:8694,0 DA:8695,0 DA:8696,0 -DA:8700,0 -DA:8701,0 -DA:8702,0 +DA:8700,8531 +DA:8701,8531 +DA:8702,8531 DA:8703,0 DA:8706,0 -DA:8708,0 -DA:8709,0 -DA:8710,0 -DA:8713,0 -DA:8715,0 -DA:8716,0 -DA:8717,0 -DA:8720,0 -DA:8721,0 -DA:8723,0 -DA:8724,0 +DA:8708,8531 +DA:8709,4 +DA:8710,4 +DA:8713,8531 +DA:8715,8531 +DA:8716,8531 +DA:8717,8531 +DA:8720,8531 +DA:8721,8531 +DA:8723,146 +DA:8724,146 DA:8725,0 DA:8726,0 DA:8727,0 DA:8729,0 -DA:8732,0 -DA:8733,0 -DA:8734,0 -DA:8736,0 -DA:8737,0 -DA:8738,0 -DA:8739,0 -DA:8740,0 -DA:8741,0 -DA:8747,0 -DA:8748,0 -DA:8749,0 -DA:8750,0 -DA:8751,0 -DA:8752,0 -DA:8753,0 -DA:8754,0 -DA:8755,0 -DA:8757,0 -DA:8759,0 -DA:8761,0 -DA:8762,0 -DA:8763,0 -DA:8764,0 -DA:8768,0 -DA:8769,0 -DA:8770,0 -DA:8771,0 -DA:8773,0 -DA:8776,0 +DA:8732,146 +DA:8733,1 +DA:8734,2 +DA:8736,2 +DA:8737,1 +DA:8738,2 +DA:8739,1 +DA:8740,1 +DA:8741,1 +DA:8747,146 +DA:8748,146 +DA:8749,146 +DA:8750,8531 +DA:8751,8530 +DA:8752,8530 +DA:8753,8530 +DA:8754,8530 +DA:8755,8530 +DA:8757,8530 +DA:8759,146 +DA:8761,146 +DA:8762,8725 +DA:8763,202 +DA:8764,8 +DA:8768,146 +DA:8769,8 +DA:8770,8 +DA:8771,8 +DA:8773,8 +DA:8776,146 DA:8778,1 -DA:8780,0 -DA:8781,0 -DA:8782,0 +DA:8780,118 +DA:8781,118 +DA:8782,118 DA:8783,0 DA:8784,0 DA:8785,0 DA:8787,0 -DA:8790,0 -DA:8791,0 -DA:8792,0 -DA:8794,0 -DA:8797,0 +DA:8790,118 +DA:8791,118 +DA:8792,5 +DA:8794,118 +DA:8797,118 DA:8798,0 -DA:8800,0 -DA:8801,0 -DA:8802,0 -DA:8804,0 -DA:8807,0 -DA:8808,0 -DA:8809,0 -DA:8810,0 -DA:8811,0 -DA:8812,0 -DA:8813,0 -DA:8818,0 +DA:8800,118 +DA:8801,5 +DA:8802,4 +DA:8804,1 +DA:8807,118 +DA:8808,118 +DA:8809,118 +DA:8810,118 +DA:8811,118 +DA:8812,124 +DA:8813,6 +DA:8818,118 DA:8819,0 -DA:8821,0 -DA:8822,0 -DA:8823,0 -DA:8825,0 -DA:8826,0 -DA:8828,0 -DA:8829,0 -DA:8830,0 -DA:8831,0 +DA:8821,118 +DA:8822,118 +DA:8823,118 +DA:8825,118 +DA:8826,118 +DA:8828,118 +DA:8829,118 +DA:8830,236 +DA:8831,236 DA:8832,0 DA:8833,0 DA:8834,0 @@ -1325,40 +1333,40 @@ DA:8836,0 DA:8839,0 DA:8840,0 DA:8842,0 -DA:8845,0 -DA:8846,0 -DA:8847,0 +DA:8845,118 +DA:8846,118 +DA:8847,118 DA:8848,0 DA:8849,0 DA:8850,0 DA:8851,0 DA:8853,0 DA:8856,1 -DA:8857,0 +DA:8857,593 DA:8858,0 -DA:8860,0 -DA:8861,0 +DA:8860,593 +DA:8861,593 DA:8864,1 -DA:8865,0 +DA:8865,466 DA:8866,0 -DA:8869,0 -DA:8870,0 -DA:8871,0 -DA:8872,0 -DA:8873,0 -DA:8874,0 -DA:8875,0 -DA:8876,0 -DA:8877,0 -DA:8878,0 -DA:8879,0 +DA:8869,466 +DA:8870,466 +DA:8871,466 +DA:8872,466 +DA:8873,466 +DA:8874,25856 +DA:8875,25856 +DA:8876,25856 +DA:8877,25856 +DA:8878,25856 +DA:8879,25856 DA:8881,0 DA:8882,0 DA:8884,0 -DA:8886,0 -DA:8887,0 -DA:8890,0 -DA:8891,0 +DA:8886,25856 +DA:8887,25856 +DA:8890,466 +DA:8891,466 DA:8894,1 DA:8895,0 DA:8896,0 @@ -1375,209 +1383,209 @@ DA:8909,0 DA:8911,0 DA:8912,0 DA:8915,1 -DA:8916,0 -DA:8917,0 -DA:8919,0 -DA:8920,0 -DA:8921,0 -DA:8922,0 -DA:8923,0 -DA:8927,0 -DA:8929,0 +DA:8916,320 +DA:8917,181 +DA:8919,139 +DA:8920,139 +DA:8921,8522 +DA:8922,8522 +DA:8923,8383 +DA:8927,139 +DA:8929,139 DA:8930,0 -DA:8932,0 +DA:8932,139 DA:8933,0 -DA:8935,0 -DA:8936,0 -DA:8937,0 -DA:8939,0 -DA:8940,0 -DA:8941,0 -DA:8943,0 +DA:8935,139 +DA:8936,139 +DA:8937,66 +DA:8939,73 +DA:8940,73 +DA:8941,66 +DA:8943,7 DA:8946,1 -DA:8947,0 -DA:8948,0 -DA:8949,0 -DA:8950,0 +DA:8947,118 +DA:8948,118 +DA:8949,118 +DA:8950,118 DA:8951,0 -DA:8953,0 +DA:8953,118 DA:8954,0 -DA:8956,0 -DA:8957,0 +DA:8956,118 +DA:8957,118 DA:8958,0 -DA:8960,0 -DA:8961,0 +DA:8960,118 +DA:8961,118 DA:8962,0 -DA:8964,0 +DA:8964,118 DA:8967,1 -DA:8968,0 +DA:8968,146 DA:8969,0 -DA:8971,0 -DA:8972,0 -DA:8973,0 -DA:8974,0 -DA:8976,0 -DA:8977,0 -DA:8978,0 -DA:8979,0 -DA:8983,0 -DA:8984,0 +DA:8971,8530 +DA:8972,146 +DA:8973,146 +DA:8974,8530 +DA:8976,146 +DA:8977,8530 +DA:8978,8530 +DA:8979,8384 +DA:8983,146 +DA:8984,146 DA:8985,0 -DA:8987,0 -DA:8989,0 +DA:8987,146 +DA:8989,146 DA:8990,0 -DA:8992,0 +DA:8992,146 DA:8993,0 -DA:8995,0 -DA:8996,0 +DA:8995,146 +DA:8996,146 DA:8997,0 -DA:8999,0 -DA:9000,0 -DA:9001,0 -DA:9003,0 +DA:8999,146 +DA:9000,146 +DA:9001,130 +DA:9003,16 DA:9006,1 -DA:9007,0 -DA:9008,0 -DA:9009,0 +DA:9007,116 +DA:9008,116 +DA:9009,116 DA:9011,0 DA:9014,1 -DA:9015,0 +DA:9015,320 DA:9017,1 -DA:9018,0 -DA:9019,0 +DA:9018,477 +DA:9019,477 DA:9021,1 -DA:9022,0 -DA:9036,0 -DA:9037,0 -DA:9039,0 +DA:9022,2 +DA:9036,2 +DA:9037,2 +DA:9039,2 DA:9041,1 -DA:9042,0 -DA:9043,0 +DA:9042,359 +DA:9043,359 DA:9044,0 -DA:9046,0 +DA:9046,359 DA:9047,0 -DA:9049,0 -DA:9050,0 -DA:9052,0 +DA:9049,359 +DA:9050,243 +DA:9052,116 DA:9053,0 -DA:9055,0 -DA:9056,0 +DA:9055,116 +DA:9056,116 DA:9057,0 -DA:9059,0 +DA:9059,116 DA:9060,0 -DA:9062,0 -DA:9063,0 -DA:9065,0 +DA:9062,116 +DA:9063,20 +DA:9065,96 DA:9067,1 -DA:9068,0 -DA:9069,0 +DA:9068,2 +DA:9069,2 DA:9070,0 -DA:9072,0 +DA:9072,2 DA:9073,0 -DA:9075,0 -DA:9076,0 -DA:9077,0 -DA:9078,0 -DA:9079,0 -DA:9080,0 -DA:9081,0 -DA:9082,0 -DA:9083,0 -DA:9084,0 -DA:9085,0 -DA:9086,0 -DA:9087,0 -DA:9089,0 -DA:9090,0 -DA:9091,0 -DA:9092,0 -DA:9093,0 -DA:9094,0 -DA:9095,0 -DA:9096,0 -DA:9097,0 -DA:9098,0 -DA:9099,0 -DA:9101,0 -DA:9102,0 -DA:9106,0 +DA:9075,2 +DA:9076,2 +DA:9077,2 +DA:9078,24 +DA:9079,24 +DA:9080,24 +DA:9081,24 +DA:9082,24 +DA:9083,24 +DA:9084,24 +DA:9085,24 +DA:9086,24 +DA:9087,24 +DA:9089,2 +DA:9090,12 +DA:9091,44 +DA:9092,32 +DA:9093,32 +DA:9094,32 +DA:9095,32 +DA:9096,32 +DA:9097,32 +DA:9098,32 +DA:9099,32 +DA:9101,32 +DA:9102,2 +DA:9106,12 DA:9108,0 DA:9109,0 DA:9111,0 DA:9113,1 -DA:9114,0 -DA:9115,0 +DA:9114,320 +DA:9115,320 DA:9117,1 -DA:9118,0 -DA:9120,0 -DA:9121,0 -DA:9122,0 -DA:9123,0 -DA:9124,0 -DA:9125,0 -DA:9126,0 -DA:9127,0 -DA:9129,0 -DA:9134,0 +DA:9118,320 +DA:9120,320 +DA:9121,320 +DA:9122,320 +DA:9123,320 +DA:9124,320 +DA:9125,17325 +DA:9126,17325 +DA:9127,8803 +DA:9129,8522 +DA:9134,320 DA:9135,0 -DA:9138,0 -DA:9139,0 -DA:9140,0 +DA:9138,320 +DA:9139,320 +DA:9140,320 DA:9141,0 DA:9142,0 DA:9143,0 DA:9144,0 DA:9145,0 -DA:9149,0 +DA:9149,320 DA:9151,1 -DA:9152,0 +DA:9152,15 DA:9153,0 -DA:9155,0 +DA:9155,15 DA:9156,0 DA:9157,0 DA:9158,0 DA:9159,0 DA:9160,0 -DA:9162,0 +DA:9162,15 DA:9163,0 -DA:9165,0 +DA:9165,15 DA:9166,0 -DA:9168,0 -DA:9169,0 -DA:9170,0 -DA:9171,0 -DA:9172,0 +DA:9168,15 +DA:9169,15 +DA:9170,15 +DA:9171,15 +DA:9172,15 DA:9175,1 -DA:9176,0 -DA:9177,0 -DA:9178,0 -DA:9179,0 -DA:9181,0 -DA:9182,0 -DA:9183,0 -DA:9185,0 -DA:9186,0 +DA:9176,160 +DA:9177,160 +DA:9178,2 +DA:9179,2 +DA:9181,158 +DA:9182,158 +DA:9183,2 +DA:9185,156 +DA:9186,156 DA:9188,0 DA:9189,0 -DA:9193,0 +DA:9193,158 DA:9194,0 -DA:9196,0 +DA:9196,158 DA:9197,0 -DA:9199,0 +DA:9199,158 DA:9201,1 -DA:9202,0 -DA:9203,0 +DA:9202,127 +DA:9203,127 DA:9204,0 -DA:9206,0 -DA:9207,0 -DA:9208,0 -DA:9209,0 +DA:9206,127 +DA:9207,127 +DA:9208,127 +DA:9209,127 DA:9211,0 DA:9212,0 DA:9214,0 -DA:9216,0 +DA:9216,127 DA:9217,0 -DA:9219,0 +DA:9219,127 DA:9221,1 DA:9222,0 DA:9223,0 @@ -1599,166 +1607,166 @@ DA:9243,0 DA:9244,0 DA:9245,0 DA:9247,1 -DA:9248,0 +DA:9248,118 DA:9249,0 -DA:9251,0 -DA:9252,0 +DA:9251,118 +DA:9252,118 DA:9254,1 -DA:9255,0 -DA:9256,0 -DA:9257,0 -DA:9260,0 -DA:9262,0 -DA:9263,0 -DA:9267,0 -DA:9269,0 -DA:9270,0 -DA:9271,0 -DA:9272,0 -DA:9273,0 +DA:9255,193 +DA:9256,193 +DA:9257,17198 +DA:9260,193 +DA:9262,193 +DA:9263,47 +DA:9267,146 +DA:9269,146 +DA:9270,8530 +DA:9271,8530 +DA:9272,8530 +DA:9273,8530 DA:9274,0 DA:9275,0 DA:9276,0 DA:9277,0 DA:9279,0 -DA:9283,0 +DA:9283,146 DA:9285,1 -DA:9286,0 -DA:9287,0 -DA:9288,0 -DA:9290,0 -DA:9291,0 -DA:9292,0 -DA:9293,0 -DA:9294,0 -DA:9295,0 -DA:9296,0 -DA:9297,0 +DA:9286,201 +DA:9287,201 +DA:9288,94 +DA:9290,107 +DA:9291,107 +DA:9292,107 +DA:9293,105 +DA:9294,105 +DA:9295,105 +DA:9296,105 +DA:9297,105 DA:9298,0 -DA:9300,0 -DA:9301,0 -DA:9302,0 +DA:9300,105 +DA:9301,105 +DA:9302,105 DA:9304,0 DA:9305,0 DA:9306,0 DA:9307,0 -DA:9310,0 +DA:9310,105 DA:9311,0 -DA:9314,0 +DA:9314,107 DA:9316,1 -DA:9317,0 -DA:9318,0 -DA:9319,0 -DA:9320,0 -DA:9321,0 -DA:9322,0 -DA:9323,0 -DA:9324,0 -DA:9325,0 -DA:9326,0 -DA:9327,0 -DA:9328,0 -DA:9329,0 +DA:9317,193 +DA:9318,193 +DA:9319,193 +DA:9320,193 +DA:9321,8676 +DA:9322,8676 +DA:9323,8676 +DA:9324,8676 +DA:9325,8676 +DA:9326,8672 +DA:9327,8672 +DA:9328,8670 +DA:9329,8670 DA:9330,0 -DA:9332,0 -DA:9333,0 -DA:9334,0 -DA:9336,0 +DA:9332,8670 +DA:9333,5 +DA:9334,5 +DA:9336,8665 DA:9337,0 DA:9338,0 DA:9339,0 -DA:9342,0 -DA:9343,0 -DA:9347,0 -DA:9348,0 -DA:9349,0 -DA:9350,0 -DA:9351,0 -DA:9352,0 -DA:9356,0 +DA:9342,8672 +DA:9343,8667 +DA:9347,8667 +DA:9348,8667 +DA:9349,8667 +DA:9350,8667 +DA:9351,8667 +DA:9352,8667 +DA:9356,193 DA:9358,1 -DA:9359,0 -DA:9360,0 +DA:9359,172 +DA:9360,172 DA:9362,1 -DA:9363,0 -DA:9364,0 +DA:9363,166 +DA:9364,166 DA:9366,1 -DA:9367,0 -DA:9368,0 -DA:9369,0 -DA:9370,0 -DA:9372,0 -DA:9373,0 -DA:9375,0 -DA:9376,0 -DA:9377,0 -DA:9378,0 -DA:9379,0 +DA:9367,83 +DA:9368,83 +DA:9369,83 +DA:9370,83 +DA:9372,83 +DA:9373,83 +DA:9375,83 +DA:9376,83 +DA:9377,83 +DA:9378,166 +DA:9379,166 DA:9382,0 -DA:9384,0 +DA:9384,83 DA:9386,1 -DA:9387,0 -DA:9388,0 -DA:9389,0 -DA:9391,0 -DA:9392,0 -DA:9394,0 +DA:9387,281 +DA:9388,281 +DA:9389,135 +DA:9391,281 +DA:9392,281 +DA:9394,281 DA:9395,0 -DA:9397,0 -DA:9398,0 -DA:9399,0 -DA:9400,0 -DA:9401,0 -DA:9402,0 -DA:9403,0 -DA:9404,0 -DA:9405,0 -DA:9406,0 -DA:9407,0 -DA:9408,0 -DA:9409,0 -DA:9410,0 -DA:9411,0 +DA:9397,281 +DA:9398,281 +DA:9399,281 +DA:9400,281 +DA:9401,281 +DA:9402,281 +DA:9403,281 +DA:9404,281 +DA:9405,281 +DA:9406,281 +DA:9407,281 +DA:9408,281 +DA:9409,278 +DA:9410,278 +DA:9411,278 DA:9412,0 -DA:9414,0 -DA:9416,0 -DA:9417,0 -DA:9418,0 -DA:9419,0 -DA:9420,0 -DA:9422,0 +DA:9414,278 +DA:9416,278 +DA:9417,278 +DA:9418,278 +DA:9419,278 +DA:9420,278 +DA:9422,281 DA:9424,1 -DA:9425,0 -DA:9426,0 +DA:9425,281 +DA:9426,281 DA:9427,0 -DA:9429,0 +DA:9429,281 DA:9430,0 -DA:9431,0 -DA:9432,0 -DA:9434,0 -DA:9436,0 -DA:9437,0 -DA:9439,0 -DA:9440,0 +DA:9431,281 +DA:9432,276 +DA:9434,5 +DA:9436,281 +DA:9437,281 +DA:9439,281 +DA:9440,281 DA:9441,0 -DA:9443,0 +DA:9443,281 DA:9445,1 -DA:9446,0 -DA:9447,0 +DA:9446,135 +DA:9447,135 DA:9448,0 -DA:9450,0 -DA:9456,0 +DA:9450,135 +DA:9456,135 DA:9457,0 -DA:9459,0 +DA:9459,135 DA:9460,0 DA:9461,0 DA:9462,0 DA:9463,0 DA:9464,0 DA:9465,0 -DA:9469,0 -DA:9470,0 -DA:9471,0 +DA:9469,135 +DA:9470,135 +DA:9471,135 DA:9472,0 DA:9473,0 DA:9474,0 @@ -1766,77 +1774,77 @@ DA:9475,0 DA:9477,0 DA:9478,0 DA:9480,0 -DA:9483,0 -DA:9484,0 -DA:9485,0 -DA:9486,0 +DA:9483,135 +DA:9484,127 +DA:9485,127 +DA:9486,127 DA:9487,0 DA:9488,0 -DA:9490,0 -DA:9491,0 -DA:9492,0 -DA:9493,0 -DA:9495,0 -DA:9496,0 -DA:9498,0 -DA:9500,0 -DA:9502,0 -DA:9503,0 +DA:9490,127 +DA:9491,127 +DA:9492,127 +DA:9493,127 +DA:9495,127 +DA:9496,127 +DA:9498,135 +DA:9500,135 +DA:9502,135 +DA:9503,135 DA:9504,0 DA:9505,0 -DA:9507,0 +DA:9507,135 DA:9509,1 -DA:9510,0 -DA:9511,0 -DA:9513,0 +DA:9510,811 +DA:9511,224 +DA:9513,811 DA:9514,0 -DA:9516,0 -DA:9517,0 -DA:9518,0 -DA:9519,0 -DA:9521,0 -DA:9522,0 -DA:9523,0 -DA:9525,0 -DA:9526,0 -DA:9528,0 +DA:9516,811 +DA:9517,811 +DA:9518,811 +DA:9519,811 +DA:9521,811 +DA:9522,533 +DA:9523,533 +DA:9525,811 +DA:9526,113 +DA:9528,811 DA:9530,1 -DA:9531,0 -DA:9532,0 -DA:9533,0 -DA:9534,0 -DA:9536,0 +DA:9531,143 +DA:9532,143 +DA:9533,143 +DA:9534,143 +DA:9536,143 DA:9537,0 DA:9538,0 DA:9540,0 -DA:9543,0 +DA:9543,143 DA:9544,0 -DA:9546,0 +DA:9546,143 DA:9547,0 -DA:9549,0 +DA:9549,143 DA:9550,0 -DA:9552,0 +DA:9552,143 DA:9554,1 -DA:9555,0 -DA:9556,0 -DA:9557,0 -DA:9558,0 +DA:9555,346 +DA:9556,346 +DA:9557,346 +DA:9558,346 DA:9559,0 DA:9560,0 -DA:9563,0 -DA:9564,0 +DA:9563,346 +DA:9564,346 DA:9565,0 DA:9566,0 -DA:9569,0 +DA:9569,346 DA:9570,0 DA:9571,0 -DA:9574,0 -DA:9575,0 -DA:9576,0 -DA:9577,0 -DA:9578,0 -DA:9579,0 -DA:9580,0 +DA:9574,346 +DA:9575,346 +DA:9576,346 +DA:9577,346 +DA:9578,346 +DA:9579,346 +DA:9580,346 DA:9581,0 DA:9582,0 DA:9583,0 @@ -1865,96 +1873,96 @@ DA:9619,0 DA:9622,0 DA:9623,0 DA:9624,0 -DA:9628,0 +DA:9628,346 DA:9629,0 -DA:9631,0 +DA:9631,346 DA:9632,0 -DA:9634,0 +DA:9634,346 DA:9635,0 DA:9636,0 -DA:9638,0 -DA:9639,0 -DA:9640,0 -DA:9641,0 -DA:9642,0 -DA:9643,0 -DA:9644,0 -DA:9645,0 +DA:9638,346 +DA:9639,346 +DA:9640,346 +DA:9641,346 +DA:9642,346 +DA:9643,346 +DA:9644,83 +DA:9645,83 DA:9646,0 -DA:9648,0 -DA:9649,0 -DA:9650,0 -DA:9651,0 -DA:9652,0 -DA:9653,0 -DA:9655,0 -DA:9656,0 -DA:9657,0 -DA:9658,0 -DA:9659,0 -DA:9661,0 -DA:9662,0 -DA:9663,0 -DA:9665,0 -DA:9666,0 -DA:9667,0 -DA:9668,0 -DA:9669,0 -DA:9670,0 -DA:9671,0 +DA:9648,83 +DA:9649,83 +DA:9650,263 +DA:9651,260 +DA:9652,260 +DA:9653,118 +DA:9655,260 +DA:9656,142 +DA:9657,142 +DA:9658,142 +DA:9659,2 +DA:9661,140 +DA:9662,140 +DA:9663,140 +DA:9665,118 +DA:9666,118 +DA:9667,118 +DA:9668,3 +DA:9669,3 +DA:9670,3 +DA:9671,3 DA:9672,0 -DA:9674,0 -DA:9675,0 -DA:9676,0 +DA:9674,3 +DA:9675,3 +DA:9676,3 DA:9678,0 DA:9797,1 DA:9798,1 -DA:9799,0 -DA:9800,0 -DA:9801,0 -DA:9802,0 -DA:9803,0 -DA:9804,0 -DA:9805,0 -DA:9806,0 -DA:9807,0 -DA:9808,0 -DA:9809,0 -DA:9810,0 -DA:9811,0 -DA:9812,0 -DA:9813,0 +DA:9799,32 +DA:9800,32 +DA:9801,32 +DA:9802,32 +DA:9803,32 +DA:9804,32 +DA:9805,32 +DA:9806,114 +DA:9807,114 +DA:9808,114 +DA:9809,114 +DA:9810,114 +DA:9811,114 +DA:9812,114 +DA:9813,114 DA:9816,0 DA:9817,0 DA:9819,0 -DA:9821,0 -DA:9822,0 -DA:9824,0 -DA:9825,0 -DA:9826,0 -DA:9827,0 -DA:9828,0 -DA:9829,0 -DA:9830,0 -DA:9831,0 -DA:9832,0 -DA:9836,0 -DA:9837,0 -DA:9838,0 -DA:9839,0 +DA:9821,114 +DA:9822,114 +DA:9824,32 +DA:9825,32 +DA:9826,32 +DA:9827,32 +DA:9828,32 +DA:9829,114 +DA:9830,114 +DA:9831,114 +DA:9832,114 +DA:9836,32 +DA:9837,32 +DA:9838,32 +DA:9839,32 DA:9840,0 -DA:9842,0 -DA:9843,0 -DA:9844,0 -DA:9845,0 +DA:9842,32 +DA:9843,32 +DA:9844,32 +DA:9845,32 DA:9846,0 DA:9847,0 -DA:9849,0 +DA:9849,32 DA:9850,0 DA:9851,0 -DA:9855,0 +DA:9855,32 DA:9856,0 -DA:9858,0 +DA:9858,32 DA:9860,1 DA:9861,0 DA:9862,0 @@ -1973,15 +1981,15 @@ DA:9877,0 DA:9878,0 DA:9882,0 DA:9884,1 -DA:9885,0 -DA:9886,0 -DA:9887,0 -DA:9888,0 +DA:9885,193 +DA:9886,193 +DA:9887,193 +DA:9888,17198 DA:9890,1 -DA:9891,0 -DA:9892,0 -DA:9893,0 -DA:9895,0 +DA:9891,23 +DA:9892,23 +DA:9893,23 +DA:9895,23 DA:9896,0 DA:9897,0 DA:9898,0 @@ -1994,31 +2002,31 @@ DA:9907,0 DA:9908,0 DA:9909,0 DA:9911,0 -DA:9913,0 -DA:9915,0 -DA:9916,0 -DA:9917,0 -DA:9918,0 -DA:9919,0 -DA:9920,0 -DA:9921,0 -DA:9922,0 -DA:9924,0 -DA:9926,0 -DA:9927,0 +DA:9913,23 +DA:9915,23 +DA:9916,23 +DA:9917,17198 +DA:9918,17198 +DA:9919,17198 +DA:9920,17198 +DA:9921,17198 +DA:9922,8671 +DA:9924,8527 +DA:9926,17198 +DA:9927,17198 DA:9928,0 -DA:9930,0 -DA:9931,0 -DA:9939,0 -DA:9941,0 -DA:9942,0 -DA:9945,0 -DA:9946,0 -DA:9947,0 -DA:9948,0 -DA:9949,0 -DA:9951,0 -DA:9952,0 +DA:9930,17198 +DA:9931,17198 +DA:9939,23 +DA:9941,23 +DA:9942,8530 +DA:9945,23 +DA:9946,23 +DA:9947,23 +DA:9948,8530 +DA:9949,8530 +DA:9951,23 +DA:9952,23 DA:9954,1 DA:9955,0 DA:9956,0 @@ -2030,164 +2038,164 @@ DA:9961,0 DA:9962,0 DA:9964,0 DA:9966,1 -DA:9967,0 -DA:9968,0 -DA:9969,0 -DA:9970,0 -DA:9972,0 -DA:9973,0 -DA:9975,0 -DA:9976,0 -DA:9977,0 +DA:9967,135 +DA:9968,135 +DA:9969,127 +DA:9970,127 +DA:9972,135 +DA:9973,8 +DA:9975,127 +DA:9976,127 +DA:9977,127 DA:9979,0 DA:9981,1 -DA:9982,0 -DA:9983,0 -DA:9984,0 -DA:9985,0 +DA:9982,135 +DA:9983,135 +DA:9984,135 +DA:9985,135 DA:9986,0 DA:9987,0 -DA:9990,0 -DA:9991,0 +DA:9990,135 +DA:9991,135 DA:9992,0 DA:9993,0 -DA:9996,0 -DA:9997,0 -DA:9998,0 -DA:9999,0 -DA:10000,0 -DA:10001,0 -DA:10002,0 +DA:9996,135 +DA:9997,135 +DA:9998,135 +DA:9999,135 +DA:10000,135 +DA:10001,135 +DA:10002,135 DA:10003,0 DA:10004,0 -DA:10007,0 +DA:10007,135 DA:10008,0 DA:10009,0 -DA:10012,0 -DA:10013,0 -DA:10014,0 -DA:10017,0 +DA:10012,135 +DA:10013,5 +DA:10014,5 +DA:10017,135 DA:10018,0 DA:10019,0 -DA:10022,0 +DA:10022,135 DA:10023,0 DA:10024,0 -DA:10027,0 -DA:10028,0 -DA:10029,0 -DA:10032,0 +DA:10027,135 +DA:10028,5 +DA:10029,5 +DA:10032,135 DA:10033,0 DA:10034,0 -DA:10038,0 -DA:10039,0 -DA:10040,0 -DA:10042,0 +DA:10038,135 +DA:10039,135 +DA:10040,135 +DA:10042,135 DA:10043,0 -DA:10045,0 +DA:10045,135 DA:10085,1 DA:10086,1 DA:10087,0 DA:10089,1 -DA:10090,0 +DA:10090,8671 DA:10091,0 -DA:10093,0 +DA:10093,8671 DA:10095,1 -DA:10096,0 -DA:10097,0 -DA:10099,0 -DA:10100,0 +DA:10096,6 +DA:10097,6 +DA:10099,6 +DA:10100,6 DA:10101,0 DA:10102,0 DA:10103,0 -DA:10107,0 +DA:10107,6 DA:10126,1 DA:10128,1 -DA:10130,0 +DA:10130,6 DA:10131,0 DA:10132,0 DA:10134,0 -DA:10137,0 +DA:10137,6 DA:10139,1 DA:10140,1 -DA:10141,0 +DA:10141,6 DA:10146,0 DA:10263,1 DA:10289,1 DA:10315,1 LF:1370 -LH:95 +LH:970 BRDA:22,0,0,0 -BRDA:22,0,1,2 +BRDA:22,0,1,5 BRDA:25,1,0,0 -BRDA:25,1,1,2 -BRDA:28,2,0,2 +BRDA:25,1,1,5 +BRDA:28,2,0,5 BRDA:28,2,1,0 BRDA:31,3,0,0 BRDA:31,3,1,0 BRDA:39,4,0,0 BRDA:39,4,1,0 BRDA:59,5,0,0 -BRDA:59,5,1,1 -BRDA:73,6,0,0 -BRDA:73,6,1,0 -BRDA:76,7,0,0 -BRDA:76,7,1,0 -BRDA:79,8,0,0 -BRDA:79,8,1,0 -BRDA:82,9,0,0 +BRDA:59,5,1,2890 +BRDA:73,6,0,1260 +BRDA:73,6,1,8776 +BRDA:76,7,0,1260 +BRDA:76,7,1,8776 +BRDA:79,8,0,10005 +BRDA:79,8,1,31 +BRDA:82,9,0,10036 BRDA:82,9,1,0 -BRDA:85,10,0,0 -BRDA:85,10,1,0 +BRDA:85,10,0,31 +BRDA:85,10,1,10005 BRDA:88,11,0,0 -BRDA:88,11,1,0 +BRDA:88,11,1,10036 BRDA:91,12,0,0 -BRDA:91,12,1,0 +BRDA:91,12,1,10036 BRDA:94,13,0,0 -BRDA:94,13,1,0 +BRDA:94,13,1,10036 BRDA:97,14,0,0 -BRDA:97,14,1,0 -BRDA:100,15,0,0 -BRDA:100,15,1,0 -BRDA:110,16,0,0 -BRDA:110,16,1,0 -BRDA:110,17,0,0 -BRDA:110,17,1,0 -BRDA:116,18,0,0 -BRDA:116,18,1,0 -BRDA:116,19,0,0 -BRDA:116,19,1,0 +BRDA:97,14,1,10036 +BRDA:100,15,0,43 +BRDA:100,15,1,9993 +BRDA:110,16,0,437 +BRDA:110,16,1,318 +BRDA:110,17,0,755 +BRDA:110,17,1,437 +BRDA:116,18,0,236 +BRDA:116,18,1,82 +BRDA:116,19,0,318 +BRDA:116,19,1,318 BRDA:126,20,0,0 -BRDA:126,20,1,0 -BRDA:126,21,0,0 +BRDA:126,20,1,318 +BRDA:126,21,0,318 BRDA:126,21,1,0 -BRDA:129,22,0,0 -BRDA:129,22,1,0 -BRDA:129,23,0,0 -BRDA:129,23,1,0 +BRDA:129,22,0,82 +BRDA:129,22,1,236 +BRDA:129,23,0,318 +BRDA:129,23,1,82 BRDA:135,24,0,0 -BRDA:135,24,1,0 -BRDA:140,25,0,0 +BRDA:135,24,1,315 +BRDA:140,25,0,315 BRDA:140,25,1,0 -BRDA:151,26,0,0 -BRDA:151,26,1,0 +BRDA:151,26,0,315 +BRDA:151,26,1,945 BRDA:155,27,0,0 -BRDA:155,27,1,0 +BRDA:155,27,1,315 BRDA:158,28,0,0 -BRDA:158,28,1,0 +BRDA:158,28,1,315 BRDA:162,29,0,0 -BRDA:162,29,1,0 +BRDA:162,29,1,315 BRDA:164,30,0,0 BRDA:164,30,1,0 BRDA:164,31,0,0 BRDA:164,31,1,0 -BRDA:168,32,0,0 -BRDA:168,32,1,0 -BRDA:169,33,0,0 -BRDA:169,33,1,0 +BRDA:168,32,0,315 +BRDA:168,32,1,315 +BRDA:169,33,0,315 +BRDA:169,33,1,315 BRDA:172,34,0,0 -BRDA:172,34,1,0 -BRDA:172,35,0,0 -BRDA:172,35,1,0 +BRDA:172,34,1,315 +BRDA:172,35,0,315 +BRDA:172,35,1,315 BRDA:173,36,0,0 BRDA:173,36,1,0 BRDA:173,37,0,0 @@ -2195,41 +2203,41 @@ BRDA:173,37,1,0 BRDA:176,38,0,0 BRDA:176,38,1,0 BRDA:180,39,0,0 -BRDA:180,39,1,0 -BRDA:180,40,0,0 -BRDA:180,40,1,0 -BRDA:183,41,0,0 -BRDA:183,41,1,0 +BRDA:180,39,1,315 +BRDA:180,40,0,315 +BRDA:180,40,1,225 +BRDA:183,41,0,225 +BRDA:183,41,1,90 BRDA:184,42,0,0 -BRDA:184,42,1,0 -BRDA:188,43,0,0 -BRDA:188,43,1,0 +BRDA:184,42,1,225 +BRDA:188,43,0,90 +BRDA:188,43,1,225 BRDA:189,44,0,0 -BRDA:189,44,1,0 +BRDA:189,44,1,90 BRDA:204,45,0,0 -BRDA:204,45,1,0 -BRDA:207,46,0,0 -BRDA:207,46,1,0 +BRDA:204,45,1,25013 +BRDA:207,46,0,1525 +BRDA:207,46,1,23488 BRDA:214,47,0,0 BRDA:214,47,1,0 BRDA:214,48,0,0 BRDA:214,48,1,0 -BRDA:221,49,0,0 -BRDA:221,49,1,0 -BRDA:225,50,0,0 -BRDA:225,50,1,0 -BRDA:225,51,0,0 -BRDA:225,51,1,0 -BRDA:225,51,2,0 -BRDA:229,52,0,0 +BRDA:221,49,0,886 +BRDA:221,49,1,22602 +BRDA:225,50,0,187 +BRDA:225,50,1,699 +BRDA:225,51,0,886 +BRDA:225,51,1,149 +BRDA:225,51,2,737 +BRDA:229,52,0,187 BRDA:229,52,1,0 BRDA:233,53,0,0 BRDA:233,53,1,0 BRDA:238,54,0,0 -BRDA:238,54,1,0 +BRDA:238,54,1,187 BRDA:242,55,0,0 -BRDA:242,55,1,0 -BRDA:242,56,0,0 +BRDA:242,55,1,187 +BRDA:242,56,0,187 BRDA:242,56,1,0 BRDA:244,57,0,0 BRDA:244,57,1,0 @@ -2237,174 +2245,174 @@ BRDA:261,58,0,0 BRDA:261,58,1,0 BRDA:261,59,0,0 BRDA:261,59,1,0 -BRDA:266,60,0,0 +BRDA:266,60,0,5498 BRDA:266,60,1,0 BRDA:284,61,0,0 -BRDA:284,61,1,0 -BRDA:298,62,0,0 +BRDA:284,61,1,8776 +BRDA:298,62,0,172 BRDA:298,62,1,0 -BRDA:298,63,0,0 -BRDA:298,63,1,0 +BRDA:298,63,0,172 +BRDA:298,63,1,172 BRDA:307,64,0,0 -BRDA:307,64,1,0 -BRDA:307,65,0,0 +BRDA:307,64,1,118 +BRDA:307,65,0,118 BRDA:307,65,1,0 BRDA:310,66,0,0 -BRDA:310,66,1,0 -BRDA:310,67,0,0 -BRDA:310,67,1,0 +BRDA:310,66,1,118 +BRDA:310,67,0,118 +BRDA:310,67,1,118 BRDA:313,68,0,0 -BRDA:313,68,1,0 -BRDA:313,69,0,0 -BRDA:313,69,1,0 -BRDA:317,70,0,0 +BRDA:313,68,1,118 +BRDA:313,69,0,118 +BRDA:313,69,1,118 +BRDA:317,70,0,118 BRDA:317,70,1,0 -BRDA:317,71,0,0 -BRDA:317,71,1,0 +BRDA:317,71,0,118 +BRDA:317,71,1,118 BRDA:323,72,0,0 -BRDA:323,72,1,0 +BRDA:323,72,1,118 BRDA:331,73,0,0 -BRDA:331,73,1,0 -BRDA:331,74,0,0 +BRDA:331,73,1,236 +BRDA:331,74,0,236 BRDA:331,74,1,0 BRDA:334,75,0,0 -BRDA:334,75,1,0 -BRDA:334,76,0,0 -BRDA:334,76,1,0 +BRDA:334,75,1,236 +BRDA:334,76,0,236 +BRDA:334,76,1,236 BRDA:337,77,0,0 -BRDA:337,77,1,0 -BRDA:337,78,0,0 -BRDA:337,78,1,0 -BRDA:341,79,0,0 +BRDA:337,77,1,236 +BRDA:337,78,0,236 +BRDA:337,78,1,236 +BRDA:341,79,0,236 BRDA:341,79,1,0 -BRDA:341,80,0,0 -BRDA:341,80,1,0 +BRDA:341,80,0,236 +BRDA:341,80,1,236 BRDA:346,81,0,0 -BRDA:346,81,1,0 -BRDA:346,82,0,0 -BRDA:346,82,1,0 +BRDA:346,81,1,236 +BRDA:346,82,0,236 +BRDA:346,82,1,236 BRDA:347,83,0,0 -BRDA:347,83,1,0 +BRDA:347,83,1,236 BRDA:355,84,0,0 -BRDA:355,84,1,0 -BRDA:355,85,0,0 +BRDA:355,84,1,236 +BRDA:355,85,0,236 BRDA:355,85,1,0 BRDA:358,86,0,0 -BRDA:358,86,1,0 -BRDA:358,87,0,0 -BRDA:358,87,1,0 +BRDA:358,86,1,236 +BRDA:358,87,0,236 +BRDA:358,87,1,236 BRDA:361,88,0,0 -BRDA:361,88,1,0 -BRDA:361,89,0,0 -BRDA:361,89,1,0 -BRDA:365,90,0,0 +BRDA:361,88,1,236 +BRDA:361,89,0,236 +BRDA:361,89,1,236 +BRDA:365,90,0,236 BRDA:365,90,1,0 -BRDA:365,91,0,0 -BRDA:365,91,1,0 +BRDA:365,91,0,236 +BRDA:365,91,1,236 BRDA:371,92,0,0 -BRDA:371,92,1,0 -BRDA:379,93,0,0 +BRDA:371,92,1,236 +BRDA:379,93,0,593 BRDA:379,93,1,0 -BRDA:379,94,0,0 -BRDA:379,94,1,0 +BRDA:379,94,0,593 +BRDA:379,94,1,593 BRDA:381,95,0,0 BRDA:381,95,1,0 -BRDA:387,96,0,0 -BRDA:387,96,1,0 -BRDA:388,97,0,0 -BRDA:388,97,1,0 -BRDA:388,98,0,0 -BRDA:388,98,1,0 +BRDA:387,96,0,477 +BRDA:387,96,1,116 +BRDA:388,97,0,251 +BRDA:388,97,1,226 +BRDA:388,98,0,477 +BRDA:388,98,1,226 BRDA:392,99,0,0 -BRDA:392,99,1,0 +BRDA:392,99,1,593 BRDA:400,100,0,0 -BRDA:400,100,1,0 -BRDA:400,101,0,0 +BRDA:400,100,1,172 +BRDA:400,101,0,172 BRDA:400,101,1,0 -BRDA:405,102,0,0 +BRDA:405,102,0,172 BRDA:405,102,1,0 -BRDA:405,103,0,0 -BRDA:405,103,1,0 +BRDA:405,103,0,172 +BRDA:405,103,1,172 BRDA:412,104,0,0 -BRDA:412,104,1,0 -BRDA:420,105,0,0 +BRDA:412,104,1,172 +BRDA:420,105,0,166 BRDA:420,105,1,0 -BRDA:420,106,0,0 -BRDA:420,106,1,0 +BRDA:420,106,0,166 +BRDA:420,106,1,166 BRDA:426,107,0,0 -BRDA:426,107,1,0 -BRDA:433,108,0,0 -BRDA:433,108,1,0 -BRDA:8416,109,0,0 -BRDA:8416,109,1,0 +BRDA:426,107,1,166 +BRDA:433,108,0,1 +BRDA:433,108,1,96106 +BRDA:8416,109,0,8742 +BRDA:8416,109,1,87365 BRDA:8421,110,0,0 -BRDA:8421,110,1,0 -BRDA:8424,111,0,0 -BRDA:8424,111,1,0 +BRDA:8421,110,1,69756 +BRDA:8424,111,0,8742 +BRDA:8424,111,1,61014 BRDA:8425,112,0,0 -BRDA:8425,112,1,0 +BRDA:8425,112,1,8742 BRDA:8433,113,0,0 -BRDA:8433,113,1,0 -BRDA:8433,114,0,0 +BRDA:8433,113,1,8742 +BRDA:8433,114,0,8742 BRDA:8433,114,1,0 -BRDA:8436,115,0,0 -BRDA:8436,115,1,0 -BRDA:8448,116,0,0 +BRDA:8436,115,0,17591 +BRDA:8436,115,1,69774 +BRDA:8448,116,0,42651 BRDA:8448,116,1,0 -BRDA:8448,117,0,0 -BRDA:8448,117,1,0 -BRDA:8455,118,0,0 -BRDA:8455,118,1,0 -BRDA:8455,119,0,0 -BRDA:8455,119,1,0 -BRDA:8461,120,0,0 -BRDA:8461,120,1,0 -BRDA:8461,121,0,0 -BRDA:8461,121,1,0 -BRDA:8467,122,0,0 -BRDA:8467,122,1,0 -BRDA:8467,123,0,0 -BRDA:8467,123,1,0 -BRDA:8478,124,0,0 -BRDA:8478,124,1,0 -BRDA:8478,125,0,0 -BRDA:8478,125,1,0 +BRDA:8448,117,0,42651 +BRDA:8448,117,1,42651 +BRDA:8455,118,0,210 +BRDA:8455,118,1,2126 +BRDA:8455,119,0,2336 +BRDA:8455,119,1,2336 +BRDA:8461,120,0,104 +BRDA:8461,120,1,106 +BRDA:8461,121,0,210 +BRDA:8461,121,1,210 +BRDA:8467,122,0,549 +BRDA:8467,122,1,1577 +BRDA:8467,123,0,2126 +BRDA:8467,123,1,2126 +BRDA:8478,124,0,116 +BRDA:8478,124,1,2 +BRDA:8478,125,0,118 +BRDA:8478,125,1,116 BRDA:8481,126,0,0 -BRDA:8481,126,1,0 +BRDA:8481,126,1,116 BRDA:8486,127,0,0 -BRDA:8486,127,1,0 -BRDA:8486,128,0,0 +BRDA:8486,127,1,118 +BRDA:8486,128,0,118 BRDA:8486,128,1,0 BRDA:8489,129,0,0 BRDA:8489,129,1,0 BRDA:8496,130,0,0 -BRDA:8496,130,1,0 +BRDA:8496,130,1,118 BRDA:8502,131,0,0 -BRDA:8502,131,1,0 -BRDA:8510,132,0,0 -BRDA:8510,132,1,0 -BRDA:8516,133,0,0 +BRDA:8502,131,1,118 +BRDA:8510,132,0,1 +BRDA:8510,132,1,235 +BRDA:8516,133,0,1 BRDA:8516,133,1,0 -BRDA:8516,134,0,0 -BRDA:8516,134,1,0 +BRDA:8516,134,0,1 +BRDA:8516,134,1,1 BRDA:8523,135,0,0 -BRDA:8523,135,1,0 +BRDA:8523,135,1,1 BRDA:8533,136,0,0 -BRDA:8533,136,1,0 -BRDA:8536,137,0,0 +BRDA:8533,136,1,236 +BRDA:8536,137,0,236 BRDA:8536,137,1,0 BRDA:8540,138,0,0 -BRDA:8540,138,1,0 -BRDA:8554,139,0,0 +BRDA:8540,138,1,236 +BRDA:8554,139,0,17060 BRDA:8554,139,1,0 -BRDA:8555,140,0,0 +BRDA:8555,140,0,17060 BRDA:8555,140,1,0 -BRDA:8562,141,0,0 +BRDA:8562,141,0,17060 BRDA:8562,141,1,0 BRDA:8570,142,0,0 -BRDA:8570,142,1,0 +BRDA:8570,142,1,146 BRDA:8579,143,0,0 -BRDA:8579,143,1,0 +BRDA:8579,143,1,146 BRDA:8583,144,0,0 BRDA:8583,144,1,0 BRDA:8585,145,0,0 @@ -2421,112 +2429,112 @@ BRDA:8611,150,0,0 BRDA:8611,150,1,0 BRDA:8611,151,0,0 BRDA:8611,151,1,0 -BRDA:8626,152,0,0 +BRDA:8626,152,0,146 BRDA:8626,152,1,0 BRDA:8640,153,0,0 -BRDA:8640,153,1,0 -BRDA:8640,154,0,0 -BRDA:8640,154,1,0 -BRDA:8640,154,2,0 -BRDA:8649,155,0,0 +BRDA:8640,153,1,8531 +BRDA:8640,154,0,8531 +BRDA:8640,154,1,8531 +BRDA:8640,154,2,8531 +BRDA:8649,155,0,8531 BRDA:8649,155,1,0 -BRDA:8649,156,0,0 -BRDA:8649,156,1,0 -BRDA:8652,157,0,0 +BRDA:8649,156,0,8531 +BRDA:8649,156,1,8531 +BRDA:8652,157,0,8531 BRDA:8652,157,1,0 -BRDA:8652,158,0,0 -BRDA:8652,158,1,0 -BRDA:8657,159,0,0 +BRDA:8652,158,0,8531 +BRDA:8652,158,1,8531 +BRDA:8657,159,0,146 BRDA:8657,159,1,0 -BRDA:8661,160,0,0 -BRDA:8661,160,1,0 -BRDA:8662,161,0,0 -BRDA:8662,161,1,0 -BRDA:8662,162,0,0 -BRDA:8662,162,1,0 -BRDA:8662,162,2,0 +BRDA:8661,160,0,12 +BRDA:8661,160,1,8519 +BRDA:8662,161,0,9 +BRDA:8662,161,1,3 +BRDA:8662,162,0,12 +BRDA:8662,162,1,12 +BRDA:8662,162,2,9 BRDA:8673,163,0,0 BRDA:8673,163,1,0 -BRDA:8684,164,0,0 -BRDA:8684,164,1,0 -BRDA:8684,165,0,0 -BRDA:8684,165,1,0 +BRDA:8684,164,0,8520 +BRDA:8684,164,1,11 +BRDA:8684,165,0,8531 +BRDA:8684,165,1,8520 BRDA:8687,166,0,0 -BRDA:8687,166,1,0 +BRDA:8687,166,1,8520 BRDA:8692,167,0,0 -BRDA:8692,167,1,0 -BRDA:8692,168,0,0 +BRDA:8692,167,1,8531 +BRDA:8692,168,0,8531 BRDA:8692,168,1,0 BRDA:8695,169,0,0 BRDA:8695,169,1,0 BRDA:8702,170,0,0 -BRDA:8702,170,1,0 -BRDA:8708,171,0,0 -BRDA:8708,171,1,0 -BRDA:8708,172,0,0 -BRDA:8708,172,1,0 -BRDA:8716,173,0,0 +BRDA:8702,170,1,8531 +BRDA:8708,171,0,4 +BRDA:8708,171,1,8527 +BRDA:8708,172,0,8531 +BRDA:8708,172,1,8531 +BRDA:8716,173,0,8531 BRDA:8716,173,1,0 BRDA:8724,174,0,0 -BRDA:8724,174,1,0 -BRDA:8732,175,0,0 -BRDA:8732,175,1,0 +BRDA:8724,174,1,146 +BRDA:8732,175,0,1 +BRDA:8732,175,1,145 BRDA:8734,176,0,0 -BRDA:8734,176,1,0 -BRDA:8736,177,0,0 -BRDA:8736,177,1,0 -BRDA:8739,178,0,0 +BRDA:8734,176,1,2 +BRDA:8736,177,0,1 +BRDA:8736,177,1,1 +BRDA:8739,178,0,1 BRDA:8739,178,1,0 -BRDA:8750,179,0,0 -BRDA:8750,179,1,0 -BRDA:8754,180,0,0 +BRDA:8750,179,0,8531 +BRDA:8750,179,1,8530 +BRDA:8754,180,0,8530 BRDA:8754,180,1,0 -BRDA:8763,181,0,0 -BRDA:8763,181,1,0 -BRDA:8763,182,0,0 -BRDA:8763,182,1,0 -BRDA:8768,183,0,0 -BRDA:8768,183,1,0 +BRDA:8763,181,0,8 +BRDA:8763,181,1,194 +BRDA:8763,182,0,202 +BRDA:8763,182,1,202 +BRDA:8768,183,0,8 +BRDA:8768,183,1,138 BRDA:8782,184,0,0 -BRDA:8782,184,1,0 -BRDA:8782,185,0,0 -BRDA:8782,185,1,0 -BRDA:8782,185,2,0 -BRDA:8791,186,0,0 -BRDA:8791,186,1,0 +BRDA:8782,184,1,118 +BRDA:8782,185,0,118 +BRDA:8782,185,1,118 +BRDA:8782,185,2,118 +BRDA:8791,186,0,5 +BRDA:8791,186,1,113 BRDA:8797,187,0,0 -BRDA:8797,187,1,0 -BRDA:8797,188,0,0 -BRDA:8797,188,1,0 -BRDA:8797,188,2,0 -BRDA:8797,188,3,0 -BRDA:8800,189,0,0 -BRDA:8800,189,1,0 -BRDA:8801,190,0,0 -BRDA:8801,190,1,0 -BRDA:8801,191,0,0 -BRDA:8801,191,1,0 -BRDA:8801,191,2,0 -BRDA:8808,192,0,0 +BRDA:8797,187,1,118 +BRDA:8797,188,0,118 +BRDA:8797,188,1,5 +BRDA:8797,188,2,5 +BRDA:8797,188,3,5 +BRDA:8800,189,0,5 +BRDA:8800,189,1,113 +BRDA:8801,190,0,4 +BRDA:8801,190,1,1 +BRDA:8801,191,0,5 +BRDA:8801,191,1,5 +BRDA:8801,191,2,4 +BRDA:8808,192,0,118 BRDA:8808,192,1,0 -BRDA:8810,193,0,0 +BRDA:8810,193,0,118 BRDA:8810,193,1,0 -BRDA:8812,194,0,0 -BRDA:8812,194,1,0 -BRDA:8812,195,0,0 -BRDA:8812,195,1,0 +BRDA:8812,194,0,6 +BRDA:8812,194,1,118 +BRDA:8812,195,0,124 +BRDA:8812,195,1,124 BRDA:8818,196,0,0 -BRDA:8818,196,1,0 -BRDA:8822,197,0,0 +BRDA:8818,196,1,118 +BRDA:8822,197,0,118 BRDA:8822,197,1,0 -BRDA:8822,198,0,0 -BRDA:8822,198,1,0 -BRDA:8825,199,0,0 +BRDA:8822,198,0,118 +BRDA:8822,198,1,118 +BRDA:8825,199,0,118 BRDA:8825,199,1,0 -BRDA:8825,200,0,0 -BRDA:8825,200,1,0 +BRDA:8825,200,0,118 +BRDA:8825,200,1,118 BRDA:8831,201,0,0 -BRDA:8831,201,1,0 +BRDA:8831,201,1,236 BRDA:8834,202,0,0 BRDA:8834,202,1,0 BRDA:8834,203,0,0 @@ -2536,19 +2544,19 @@ BRDA:8839,204,1,0 BRDA:8839,205,0,0 BRDA:8839,205,1,0 BRDA:8847,206,0,0 -BRDA:8847,206,1,0 +BRDA:8847,206,1,118 BRDA:8850,207,0,0 BRDA:8850,207,1,0 BRDA:8857,208,0,0 -BRDA:8857,208,1,0 +BRDA:8857,208,1,593 BRDA:8865,209,0,0 -BRDA:8865,209,1,0 -BRDA:8879,210,0,0 +BRDA:8865,209,1,466 +BRDA:8879,210,0,25856 BRDA:8879,210,1,0 BRDA:8881,211,0,0 BRDA:8881,211,1,0 -BRDA:8886,212,0,0 -BRDA:8886,212,1,0 +BRDA:8886,212,0,8818 +BRDA:8886,212,1,17038 BRDA:8897,213,0,0 BRDA:8897,213,1,0 BRDA:8900,214,0,0 @@ -2557,125 +2565,125 @@ BRDA:8904,215,0,0 BRDA:8904,215,1,0 BRDA:8908,216,0,0 BRDA:8908,216,1,0 -BRDA:8916,217,0,0 -BRDA:8916,217,1,0 -BRDA:8922,218,0,0 -BRDA:8922,218,1,0 +BRDA:8916,217,0,181 +BRDA:8916,217,1,139 +BRDA:8922,218,0,8383 +BRDA:8922,218,1,139 BRDA:8929,219,0,0 -BRDA:8929,219,1,0 +BRDA:8929,219,1,139 BRDA:8932,220,0,0 -BRDA:8932,220,1,0 -BRDA:8936,221,0,0 -BRDA:8936,221,1,0 -BRDA:8940,222,0,0 -BRDA:8940,222,1,0 +BRDA:8932,220,1,139 +BRDA:8936,221,0,66 +BRDA:8936,221,1,73 +BRDA:8940,222,0,66 +BRDA:8940,222,1,7 BRDA:8950,223,0,0 -BRDA:8950,223,1,0 +BRDA:8950,223,1,118 BRDA:8953,224,0,0 -BRDA:8953,224,1,0 +BRDA:8953,224,1,118 BRDA:8957,225,0,0 -BRDA:8957,225,1,0 +BRDA:8957,225,1,118 BRDA:8961,226,0,0 -BRDA:8961,226,1,0 +BRDA:8961,226,1,118 BRDA:8968,227,0,0 -BRDA:8968,227,1,0 -BRDA:8978,228,0,0 -BRDA:8978,228,1,0 +BRDA:8968,227,1,146 +BRDA:8978,228,0,8384 +BRDA:8978,228,1,146 BRDA:8984,229,0,0 -BRDA:8984,229,1,0 +BRDA:8984,229,1,146 BRDA:8989,230,0,0 -BRDA:8989,230,1,0 +BRDA:8989,230,1,146 BRDA:8992,231,0,0 -BRDA:8992,231,1,0 +BRDA:8992,231,1,146 BRDA:8996,232,0,0 -BRDA:8996,232,1,0 -BRDA:9000,233,0,0 -BRDA:9000,233,1,0 -BRDA:9007,234,0,0 +BRDA:8996,232,1,146 +BRDA:9000,233,0,130 +BRDA:9000,233,1,16 +BRDA:9007,234,0,116 BRDA:9007,234,1,0 -BRDA:9007,235,0,0 -BRDA:9007,235,1,0 -BRDA:9007,235,2,0 +BRDA:9007,235,0,116 +BRDA:9007,235,1,116 +BRDA:9007,235,2,116 BRDA:9043,236,0,0 -BRDA:9043,236,1,0 +BRDA:9043,236,1,359 BRDA:9046,237,0,0 -BRDA:9046,237,1,0 -BRDA:9049,238,0,0 -BRDA:9049,238,1,0 +BRDA:9046,237,1,359 +BRDA:9049,238,0,243 +BRDA:9049,238,1,116 BRDA:9052,239,0,0 -BRDA:9052,239,1,0 +BRDA:9052,239,1,116 BRDA:9056,240,0,0 -BRDA:9056,240,1,0 +BRDA:9056,240,1,116 BRDA:9059,241,0,0 -BRDA:9059,241,1,0 -BRDA:9062,242,0,0 -BRDA:9062,242,1,0 -BRDA:9062,243,0,0 -BRDA:9062,243,1,0 +BRDA:9059,241,1,116 +BRDA:9062,242,0,20 +BRDA:9062,242,1,96 +BRDA:9062,243,0,116 +BRDA:9062,243,1,96 BRDA:9069,244,0,0 -BRDA:9069,244,1,0 +BRDA:9069,244,1,2 BRDA:9072,245,0,0 -BRDA:9072,245,1,0 -BRDA:9075,246,0,0 +BRDA:9072,245,1,2 +BRDA:9075,246,0,2 BRDA:9075,246,1,0 -BRDA:9084,247,0,0 -BRDA:9084,247,1,0 -BRDA:9085,248,0,0 -BRDA:9085,248,1,0 +BRDA:9084,247,0,9 +BRDA:9084,247,1,15 +BRDA:9085,248,0,9 +BRDA:9085,248,1,15 BRDA:9086,249,0,0 -BRDA:9086,249,1,0 -BRDA:9086,250,0,0 -BRDA:9086,250,1,0 -BRDA:9091,251,0,0 -BRDA:9091,251,1,0 -BRDA:9098,252,0,0 -BRDA:9098,252,1,0 -BRDA:9099,253,0,0 -BRDA:9099,253,1,0 -BRDA:9101,254,0,0 -BRDA:9101,254,1,0 +BRDA:9086,249,1,24 +BRDA:9086,250,0,24 +BRDA:9086,250,1,24 +BRDA:9091,251,0,12 +BRDA:9091,251,1,32 +BRDA:9098,252,0,16 +BRDA:9098,252,1,16 +BRDA:9099,253,0,16 +BRDA:9099,253,1,16 +BRDA:9101,254,0,2 +BRDA:9101,254,1,30 BRDA:9108,255,0,0 BRDA:9108,255,1,0 -BRDA:9123,256,0,0 +BRDA:9123,256,0,320 BRDA:9123,256,1,0 -BRDA:9126,257,0,0 -BRDA:9126,257,1,0 +BRDA:9126,257,0,8803 +BRDA:9126,257,1,8522 BRDA:9134,258,0,0 -BRDA:9134,258,1,0 -BRDA:9134,259,0,0 +BRDA:9134,258,1,320 +BRDA:9134,259,0,320 BRDA:9134,259,1,0 BRDA:9140,260,0,0 -BRDA:9140,260,1,0 +BRDA:9140,260,1,320 BRDA:9143,261,0,0 BRDA:9143,261,1,0 BRDA:9152,262,0,0 -BRDA:9152,262,1,0 -BRDA:9152,263,0,0 +BRDA:9152,262,1,15 +BRDA:9152,263,0,15 BRDA:9152,263,1,0 BRDA:9155,264,0,0 -BRDA:9155,264,1,0 +BRDA:9155,264,1,15 BRDA:9162,265,0,0 -BRDA:9162,265,1,0 +BRDA:9162,265,1,15 BRDA:9165,266,0,0 -BRDA:9165,266,1,0 -BRDA:9177,267,0,0 -BRDA:9177,267,1,0 -BRDA:9177,268,0,0 -BRDA:9177,268,1,0 -BRDA:9182,269,0,0 -BRDA:9182,269,1,0 +BRDA:9165,266,1,15 +BRDA:9177,267,0,2 +BRDA:9177,267,1,158 +BRDA:9177,268,0,160 +BRDA:9177,268,1,160 +BRDA:9182,269,0,2 +BRDA:9182,269,1,156 BRDA:9188,270,0,0 BRDA:9188,270,1,0 BRDA:9193,271,0,0 -BRDA:9193,271,1,0 +BRDA:9193,271,1,158 BRDA:9196,272,0,0 -BRDA:9196,272,1,0 +BRDA:9196,272,1,158 BRDA:9203,273,0,0 -BRDA:9203,273,1,0 +BRDA:9203,273,1,127 BRDA:9211,274,0,0 BRDA:9211,274,1,0 BRDA:9216,275,0,0 -BRDA:9216,275,1,0 +BRDA:9216,275,1,127 BRDA:9222,276,0,0 BRDA:9222,276,1,0 BRDA:9222,277,0,0 @@ -2692,153 +2700,153 @@ BRDA:9235,281,1,0 BRDA:9239,282,0,0 BRDA:9239,282,1,0 BRDA:9248,283,0,0 -BRDA:9248,283,1,0 -BRDA:9262,284,0,0 -BRDA:9262,284,1,0 +BRDA:9248,283,1,118 +BRDA:9262,284,0,47 +BRDA:9262,284,1,146 BRDA:9273,285,0,0 -BRDA:9273,285,1,0 +BRDA:9273,285,1,8530 BRDA:9276,286,0,0 BRDA:9276,286,1,0 -BRDA:9287,287,0,0 -BRDA:9287,287,1,0 -BRDA:9292,288,0,0 -BRDA:9292,288,1,0 -BRDA:9292,289,0,0 -BRDA:9292,289,1,0 -BRDA:9292,289,2,0 +BRDA:9287,287,0,94 +BRDA:9287,287,1,107 +BRDA:9292,288,0,105 +BRDA:9292,288,1,2 +BRDA:9292,289,0,107 +BRDA:9292,289,1,105 +BRDA:9292,289,2,105 BRDA:9297,290,0,0 -BRDA:9297,290,1,0 -BRDA:9300,291,0,0 +BRDA:9297,290,1,105 +BRDA:9300,291,0,105 BRDA:9300,291,1,0 BRDA:9304,292,0,0 BRDA:9304,292,1,0 BRDA:9310,293,0,0 -BRDA:9310,293,1,0 -BRDA:9319,294,0,0 +BRDA:9310,293,1,105 +BRDA:9319,294,0,193 BRDA:9319,294,1,0 -BRDA:9321,295,0,0 +BRDA:9321,295,0,8676 BRDA:9321,295,1,0 -BRDA:9325,296,0,0 -BRDA:9325,296,1,0 -BRDA:9325,297,0,0 -BRDA:9325,297,1,0 -BRDA:9325,297,2,0 +BRDA:9325,296,0,8672 +BRDA:9325,296,1,4 +BRDA:9325,297,0,8676 +BRDA:9325,297,1,8672 +BRDA:9325,297,2,8672 BRDA:9329,298,0,0 -BRDA:9329,298,1,0 -BRDA:9332,299,0,0 -BRDA:9332,299,1,0 +BRDA:9329,298,1,8670 +BRDA:9332,299,0,5 +BRDA:9332,299,1,8665 BRDA:9336,300,0,0 -BRDA:9336,300,1,0 -BRDA:9342,301,0,0 -BRDA:9342,301,1,0 -BRDA:9369,302,0,0 +BRDA:9336,300,1,8665 +BRDA:9342,301,0,8667 +BRDA:9342,301,1,5 +BRDA:9369,302,0,83 BRDA:9369,302,1,0 -BRDA:9369,303,0,0 -BRDA:9369,303,1,0 -BRDA:9372,304,0,0 +BRDA:9369,303,0,83 +BRDA:9369,303,1,83 +BRDA:9372,304,0,83 BRDA:9372,304,1,0 -BRDA:9372,305,0,0 -BRDA:9372,305,1,0 -BRDA:9376,306,0,0 +BRDA:9372,305,0,83 +BRDA:9372,305,1,83 +BRDA:9376,306,0,83 BRDA:9376,306,1,0 -BRDA:9388,307,0,0 -BRDA:9388,307,1,0 -BRDA:9391,308,0,0 +BRDA:9388,307,0,135 +BRDA:9388,307,1,146 +BRDA:9391,308,0,281 BRDA:9391,308,1,0 BRDA:9394,309,0,0 -BRDA:9394,309,1,0 -BRDA:9408,310,0,0 -BRDA:9408,310,1,0 -BRDA:9408,311,0,0 -BRDA:9408,311,1,0 +BRDA:9394,309,1,281 +BRDA:9408,310,0,278 +BRDA:9408,310,1,3 +BRDA:9408,311,0,281 +BRDA:9408,311,1,281 BRDA:9411,312,0,0 -BRDA:9411,312,1,0 +BRDA:9411,312,1,278 BRDA:9426,313,0,0 -BRDA:9426,313,1,0 -BRDA:9426,314,0,0 -BRDA:9426,314,1,0 +BRDA:9426,313,1,281 +BRDA:9426,314,0,281 +BRDA:9426,314,1,5 BRDA:9429,315,0,0 -BRDA:9429,315,1,0 -BRDA:9429,316,0,0 +BRDA:9429,315,1,281 +BRDA:9429,316,0,281 BRDA:9429,316,1,0 BRDA:9429,316,2,0 -BRDA:9431,317,0,0 -BRDA:9431,317,1,0 -BRDA:9436,318,0,0 +BRDA:9431,317,0,276 +BRDA:9431,317,1,5 +BRDA:9436,318,0,281 BRDA:9436,318,1,0 BRDA:9440,319,0,0 -BRDA:9440,319,1,0 +BRDA:9440,319,1,281 BRDA:9447,320,0,0 -BRDA:9447,320,1,0 +BRDA:9447,320,1,135 BRDA:9456,321,0,0 -BRDA:9456,321,1,0 +BRDA:9456,321,1,135 BRDA:9459,322,0,0 -BRDA:9459,322,1,0 +BRDA:9459,322,1,135 BRDA:9461,323,0,0 BRDA:9461,323,1,0 BRDA:9464,324,0,0 BRDA:9464,324,1,0 BRDA:9471,325,0,0 -BRDA:9471,325,1,0 +BRDA:9471,325,1,135 BRDA:9477,326,0,0 BRDA:9477,326,1,0 BRDA:9486,327,0,0 -BRDA:9486,327,1,0 -BRDA:9492,328,0,0 +BRDA:9486,327,1,127 +BRDA:9492,328,0,127 BRDA:9492,328,1,0 -BRDA:9502,329,0,0 -BRDA:9502,329,1,0 +BRDA:9502,329,0,135 +BRDA:9502,329,1,135 BRDA:9503,330,0,0 -BRDA:9503,330,1,0 -BRDA:9503,331,0,0 -BRDA:9503,331,1,0 +BRDA:9503,330,1,135 +BRDA:9503,331,0,135 +BRDA:9503,331,1,130 BRDA:9503,331,2,0 -BRDA:9510,332,0,0 -BRDA:9510,332,1,0 -BRDA:9510,333,0,0 -BRDA:9510,333,1,0 +BRDA:9510,332,0,224 +BRDA:9510,332,1,587 +BRDA:9510,333,0,811 +BRDA:9510,333,1,224 BRDA:9513,334,0,0 -BRDA:9513,334,1,0 -BRDA:9518,335,0,0 +BRDA:9513,334,1,811 +BRDA:9518,335,0,811 BRDA:9518,335,1,0 -BRDA:9521,336,0,0 -BRDA:9521,336,1,0 -BRDA:9522,337,0,0 -BRDA:9522,337,1,0 -BRDA:9525,338,0,0 -BRDA:9525,338,1,0 +BRDA:9521,336,0,533 +BRDA:9521,336,1,278 +BRDA:9522,337,0,36 +BRDA:9522,337,1,497 +BRDA:9525,338,0,113 +BRDA:9525,338,1,698 BRDA:9526,339,0,0 -BRDA:9526,339,1,0 -BRDA:9533,340,0,0 +BRDA:9526,339,1,113 +BRDA:9533,340,0,143 BRDA:9533,340,1,0 BRDA:9536,341,0,0 -BRDA:9536,341,1,0 +BRDA:9536,341,1,143 BRDA:9537,342,0,0 BRDA:9537,342,1,0 BRDA:9543,343,0,0 -BRDA:9543,343,1,0 -BRDA:9543,344,0,0 -BRDA:9543,344,1,0 +BRDA:9543,343,1,143 +BRDA:9543,344,0,143 +BRDA:9543,344,1,143 BRDA:9546,345,0,0 -BRDA:9546,345,1,0 +BRDA:9546,345,1,143 BRDA:9549,346,0,0 -BRDA:9549,346,1,0 -BRDA:9549,347,0,0 -BRDA:9549,347,1,0 +BRDA:9549,346,1,143 +BRDA:9549,347,0,143 +BRDA:9549,347,1,143 BRDA:9558,348,0,0 -BRDA:9558,348,1,0 +BRDA:9558,348,1,346 BRDA:9559,349,0,0 BRDA:9559,349,1,0 BRDA:9564,350,0,0 -BRDA:9564,350,1,0 +BRDA:9564,350,1,346 BRDA:9565,351,0,0 BRDA:9565,351,1,0 BRDA:9569,352,0,0 -BRDA:9569,352,1,0 +BRDA:9569,352,1,346 BRDA:9570,353,0,0 BRDA:9570,353,1,0 BRDA:9580,354,0,0 -BRDA:9580,354,1,0 +BRDA:9580,354,1,346 BRDA:9582,355,0,0 BRDA:9582,355,1,0 BRDA:9583,356,0,0 @@ -2876,61 +2884,61 @@ BRDA:9622,371,1,0 BRDA:9623,372,0,0 BRDA:9623,372,1,0 BRDA:9628,373,0,0 -BRDA:9628,373,1,0 -BRDA:9628,374,0,0 -BRDA:9628,374,1,0 +BRDA:9628,373,1,346 +BRDA:9628,374,0,346 +BRDA:9628,374,1,346 BRDA:9631,375,0,0 -BRDA:9631,375,1,0 -BRDA:9631,376,0,0 -BRDA:9631,376,1,0 +BRDA:9631,375,1,346 +BRDA:9631,376,0,346 +BRDA:9631,376,1,346 BRDA:9634,377,0,0 -BRDA:9634,377,1,0 -BRDA:9634,378,0,0 +BRDA:9634,377,1,346 +BRDA:9634,378,0,346 BRDA:9634,378,1,0 -BRDA:9643,379,0,0 -BRDA:9643,379,1,0 +BRDA:9643,379,0,83 +BRDA:9643,379,1,263 BRDA:9645,380,0,0 -BRDA:9645,380,1,0 -BRDA:9650,381,0,0 -BRDA:9650,381,1,0 -BRDA:9652,382,0,0 -BRDA:9652,382,1,0 -BRDA:9652,383,0,0 -BRDA:9652,383,1,0 -BRDA:9655,384,0,0 -BRDA:9655,384,1,0 -BRDA:9655,385,0,0 -BRDA:9655,385,1,0 -BRDA:9658,386,0,0 -BRDA:9658,386,1,0 +BRDA:9645,380,1,83 +BRDA:9650,381,0,260 +BRDA:9650,381,1,3 +BRDA:9652,382,0,118 +BRDA:9652,382,1,142 +BRDA:9652,383,0,260 +BRDA:9652,383,1,260 +BRDA:9655,384,0,142 +BRDA:9655,384,1,118 +BRDA:9655,385,0,260 +BRDA:9655,385,1,118 +BRDA:9658,386,0,2 +BRDA:9658,386,1,140 BRDA:9666,387,0,0 -BRDA:9666,387,1,0 -BRDA:9668,388,0,0 +BRDA:9666,387,1,118 +BRDA:9668,388,0,3 BRDA:9668,388,1,0 BRDA:9671,389,0,0 -BRDA:9671,389,1,0 -BRDA:9813,390,0,0 +BRDA:9671,389,1,3 +BRDA:9813,390,0,114 BRDA:9813,390,1,0 BRDA:9816,391,0,0 BRDA:9816,391,1,0 -BRDA:9821,392,0,0 +BRDA:9821,392,0,114 BRDA:9821,392,1,0 -BRDA:9827,393,0,0 +BRDA:9827,393,0,32 BRDA:9827,393,1,0 -BRDA:9830,394,0,0 +BRDA:9830,394,0,114 BRDA:9830,394,1,0 BRDA:9837,395,0,0 -BRDA:9837,395,1,0 -BRDA:9842,396,0,0 +BRDA:9837,395,1,32 +BRDA:9842,396,0,32 BRDA:9842,396,1,0 BRDA:9847,397,0,0 BRDA:9847,397,1,0 BRDA:9850,398,0,0 BRDA:9850,398,1,0 BRDA:9855,399,0,0 -BRDA:9855,399,1,0 +BRDA:9855,399,1,32 BRDA:9855,400,0,0 -BRDA:9855,400,1,0 +BRDA:9855,400,1,32 BRDA:9865,401,0,0 BRDA:9865,401,1,0 BRDA:9865,402,0,0 @@ -2940,114 +2948,114 @@ BRDA:9865,402,3,0 BRDA:9865,402,4,0 BRDA:9871,403,0,0 BRDA:9871,403,1,0 -BRDA:9893,404,0,0 +BRDA:9893,404,0,23 BRDA:9893,404,1,0 BRDA:9895,405,0,0 -BRDA:9895,405,1,0 +BRDA:9895,405,1,23 BRDA:9901,406,0,0 BRDA:9901,406,1,0 BRDA:9901,407,0,0 BRDA:9901,407,1,0 BRDA:9908,408,0,0 BRDA:9908,408,1,0 -BRDA:9921,409,0,0 -BRDA:9921,409,1,0 -BRDA:9921,410,0,0 -BRDA:9921,410,1,0 -BRDA:9921,410,2,0 -BRDA:9921,410,3,0 -BRDA:9921,410,4,0 +BRDA:9921,409,0,8671 +BRDA:9921,409,1,8527 +BRDA:9921,410,0,17198 +BRDA:9921,410,1,17198 +BRDA:9921,410,2,17198 +BRDA:9921,410,3,17198 +BRDA:9921,410,4,17198 BRDA:9927,411,0,0 -BRDA:9927,411,1,0 -BRDA:9942,412,0,0 -BRDA:9942,412,1,0 +BRDA:9927,411,1,17198 +BRDA:9942,412,0,193 +BRDA:9942,412,1,193 BRDA:9961,413,0,0 BRDA:9961,413,1,0 -BRDA:9972,414,0,0 -BRDA:9972,414,1,0 -BRDA:9976,415,0,0 +BRDA:9972,414,0,8 +BRDA:9972,414,1,127 +BRDA:9976,415,0,127 BRDA:9976,415,1,0 BRDA:9985,416,0,0 -BRDA:9985,416,1,0 +BRDA:9985,416,1,135 BRDA:9986,417,0,0 BRDA:9986,417,1,0 BRDA:9991,418,0,0 -BRDA:9991,418,1,0 +BRDA:9991,418,1,135 BRDA:9992,419,0,0 BRDA:9992,419,1,0 -BRDA:10001,420,0,0 +BRDA:10001,420,0,135 BRDA:10001,420,1,0 BRDA:10002,421,0,0 -BRDA:10002,421,1,0 +BRDA:10002,421,1,135 BRDA:10003,422,0,0 BRDA:10003,422,1,0 BRDA:10007,423,0,0 -BRDA:10007,423,1,0 +BRDA:10007,423,1,135 BRDA:10008,424,0,0 BRDA:10008,424,1,0 -BRDA:10012,425,0,0 -BRDA:10012,425,1,0 -BRDA:10013,426,0,0 +BRDA:10012,425,0,5 +BRDA:10012,425,1,130 +BRDA:10013,426,0,5 BRDA:10013,426,1,0 BRDA:10017,427,0,0 -BRDA:10017,427,1,0 +BRDA:10017,427,1,135 BRDA:10018,428,0,0 BRDA:10018,428,1,0 BRDA:10022,429,0,0 -BRDA:10022,429,1,0 +BRDA:10022,429,1,135 BRDA:10023,430,0,0 BRDA:10023,430,1,0 -BRDA:10027,431,0,0 -BRDA:10027,431,1,0 -BRDA:10028,432,0,0 +BRDA:10027,431,0,5 +BRDA:10027,431,1,130 +BRDA:10028,432,0,5 BRDA:10028,432,1,0 BRDA:10032,433,0,0 -BRDA:10032,433,1,0 +BRDA:10032,433,1,135 BRDA:10033,434,0,0 BRDA:10033,434,1,0 -BRDA:10039,435,0,0 +BRDA:10039,435,0,135 BRDA:10039,435,1,0 -BRDA:10039,436,0,0 -BRDA:10039,436,1,0 -BRDA:10039,436,2,0 +BRDA:10039,436,0,135 +BRDA:10039,436,1,135 +BRDA:10039,436,2,135 BRDA:10042,437,0,0 -BRDA:10042,437,1,0 -BRDA:10042,438,0,0 -BRDA:10042,438,1,0 -BRDA:10042,438,2,0 +BRDA:10042,437,1,135 +BRDA:10042,438,0,135 +BRDA:10042,438,1,135 +BRDA:10042,438,2,135 BRDA:10090,439,0,0 -BRDA:10090,439,1,0 +BRDA:10090,439,1,8671 BRDA:10100,440,0,0 -BRDA:10100,440,1,0 +BRDA:10100,440,1,6 BRDA:10130,441,0,0 -BRDA:10130,441,1,0 -BRDA:10130,442,0,0 +BRDA:10130,441,1,6 +BRDA:10130,442,0,6 BRDA:10130,442,1,0 BRDA:10130,442,2,0 BRDA:10144,443,0,0 -BRDA:10144,443,1,0 +BRDA:10144,443,1,6 BRDA:10145,444,0,0 -BRDA:10145,444,1,0 +BRDA:10145,444,1,6 BRDA:10146,445,0,0 -BRDA:10146,445,1,0 -BRDA:10146,446,0,0 +BRDA:10146,445,1,6 +BRDA:10146,446,0,6 BRDA:10146,446,1,0 BRDA:10147,447,0,0 -BRDA:10147,447,1,0 +BRDA:10147,447,1,6 BRDA:10147,448,0,0 BRDA:10147,448,1,0 BRDA:10148,449,0,0 -BRDA:10148,449,1,0 +BRDA:10148,449,1,6 BRDA:10148,450,0,0 BRDA:10148,450,1,0 BRDA:10149,451,0,0 -BRDA:10149,451,1,0 +BRDA:10149,451,1,6 BRDA:10154,452,0,0 -BRDA:10154,452,1,0 +BRDA:10154,452,1,6 BRDA:10158,453,0,0 -BRDA:10158,453,1,0 +BRDA:10158,453,1,6 BRF:930 -BRH:4 +BRH:520 end_of_record TN: SF:src\main\server\util.js @@ -3071,26 +3079,26 @@ DA:21,1 DA:22,1 DA:25,1 DA:26,1 -DA:27,0 -DA:28,0 +DA:27,1 +DA:28,1 DA:29,0 -DA:31,0 +DA:31,1 DA:32,0 DA:33,0 DA:34,0 DA:36,0 -DA:38,0 -DA:39,0 -DA:40,0 -DA:41,0 -DA:42,0 +DA:38,1 +DA:39,1 +DA:40,1 +DA:41,1 +DA:42,1 DA:43,0 DA:44,0 DA:45,0 DA:47,0 -DA:49,0 -DA:50,0 -DA:56,0 +DA:49,1 +DA:50,1 +DA:56,1 DA:57,0 DA:58,0 DA:59,0 @@ -3199,7 +3207,7 @@ DA:232,0 DA:236,0 DA:237,0 DA:238,0 -DA:241,0 +DA:241,1 DA:242,0 DA:243,0 DA:244,0 @@ -3316,7 +3324,7 @@ DA:402,0 DA:406,0 DA:407,0 DA:408,0 -DA:411,0 +DA:411,1 DA:414,1 DA:415,0 DA:416,0 @@ -3360,20 +3368,20 @@ DA:535,0 DA:537,0 DA:539,1 LF:292 -LH:9 +LH:22 BRDA:28,0,0,0 -BRDA:28,0,1,0 +BRDA:28,0,1,1 BRDA:31,1,0,0 -BRDA:31,1,1,0 +BRDA:31,1,1,1 BRDA:42,2,0,0 -BRDA:42,2,1,0 -BRDA:42,3,0,0 +BRDA:42,2,1,1 +BRDA:42,3,0,1 BRDA:42,3,1,0 -BRDA:49,4,0,0 +BRDA:49,4,0,1 BRDA:49,4,1,0 BRDA:56,5,0,0 -BRDA:56,5,1,0 -BRDA:56,6,0,0 +BRDA:56,5,1,1 +BRDA:56,6,0,1 BRDA:56,6,1,0 BRDA:62,7,0,0 BRDA:62,7,1,0 @@ -3410,8 +3418,8 @@ BRDA:220,21,1,0 BRDA:236,22,0,0 BRDA:236,22,1,0 BRDA:241,23,0,0 -BRDA:241,23,1,0 -BRDA:241,24,0,0 +BRDA:241,23,1,1 +BRDA:241,24,0,1 BRDA:241,24,1,0 BRDA:247,25,0,0 BRDA:247,25,1,0 @@ -3474,112 +3482,141 @@ BRDA:453,52,1,0 BRDA:526,53,0,0 BRDA:526,53,1,0 BRF:112 +BRH:9 +end_of_record +TN: +SF:src\main\server\websocket.js +FN:3,(anonymous_0) +FN:6,(anonymous_1) +FN:15,(anonymous_2) +FNF:3 +FNH:1 +FNDA:0,(anonymous_0) +FNDA:0,(anonymous_1) +FNDA:224,(anonymous_2) +DA:1,1 +DA:2,1 +DA:3,1 +DA:4,0 +DA:5,0 +DA:6,0 +DA:7,0 +DA:8,0 +DA:10,0 +DA:11,0 +DA:15,1 +DA:16,224 +DA:17,0 +DA:18,0 +DA:20,0 +LF:15 +LH:5 +BRDA:8,0,0,0 +BRDA:8,0,1,0 +BRF:2 BRH:0 end_of_record TN: SF:src\main\server\adapter\asn\asn.js FN:20,cassFrameworkAsAsn -FN:71,(anonymous_1) -FN:210,fixScalars -FN:308,importFrameworkToCass -FN:441,asnFrameworkToCass -FN:503,importConceptPromise -FN:504,(anonymous_6) -FN:656,importJsonLdGraph -FN:674,(anonymous_8) -FN:674,(anonymous_9) -FN:678,(anonymous_10) -FN:678,(anonymous_11) -FN:688,asnEndpoint -FNF:13 -FNH:0 -FNDA:0,cassFrameworkAsAsn -FNDA:0,(anonymous_1) -FNDA:0,fixScalars +FN:68,(anonymous_1) +FN:305,importFrameworkToCass +FN:435,asnFrameworkToCass +FN:497,importConceptPromise +FN:647,importJsonLdGraph +FN:665,(anonymous_6) +FN:665,(anonymous_7) +FN:669,(anonymous_8) +FN:669,(anonymous_9) +FN:679,asnEndpoint +FNF:11 +FNH:3 +FNDA:1,cassFrameworkAsAsn +FNDA:2,(anonymous_1) FNDA:0,importFrameworkToCass FNDA:0,asnFrameworkToCass FNDA:0,importConceptPromise -FNDA:0,(anonymous_6) FNDA:0,importJsonLdGraph +FNDA:0,(anonymous_6) +FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) -FNDA:0,asnEndpoint +FNDA:1,asnEndpoint DA:1,1 DA:3,1 -DA:21,0 -DA:23,0 -DA:24,0 -DA:25,0 -DA:26,0 -DA:27,0 +DA:21,1 +DA:22,1 +DA:23,1 +DA:24,1 +DA:25,1 +DA:26,1 +DA:27,1 DA:28,0 -DA:29,0 +DA:29,1 DA:30,0 -DA:31,0 +DA:31,1 DA:32,0 DA:33,0 DA:34,0 DA:35,0 -DA:36,0 DA:37,0 DA:38,0 -DA:40,0 +DA:39,0 DA:41,0 DA:42,0 +DA:43,0 DA:44,0 DA:45,0 DA:46,0 -DA:47,0 DA:48,0 DA:49,0 -DA:51,0 DA:52,0 -DA:55,0 -DA:56,0 -DA:59,0 -DA:60,0 -DA:62,0 -DA:63,0 -DA:64,0 -DA:65,0 -DA:67,0 -DA:68,0 -DA:69,0 -DA:71,0 -DA:74,0 -DA:75,0 -DA:76,0 -DA:77,0 -DA:78,0 -DA:79,0 +DA:53,0 +DA:56,1 +DA:57,0 +DA:59,1 +DA:60,1 +DA:61,1 +DA:62,1 +DA:64,1 +DA:65,1 +DA:66,1 +DA:68,1 +DA:71,1 +DA:72,1 +DA:73,1 +DA:74,1 +DA:75,1 +DA:76,12 +DA:77,12 +DA:78,12 +DA:79,12 DA:80,0 -DA:81,0 -DA:82,0 -DA:83,0 -DA:86,0 -DA:87,0 -DA:89,0 -DA:90,0 -DA:91,0 -DA:92,0 -DA:93,0 -DA:95,0 -DA:97,0 -DA:98,0 -DA:99,0 -DA:100,0 +DA:83,1 +DA:84,1 +DA:86,10 +DA:87,10 +DA:88,10 +DA:89,10 +DA:90,10 +DA:92,10 +DA:94,10 +DA:95,10 +DA:96,10 +DA:97,10 +DA:98,10 +DA:99,10 DA:101,0 -DA:102,0 -DA:104,0 -DA:106,0 -DA:107,0 -DA:108,0 -DA:109,0 +DA:103,10 +DA:104,10 +DA:105,2 +DA:106,10 +DA:107,10 +DA:108,10 DA:110,0 -DA:111,0 +DA:112,10 DA:113,0 +DA:114,0 DA:115,0 DA:116,0 DA:117,0 @@ -3588,424 +3625,360 @@ DA:119,0 DA:120,0 DA:121,0 DA:122,0 -DA:123,0 DA:124,0 -DA:125,0 +DA:126,0 DA:127,0 -DA:129,0 +DA:128,0 DA:130,0 -DA:131,0 +DA:132,10 DA:133,0 +DA:134,0 DA:135,0 DA:136,0 DA:137,0 DA:138,0 DA:139,0 -DA:140,0 DA:141,0 DA:142,0 +DA:143,0 DA:144,0 DA:145,0 DA:146,0 DA:147,0 -DA:148,0 DA:149,0 -DA:150,0 +DA:151,10 DA:152,0 +DA:153,0 DA:154,0 DA:155,0 DA:156,0 DA:157,0 DA:158,0 -DA:159,0 DA:160,0 -DA:161,0 -DA:163,0 -DA:166,0 -DA:168,0 -DA:169,0 -DA:170,0 +DA:163,1 +DA:165,1 +DA:166,12 +DA:167,12 +DA:168,12 +DA:169,12 +DA:170,12 DA:171,0 -DA:172,0 -DA:173,0 -DA:174,0 -DA:175,0 -DA:176,0 -DA:177,0 -DA:178,0 -DA:180,0 -DA:181,0 -DA:184,0 -DA:185,0 -DA:188,0 -DA:189,0 -DA:190,0 -DA:191,0 -DA:192,0 -DA:193,0 -DA:195,0 -DA:196,0 -DA:199,0 -DA:200,0 -DA:201,0 -DA:202,0 -DA:211,0 -DA:212,0 -DA:213,0 -DA:214,0 -DA:216,0 -DA:217,0 -DA:218,0 -DA:219,0 -DA:220,0 -DA:221,0 -DA:222,0 -DA:223,0 -DA:224,0 -DA:225,0 -DA:227,0 -DA:228,0 -DA:229,0 -DA:230,0 -DA:231,0 -DA:232,0 -DA:235,0 -DA:236,0 -DA:237,0 -DA:241,0 -DA:243,0 -DA:244,0 -DA:245,0 -DA:247,0 -DA:248,0 -DA:249,0 -DA:253,0 -DA:257,0 -DA:258,0 -DA:261,0 -DA:262,0 -DA:263,0 -DA:264,0 -DA:265,0 -DA:266,0 -DA:269,0 -DA:270,0 -DA:271,0 -DA:272,0 -DA:276,0 -DA:277,0 -DA:279,0 -DA:280,0 -DA:281,0 -DA:282,0 -DA:284,0 -DA:285,0 -DA:286,0 -DA:288,0 -DA:291,0 -DA:292,0 -DA:296,0 -DA:298,0 -DA:302,0 +DA:172,12 +DA:173,178 +DA:174,22 +DA:175,22 +DA:177,178 +DA:178,12 +DA:181,12 +DA:182,12 +DA:185,1 +DA:186,1 +DA:187,1 +DA:188,19 +DA:189,3 +DA:190,3 +DA:192,19 +DA:193,1 +DA:196,1 +DA:197,1 +DA:198,1 +DA:199,1 +DA:306,0 +DA:307,0 +DA:308,0 DA:309,0 -DA:310,0 DA:311,0 DA:312,0 +DA:313,0 DA:314,0 DA:315,0 -DA:317,0 +DA:316,0 DA:318,0 DA:319,0 DA:320,0 DA:321,0 -DA:322,0 +DA:323,0 DA:324,0 DA:325,0 DA:326,0 -DA:327,0 DA:329,0 DA:330,0 -DA:331,0 DA:332,0 -DA:335,0 +DA:333,0 +DA:334,0 DA:336,0 DA:338,0 -DA:339,0 DA:340,0 +DA:341,0 DA:342,0 +DA:343,0 DA:344,0 +DA:345,0 DA:346,0 DA:347,0 DA:348,0 -DA:349,0 DA:350,0 DA:351,0 DA:352,0 DA:353,0 -DA:354,0 -DA:356,0 -DA:357,0 DA:358,0 DA:359,0 -DA:364,0 +DA:361,0 +DA:363,0 DA:365,0 DA:367,0 DA:369,0 +DA:370,0 DA:371,0 +DA:372,0 DA:373,0 -DA:375,0 -DA:376,0 -DA:377,0 -DA:378,0 -DA:379,0 -DA:380,0 +DA:374,0 +DA:381,0 +DA:382,0 +DA:383,0 +DA:384,0 +DA:385,0 DA:387,0 DA:388,0 DA:389,0 DA:390,0 -DA:391,0 +DA:392,0 DA:393,0 DA:394,0 DA:395,0 -DA:396,0 -DA:398,0 -DA:399,0 -DA:400,0 DA:401,0 +DA:402,0 +DA:403,0 +DA:405,0 DA:407,0 -DA:408,0 DA:409,0 DA:411,0 DA:413,0 -DA:415,0 +DA:414,0 +DA:416,0 DA:417,0 +DA:418,0 DA:419,0 DA:420,0 -DA:422,0 -DA:423,0 -DA:424,0 -DA:425,0 -DA:426,0 -DA:427,0 -DA:434,0 +DA:421,0 +DA:428,0 +DA:439,0 +DA:441,0 +DA:442,0 +DA:443,0 +DA:444,0 DA:445,0 -DA:447,0 +DA:446,0 DA:448,0 -DA:449,0 -DA:450,0 DA:451,0 -DA:452,0 DA:454,0 +DA:455,0 DA:457,0 -DA:460,0 +DA:458,0 DA:461,0 -DA:463,0 +DA:462,0 DA:464,0 +DA:465,0 DA:467,0 DA:468,0 DA:470,0 DA:471,0 +DA:472,0 DA:473,0 -DA:474,0 -DA:476,0 DA:477,0 DA:478,0 -DA:479,0 +DA:480,0 DA:483,0 -DA:484,0 -DA:486,0 -DA:489,0 -DA:499,1 -DA:500,1 -DA:504,0 +DA:493,1 +DA:494,1 +DA:498,0 +DA:501,0 +DA:502,0 +DA:503,0 DA:505,0 +DA:506,0 +DA:507,0 DA:508,0 DA:509,0 -DA:510,0 -DA:512,0 DA:513,0 DA:514,0 -DA:515,0 -DA:516,0 +DA:517,0 +DA:519,0 DA:520,0 DA:521,0 DA:524,0 DA:526,0 DA:527,0 -DA:528,0 +DA:529,0 DA:531,0 -DA:533,0 +DA:532,0 DA:534,0 +DA:535,0 +DA:536,0 DA:537,0 -DA:539,0 +DA:538,0 DA:540,0 +DA:541,0 DA:542,0 DA:543,0 DA:544,0 DA:545,0 -DA:546,0 +DA:547,0 DA:548,0 DA:549,0 -DA:550,0 -DA:551,0 DA:552,0 -DA:553,0 -DA:555,0 DA:556,0 DA:557,0 DA:560,0 +DA:563,0 DA:564,0 -DA:565,0 -DA:568,0 -DA:571,0 -DA:572,0 +DA:567,0 +DA:569,0 +DA:570,0 +DA:573,0 DA:575,0 DA:577,0 DA:578,0 +DA:580,0 DA:581,0 +DA:582,0 DA:583,0 -DA:585,0 +DA:584,0 DA:586,0 +DA:587,0 DA:588,0 DA:589,0 DA:590,0 -DA:591,0 DA:592,0 -DA:594,0 +DA:593,0 DA:595,0 DA:596,0 -DA:597,0 DA:598,0 -DA:600,0 +DA:599,0 DA:601,0 -DA:603,0 +DA:602,0 DA:604,0 -DA:606,0 +DA:605,0 DA:607,0 -DA:609,0 +DA:608,0 DA:610,0 -DA:612,0 -DA:613,0 -DA:615,0 -DA:616,0 +DA:611,0 +DA:614,0 +DA:617,0 DA:618,0 -DA:619,0 -DA:622,0 -DA:625,0 -DA:626,0 +DA:621,0 +DA:623,0 +DA:624,0 +DA:627,0 DA:629,0 DA:631,0 DA:632,0 +DA:634,0 DA:635,0 -DA:637,0 +DA:638,0 DA:639,0 -DA:640,0 DA:642,0 DA:643,0 -DA:646,0 -DA:647,0 -DA:650,0 +DA:648,0 +DA:649,0 DA:651,0 +DA:652,0 +DA:653,0 +DA:654,0 +DA:656,0 DA:657,0 -DA:658,0 +DA:659,0 DA:660,0 DA:661,0 -DA:662,0 DA:663,0 +DA:664,0 DA:665,0 DA:666,0 -DA:668,0 DA:669,0 DA:670,0 DA:672,0 DA:673,0 -DA:674,0 DA:675,0 -DA:678,0 -DA:679,0 -DA:681,0 +DA:680,1 +DA:681,1 DA:682,0 +DA:683,0 DA:684,0 -DA:689,0 -DA:690,0 -DA:691,0 -DA:692,0 -DA:693,0 -DA:694,0 -DA:695,0 -DA:699,1 -DA:700,1 -LF:429 -LH:6 -BRDA:23,0,0,0 -BRDA:23,0,1,0 -BRDA:23,1,0,0 -BRDA:23,1,1,0 -BRDA:28,2,0,0 -BRDA:28,2,1,0 -BRDA:30,3,0,0 -BRDA:30,3,1,0 -BRDA:30,4,0,0 -BRDA:30,4,1,0 -BRDA:30,4,2,0 -BRDA:32,5,0,0 -BRDA:32,5,1,0 -BRDA:34,6,0,0 -BRDA:34,6,1,0 -BRDA:37,7,0,0 -BRDA:37,7,1,0 -BRDA:44,8,0,0 -BRDA:44,8,1,0 -BRDA:47,9,0,0 -BRDA:47,9,1,0 -BRDA:51,10,0,0 -BRDA:51,10,1,0 -BRDA:59,11,0,0 -BRDA:59,11,1,0 -BRDA:64,12,0,0 -BRDA:64,12,1,0 -BRDA:64,13,0,0 -BRDA:64,13,1,0 -BRDA:65,14,0,0 -BRDA:65,14,1,0 -BRDA:65,15,0,0 -BRDA:65,15,1,0 -BRDA:77,16,0,0 -BRDA:77,16,1,0 -BRDA:80,17,0,0 -BRDA:80,17,1,0 -BRDA:82,18,0,0 -BRDA:82,18,1,0 -BRDA:86,19,0,0 -BRDA:86,19,1,0 -BRDA:89,20,0,0 -BRDA:89,20,1,0 -BRDA:91,21,0,0 -BRDA:91,21,1,0 -BRDA:91,22,0,0 -BRDA:91,22,1,0 -BRDA:92,23,0,0 -BRDA:92,23,1,0 -BRDA:95,24,0,0 -BRDA:95,24,1,0 -BRDA:95,25,0,0 +DA:685,0 +DA:686,0 +DA:690,1 +DA:691,1 +LF:366 +LH:85 +BRDA:25,0,0,1 +BRDA:25,0,1,0 +BRDA:27,1,0,0 +BRDA:27,1,1,1 +BRDA:27,2,0,1 +BRDA:27,2,1,1 +BRDA:27,2,2,1 +BRDA:29,3,0,0 +BRDA:29,3,1,1 +BRDA:31,4,0,0 +BRDA:31,4,1,1 +BRDA:34,5,0,0 +BRDA:34,5,1,0 +BRDA:41,6,0,0 +BRDA:41,6,1,0 +BRDA:44,7,0,0 +BRDA:44,7,1,0 +BRDA:48,8,0,0 +BRDA:48,8,1,0 +BRDA:56,9,0,0 +BRDA:56,9,1,1 +BRDA:61,10,0,0 +BRDA:61,10,1,1 +BRDA:61,11,0,1 +BRDA:61,11,1,1 +BRDA:62,12,0,0 +BRDA:62,12,1,1 +BRDA:62,13,0,1 +BRDA:62,13,1,1 +BRDA:74,14,0,1 +BRDA:74,14,1,0 +BRDA:77,15,0,0 +BRDA:77,15,1,12 +BRDA:79,16,0,0 +BRDA:79,16,1,12 +BRDA:83,17,0,1 +BRDA:83,17,1,0 +BRDA:86,18,0,0 +BRDA:86,18,1,10 +BRDA:88,19,0,0 +BRDA:88,19,1,10 +BRDA:88,20,0,10 +BRDA:88,20,1,10 +BRDA:89,21,0,10 +BRDA:89,21,1,0 +BRDA:92,22,0,0 +BRDA:92,22,1,10 +BRDA:92,23,0,10 +BRDA:92,23,1,10 +BRDA:94,24,0,10 +BRDA:94,24,1,0 +BRDA:95,25,0,10 BRDA:95,25,1,0 -BRDA:97,26,0,0 +BRDA:97,26,0,10 BRDA:97,26,1,0 -BRDA:98,27,0,0 +BRDA:98,27,0,10 BRDA:98,27,1,0 -BRDA:100,28,0,0 -BRDA:100,28,1,0 -BRDA:101,29,0,0 -BRDA:101,29,1,0 -BRDA:106,30,0,0 +BRDA:103,28,0,10 +BRDA:103,28,1,0 +BRDA:104,29,0,2 +BRDA:104,29,1,8 +BRDA:106,30,0,10 BRDA:106,30,1,0 -BRDA:107,31,0,0 +BRDA:107,31,0,10 BRDA:107,31,1,0 -BRDA:109,32,0,0 -BRDA:109,32,1,0 -BRDA:110,33,0,0 -BRDA:110,33,1,0 +BRDA:112,32,0,0 +BRDA:112,32,1,10 +BRDA:114,33,0,0 +BRDA:114,33,1,0 BRDA:115,34,0,0 BRDA:115,34,1,0 BRDA:117,35,0,0 @@ -4016,259 +3989,201 @@ BRDA:120,37,0,0 BRDA:120,37,1,0 BRDA:121,38,0,0 BRDA:121,38,1,0 -BRDA:123,39,0,0 -BRDA:123,39,1,0 -BRDA:124,40,0,0 -BRDA:124,40,1,0 -BRDA:129,41,0,0 -BRDA:129,41,1,0 -BRDA:130,42,0,0 -BRDA:130,42,1,0 +BRDA:126,39,0,0 +BRDA:126,39,1,0 +BRDA:127,40,0,0 +BRDA:127,40,1,0 +BRDA:132,41,0,0 +BRDA:132,41,1,10 +BRDA:134,42,0,0 +BRDA:134,42,1,0 BRDA:135,43,0,0 BRDA:135,43,1,0 BRDA:137,44,0,0 BRDA:137,44,1,0 BRDA:138,45,0,0 BRDA:138,45,1,0 -BRDA:140,46,0,0 -BRDA:140,46,1,0 -BRDA:141,47,0,0 -BRDA:141,47,1,0 +BRDA:142,46,0,0 +BRDA:142,46,1,0 +BRDA:143,47,0,0 +BRDA:143,47,1,0 BRDA:145,48,0,0 BRDA:145,48,1,0 BRDA:146,49,0,0 BRDA:146,49,1,0 -BRDA:148,50,0,0 -BRDA:148,50,1,0 -BRDA:149,51,0,0 -BRDA:149,51,1,0 +BRDA:151,50,0,0 +BRDA:151,50,1,10 +BRDA:153,51,0,0 +BRDA:153,51,1,0 BRDA:154,52,0,0 BRDA:154,52,1,0 BRDA:156,53,0,0 BRDA:156,53,1,0 BRDA:157,54,0,0 BRDA:157,54,1,0 -BRDA:159,55,0,0 -BRDA:159,55,1,0 -BRDA:160,56,0,0 -BRDA:160,56,1,0 -BRDA:171,57,0,0 -BRDA:171,57,1,0 -BRDA:173,58,0,0 -BRDA:173,58,1,0 -BRDA:176,59,0,0 -BRDA:176,59,1,0 -BRDA:180,60,0,0 -BRDA:180,60,1,0 -BRDA:191,61,0,0 -BRDA:191,61,1,0 -BRDA:195,62,0,0 -BRDA:195,62,1,0 -BRDA:216,63,0,0 -BRDA:216,63,1,0 -BRDA:220,64,0,0 -BRDA:220,64,1,0 -BRDA:227,65,0,0 -BRDA:227,65,1,0 -BRDA:228,66,0,0 -BRDA:228,66,1,0 -BRDA:229,67,0,0 -BRDA:229,67,1,0 -BRDA:230,68,0,0 -BRDA:230,68,1,0 -BRDA:230,69,0,0 -BRDA:230,69,1,0 -BRDA:235,70,0,0 -BRDA:235,70,1,0 -BRDA:235,71,0,0 -BRDA:235,71,1,0 -BRDA:243,72,0,0 -BRDA:243,72,1,0 -BRDA:243,73,0,0 -BRDA:243,73,1,0 -BRDA:247,74,0,0 -BRDA:247,74,1,0 -BRDA:247,75,0,0 -BRDA:247,75,1,0 -BRDA:257,76,0,0 -BRDA:257,76,1,0 -BRDA:261,77,0,0 -BRDA:261,77,1,0 -BRDA:262,78,0,0 -BRDA:262,78,1,0 -BRDA:263,79,0,0 -BRDA:263,79,1,0 -BRDA:263,80,0,0 -BRDA:263,80,1,0 -BRDA:269,81,0,0 -BRDA:269,81,1,0 -BRDA:269,82,0,0 -BRDA:269,82,1,0 -BRDA:279,83,0,0 -BRDA:279,83,1,0 -BRDA:279,84,0,0 -BRDA:279,84,1,0 -BRDA:284,85,0,0 -BRDA:284,85,1,0 -BRDA:284,86,0,0 -BRDA:284,86,1,0 -BRDA:291,87,0,0 -BRDA:291,87,1,0 -BRDA:314,88,0,0 -BRDA:314,88,1,0 -BRDA:314,89,0,0 -BRDA:314,89,1,0 -BRDA:347,90,0,0 -BRDA:347,90,1,0 -BRDA:347,91,0,0 -BRDA:347,91,1,0 -BRDA:356,92,0,0 -BRDA:356,92,1,0 -BRDA:387,93,0,0 -BRDA:387,93,1,0 -BRDA:387,94,0,0 -BRDA:387,94,1,0 -BRDA:389,95,0,0 -BRDA:389,95,1,0 -BRDA:398,96,0,0 -BRDA:398,96,1,0 -BRDA:407,97,0,0 -BRDA:407,97,1,0 -BRDA:447,98,0,0 -BRDA:447,98,1,0 -BRDA:447,99,0,0 -BRDA:447,99,1,0 -BRDA:449,100,0,0 -BRDA:449,100,1,0 -BRDA:451,101,0,0 -BRDA:451,101,1,0 -BRDA:451,102,0,0 -BRDA:451,102,1,0 -BRDA:470,103,0,0 -BRDA:470,103,1,0 -BRDA:470,104,0,0 -BRDA:470,104,1,0 -BRDA:476,105,0,0 -BRDA:476,105,1,0 -BRDA:478,106,0,0 -BRDA:478,106,1,0 -BRDA:483,107,0,0 -BRDA:483,107,1,0 -BRDA:483,108,0,0 -BRDA:483,108,1,0 -BRDA:499,109,0,1 -BRDA:499,109,1,0 -BRDA:508,110,0,0 -BRDA:508,110,1,0 -BRDA:510,111,0,0 -BRDA:510,111,1,0 -BRDA:510,112,0,0 -BRDA:510,112,1,0 -BRDA:510,112,2,0 -BRDA:510,112,3,0 -BRDA:514,113,0,0 -BRDA:514,113,1,0 -BRDA:520,114,0,0 -BRDA:520,114,1,0 -BRDA:526,115,0,0 -BRDA:526,115,1,0 -BRDA:526,116,0,0 -BRDA:526,116,1,0 -BRDA:533,117,0,0 -BRDA:533,117,1,0 -BRDA:542,118,0,0 -BRDA:542,118,1,0 -BRDA:542,119,0,0 -BRDA:542,119,1,0 -BRDA:545,120,0,0 -BRDA:545,120,1,0 -BRDA:552,121,0,0 -BRDA:552,121,1,0 -BRDA:555,122,0,0 -BRDA:555,122,1,0 -BRDA:555,123,0,0 -BRDA:555,123,1,0 -BRDA:556,124,0,0 -BRDA:556,124,1,0 -BRDA:556,125,0,0 -BRDA:556,125,1,0 -BRDA:564,126,0,0 -BRDA:564,126,1,0 -BRDA:564,127,0,0 -BRDA:564,127,1,0 -BRDA:568,128,0,0 -BRDA:568,128,1,0 -BRDA:568,129,0,0 -BRDA:568,129,1,0 -BRDA:571,130,0,0 -BRDA:571,130,1,0 -BRDA:577,131,0,0 -BRDA:577,131,1,0 -BRDA:588,132,0,0 -BRDA:588,132,1,0 -BRDA:588,133,0,0 -BRDA:588,133,1,0 -BRDA:591,134,0,0 -BRDA:591,134,1,0 -BRDA:597,135,0,0 -BRDA:597,135,1,0 -BRDA:600,136,0,0 -BRDA:600,136,1,0 -BRDA:600,137,0,0 -BRDA:600,137,1,0 -BRDA:603,138,0,0 -BRDA:603,138,1,0 -BRDA:603,139,0,0 -BRDA:603,139,1,0 -BRDA:606,140,0,0 -BRDA:606,140,1,0 -BRDA:606,141,0,0 -BRDA:606,141,1,0 -BRDA:609,142,0,0 -BRDA:609,142,1,0 -BRDA:609,143,0,0 -BRDA:609,143,1,0 -BRDA:612,144,0,0 -BRDA:612,144,1,0 -BRDA:612,145,0,0 -BRDA:612,145,1,0 -BRDA:615,146,0,0 -BRDA:615,146,1,0 -BRDA:615,147,0,0 -BRDA:615,147,1,0 -BRDA:618,148,0,0 -BRDA:618,148,1,0 -BRDA:618,149,0,0 -BRDA:618,149,1,0 -BRDA:622,150,0,0 -BRDA:622,150,1,0 -BRDA:622,151,0,0 -BRDA:622,151,1,0 -BRDA:625,152,0,0 -BRDA:625,152,1,0 -BRDA:631,153,0,0 -BRDA:631,153,1,0 -BRDA:668,154,0,0 -BRDA:668,154,1,0 -BRDA:668,155,0,0 -BRDA:668,155,1,0 -BRDA:681,156,0,0 -BRDA:681,156,1,0 -BRDA:681,157,0,0 -BRDA:681,157,1,0 -BRDA:681,157,2,0 -BRDA:689,158,0,0 -BRDA:689,158,1,0 -BRDA:691,159,0,0 -BRDA:691,159,1,0 -BRDA:691,160,0,0 -BRDA:691,160,1,0 -BRDA:693,161,0,0 -BRDA:693,161,1,0 -BRDA:699,162,0,1 -BRDA:699,162,1,0 -BRF:330 -BRH:2 +BRDA:168,55,0,0 +BRDA:168,55,1,12 +BRDA:170,56,0,0 +BRDA:170,56,1,12 +BRDA:173,57,0,22 +BRDA:173,57,1,156 +BRDA:177,58,0,12 +BRDA:177,58,1,166 +BRDA:188,59,0,3 +BRDA:188,59,1,16 +BRDA:192,60,0,1 +BRDA:192,60,1,18 +BRDA:341,61,0,0 +BRDA:341,61,1,0 +BRDA:341,62,0,0 +BRDA:341,62,1,0 +BRDA:350,63,0,0 +BRDA:350,63,1,0 +BRDA:381,64,0,0 +BRDA:381,64,1,0 +BRDA:381,65,0,0 +BRDA:381,65,1,0 +BRDA:383,66,0,0 +BRDA:383,66,1,0 +BRDA:392,67,0,0 +BRDA:392,67,1,0 +BRDA:401,68,0,0 +BRDA:401,68,1,0 +BRDA:441,69,0,0 +BRDA:441,69,1,0 +BRDA:441,70,0,0 +BRDA:441,70,1,0 +BRDA:443,71,0,0 +BRDA:443,71,1,0 +BRDA:445,72,0,0 +BRDA:445,72,1,0 +BRDA:445,73,0,0 +BRDA:445,73,1,0 +BRDA:464,74,0,0 +BRDA:464,74,1,0 +BRDA:464,75,0,0 +BRDA:464,75,1,0 +BRDA:470,76,0,0 +BRDA:470,76,1,0 +BRDA:472,77,0,0 +BRDA:472,77,1,0 +BRDA:477,78,0,0 +BRDA:477,78,1,0 +BRDA:477,79,0,0 +BRDA:477,79,1,0 +BRDA:493,80,0,1 +BRDA:493,80,1,0 +BRDA:501,81,0,0 +BRDA:501,81,1,0 +BRDA:503,82,0,0 +BRDA:503,82,1,0 +BRDA:503,83,0,0 +BRDA:503,83,1,0 +BRDA:503,83,2,0 +BRDA:503,83,3,0 +BRDA:507,84,0,0 +BRDA:507,84,1,0 +BRDA:513,85,0,0 +BRDA:513,85,1,0 +BRDA:519,86,0,0 +BRDA:519,86,1,0 +BRDA:519,87,0,0 +BRDA:519,87,1,0 +BRDA:526,88,0,0 +BRDA:526,88,1,0 +BRDA:534,89,0,0 +BRDA:534,89,1,0 +BRDA:534,90,0,0 +BRDA:534,90,1,0 +BRDA:537,91,0,0 +BRDA:537,91,1,0 +BRDA:544,92,0,0 +BRDA:544,92,1,0 +BRDA:547,93,0,0 +BRDA:547,93,1,0 +BRDA:547,94,0,0 +BRDA:547,94,1,0 +BRDA:548,95,0,0 +BRDA:548,95,1,0 +BRDA:548,96,0,0 +BRDA:548,96,1,0 +BRDA:556,97,0,0 +BRDA:556,97,1,0 +BRDA:556,98,0,0 +BRDA:556,98,1,0 +BRDA:560,99,0,0 +BRDA:560,99,1,0 +BRDA:560,100,0,0 +BRDA:560,100,1,0 +BRDA:563,101,0,0 +BRDA:563,101,1,0 +BRDA:569,102,0,0 +BRDA:569,102,1,0 +BRDA:580,103,0,0 +BRDA:580,103,1,0 +BRDA:580,104,0,0 +BRDA:580,104,1,0 +BRDA:583,105,0,0 +BRDA:583,105,1,0 +BRDA:589,106,0,0 +BRDA:589,106,1,0 +BRDA:592,107,0,0 +BRDA:592,107,1,0 +BRDA:592,108,0,0 +BRDA:592,108,1,0 +BRDA:595,109,0,0 +BRDA:595,109,1,0 +BRDA:595,110,0,0 +BRDA:595,110,1,0 +BRDA:598,111,0,0 +BRDA:598,111,1,0 +BRDA:598,112,0,0 +BRDA:598,112,1,0 +BRDA:601,113,0,0 +BRDA:601,113,1,0 +BRDA:601,114,0,0 +BRDA:601,114,1,0 +BRDA:604,115,0,0 +BRDA:604,115,1,0 +BRDA:604,116,0,0 +BRDA:604,116,1,0 +BRDA:607,117,0,0 +BRDA:607,117,1,0 +BRDA:607,118,0,0 +BRDA:607,118,1,0 +BRDA:610,119,0,0 +BRDA:610,119,1,0 +BRDA:610,120,0,0 +BRDA:610,120,1,0 +BRDA:614,121,0,0 +BRDA:614,121,1,0 +BRDA:614,122,0,0 +BRDA:614,122,1,0 +BRDA:617,123,0,0 +BRDA:617,123,1,0 +BRDA:623,124,0,0 +BRDA:623,124,1,0 +BRDA:659,125,0,0 +BRDA:659,125,1,0 +BRDA:659,126,0,0 +BRDA:659,126,1,0 +BRDA:672,127,0,0 +BRDA:672,127,1,0 +BRDA:672,128,0,0 +BRDA:672,128,1,0 +BRDA:672,128,2,0 +BRDA:680,129,0,1 +BRDA:680,129,1,0 +BRDA:682,130,0,0 +BRDA:682,130,1,0 +BRDA:682,131,0,0 +BRDA:682,131,1,0 +BRDA:684,132,0,0 +BRDA:684,132,1,0 +BRDA:690,133,0,1 +BRDA:690,133,1,0 +BRF:272 +BRH:51 end_of_record TN: SF:src\main\server\adapter\case\caseAdapter.js @@ -4295,99 +4210,99 @@ FN:400,(anonymous_19) FN:440,(anonymous_20) FN:451,(anonymous_21) FNF:22 -FNH:0 +FNH:11 FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) +FNDA:126,(anonymous_1) FNDA:0,(anonymous_2) FNDA:0,(anonymous_3) -FNDA:0,(anonymous_4) +FNDA:72,(anonymous_4) FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) +FNDA:10,(anonymous_6) +FNDA:239,(anonymous_7) +FNDA:4104,(anonymous_8) +FNDA:4104,(anonymous_9) +FNDA:125,(anonymous_10) FNDA:0,(anonymous_11) FNDA:0,(anonymous_12) FNDA:0,(anonymous_13) -FNDA:0,(anonymous_14) -FNDA:0,(anonymous_15) +FNDA:52,(anonymous_14) +FNDA:10,(anonymous_15) FNDA:0,(anonymous_16) FNDA:0,(anonymous_17) -FNDA:0,(anonymous_18) -FNDA:0,(anonymous_19) +FNDA:1,(anonymous_18) +FNDA:2,(anonymous_19) FNDA:0,(anonymous_20) FNDA:0,(anonymous_21) DA:1,1 DA:3,1 DA:4,0 DA:19,1 -DA:20,0 -DA:21,0 -DA:22,0 -DA:23,0 -DA:24,0 +DA:20,126 +DA:21,126 +DA:22,1 +DA:23,1 +DA:24,1 DA:25,0 -DA:26,0 +DA:26,1 DA:27,0 -DA:28,0 +DA:28,1 DA:29,0 -DA:30,0 +DA:30,1 DA:31,0 DA:32,0 DA:33,0 DA:35,0 DA:36,0 DA:37,0 -DA:41,0 +DA:41,126 DA:42,0 -DA:43,0 -DA:44,0 -DA:45,0 +DA:43,126 +DA:44,126 +DA:45,126 DA:47,1 DA:48,0 DA:49,0 DA:50,0 DA:52,1 -DA:53,0 -DA:54,0 -DA:55,0 -DA:56,0 -DA:57,0 -DA:58,0 -DA:59,0 -DA:60,0 -DA:61,0 -DA:63,0 -DA:64,0 -DA:65,0 -DA:66,0 -DA:67,0 -DA:68,0 -DA:69,0 -DA:70,0 -DA:71,0 +DA:53,72 +DA:54,72 +DA:55,48 +DA:56,24 +DA:57,24 +DA:58,24 +DA:59,24 +DA:60,12 +DA:61,12 +DA:63,24 +DA:64,12 +DA:65,12 +DA:66,12 +DA:67,12 +DA:68,12 +DA:69,12 +DA:70,12 +DA:71,12 DA:72,0 -DA:73,0 +DA:73,12 DA:74,0 DA:75,0 DA:76,0 DA:78,0 DA:79,0 DA:80,0 -DA:83,0 +DA:83,12 DA:84,0 -DA:86,0 -DA:87,0 -DA:89,0 -DA:90,0 +DA:86,12 +DA:87,12 +DA:89,24 +DA:90,24 DA:92,1 -DA:93,0 -DA:94,0 -DA:95,0 +DA:93,10 +DA:94,10 +DA:95,10 DA:96,0 DA:97,0 -DA:99,0 +DA:99,10 DA:100,0 DA:101,0 DA:102,0 @@ -4399,27 +4314,27 @@ DA:107,0 DA:108,0 DA:109,0 DA:110,0 -DA:112,0 +DA:112,10 DA:114,1 -DA:115,0 -DA:116,0 -DA:117,0 +DA:115,239 +DA:116,239 +DA:117,4354 DA:118,0 -DA:119,0 -DA:120,0 -DA:122,0 -DA:123,0 -DA:124,0 -DA:128,0 -DA:129,0 -DA:130,0 -DA:131,0 -DA:133,0 -DA:134,0 -DA:136,0 +DA:119,4354 +DA:120,250 +DA:122,4354 +DA:123,811 +DA:124,811 +DA:128,239 +DA:129,239 +DA:130,4104 +DA:131,4104 +DA:133,239 +DA:134,4104 +DA:136,239 DA:147,1 -DA:148,0 -DA:149,0 +DA:148,125 +DA:149,125 DA:150,0 DA:151,0 DA:152,0 @@ -4430,26 +4345,26 @@ DA:156,0 DA:157,0 DA:158,0 DA:160,0 -DA:162,0 -DA:163,0 -DA:164,0 -DA:165,0 -DA:166,0 -DA:167,0 -DA:168,0 -DA:169,0 -DA:170,0 -DA:171,0 -DA:172,0 -DA:174,0 -DA:175,0 -DA:178,0 -DA:179,0 -DA:180,0 -DA:181,0 -DA:182,0 -DA:183,0 -DA:188,0 +DA:162,125 +DA:163,125 +DA:164,125 +DA:165,125 +DA:166,125 +DA:167,125 +DA:168,125 +DA:169,125 +DA:170,2625 +DA:171,875 +DA:172,875 +DA:174,2625 +DA:175,125 +DA:178,125 +DA:179,125 +DA:180,125 +DA:181,125 +DA:182,125 +DA:183,125 +DA:188,125 DA:198,1 DA:199,0 DA:209,1 @@ -4457,147 +4372,147 @@ DA:210,0 DA:220,1 DA:221,0 DA:231,1 -DA:232,0 -DA:233,0 -DA:234,0 -DA:235,0 -DA:236,0 -DA:237,0 -DA:238,0 -DA:239,0 -DA:240,0 -DA:241,0 -DA:242,0 -DA:243,0 -DA:244,0 +DA:232,52 +DA:233,52 +DA:234,52 +DA:235,52 +DA:236,52 +DA:237,52 +DA:238,52 +DA:239,52 +DA:240,12 +DA:241,52 +DA:242,52 +DA:243,52 +DA:244,52 DA:246,0 -DA:248,0 -DA:249,0 -DA:250,0 -DA:251,0 -DA:253,0 -DA:254,0 -DA:257,0 -DA:258,0 -DA:259,0 -DA:260,0 -DA:261,0 -DA:262,0 -DA:263,0 -DA:264,0 -DA:265,0 -DA:266,0 -DA:267,0 -DA:268,0 -DA:270,0 -DA:271,0 -DA:272,0 +DA:248,52 +DA:249,758 +DA:250,186 +DA:251,186 +DA:253,758 +DA:254,52 +DA:257,52 +DA:258,52 +DA:259,52 +DA:260,52 +DA:261,52 +DA:262,52 +DA:263,52 +DA:264,30 +DA:265,52 +DA:266,52 +DA:267,52 +DA:268,52 +DA:270,52 +DA:271,52 +DA:272,52 DA:273,0 DA:274,0 DA:275,0 DA:276,0 DA:277,0 DA:278,0 -DA:281,0 -DA:282,0 -DA:283,0 -DA:284,0 -DA:285,0 -DA:286,0 +DA:281,52 +DA:282,52 +DA:283,52 +DA:284,52 +DA:285,52 +DA:286,52 DA:296,1 -DA:297,0 -DA:298,0 -DA:299,0 -DA:300,0 -DA:301,0 -DA:302,0 -DA:303,0 -DA:304,0 -DA:305,0 -DA:306,0 -DA:308,0 -DA:309,0 -DA:312,0 -DA:313,0 -DA:314,0 +DA:297,10 +DA:298,10 +DA:299,10 +DA:300,10 +DA:301,10 +DA:302,10 +DA:303,10 +DA:304,90 +DA:305,20 +DA:306,20 +DA:308,90 +DA:309,10 +DA:312,10 +DA:313,10 +DA:314,10 DA:315,0 DA:316,0 DA:317,0 DA:318,0 DA:319,0 DA:320,0 -DA:323,0 -DA:324,0 -DA:325,0 -DA:326,0 -DA:327,0 -DA:328,0 -DA:329,0 +DA:323,10 +DA:324,10 +DA:325,10 +DA:326,10 +DA:327,10 +DA:328,10 +DA:329,10 DA:330,0 -DA:331,0 -DA:332,0 -DA:333,0 -DA:334,0 -DA:335,0 -DA:336,0 -DA:337,0 -DA:338,0 -DA:339,0 -DA:340,0 -DA:341,0 -DA:342,0 -DA:343,0 -DA:344,0 -DA:345,0 -DA:346,0 -DA:347,0 -DA:348,0 -DA:349,0 -DA:350,0 -DA:351,0 -DA:352,0 +DA:331,10 +DA:332,10 +DA:333,10 +DA:334,10 +DA:335,10 +DA:336,10 +DA:337,10 +DA:338,10 +DA:339,10 +DA:340,10 +DA:341,10 +DA:342,10 +DA:343,10 +DA:344,10 +DA:345,10 +DA:346,10 +DA:347,10 +DA:348,10 +DA:349,10 +DA:350,10 +DA:351,10 +DA:352,10 DA:362,1 DA:363,0 DA:373,1 DA:374,0 DA:385,1 -DA:386,0 -DA:387,0 -DA:388,0 -DA:390,0 -DA:391,0 -DA:392,0 -DA:393,0 -DA:394,0 -DA:395,0 -DA:397,0 -DA:398,0 -DA:400,0 -DA:401,0 -DA:403,0 -DA:404,0 -DA:405,0 -DA:406,0 -DA:407,0 -DA:408,0 -DA:409,0 -DA:410,0 -DA:411,0 -DA:412,0 -DA:413,0 -DA:414,0 -DA:417,0 -DA:418,0 -DA:419,0 -DA:420,0 -DA:421,0 -DA:422,0 -DA:423,0 -DA:424,0 -DA:425,0 -DA:428,0 -DA:429,0 -DA:430,0 +DA:386,1 +DA:387,1 +DA:388,1 +DA:390,1 +DA:391,1 +DA:392,1 +DA:393,1 +DA:394,1 +DA:395,1 +DA:397,1 +DA:398,1 +DA:400,1 +DA:401,1 +DA:403,1 +DA:404,1 +DA:405,1 +DA:406,1 +DA:407,1 +DA:408,1 +DA:409,12 +DA:410,12 +DA:411,12 +DA:412,12 +DA:413,12 +DA:414,12 +DA:417,1 +DA:418,1 +DA:419,1 +DA:420,10 +DA:421,10 +DA:422,10 +DA:423,10 +DA:424,10 +DA:425,10 +DA:428,1 +DA:429,1 +DA:430,1 DA:440,1 DA:441,0 DA:451,1 @@ -4615,70 +4530,70 @@ DA:464,1 DA:465,1 DA:466,1 LF:296 -LH:30 -BRDA:21,0,0,0 -BRDA:21,0,1,0 -BRDA:21,1,0,0 -BRDA:21,1,1,0 -BRDA:21,1,2,0 -BRDA:22,2,0,0 +LH:229 +BRDA:21,0,0,1 +BRDA:21,0,1,125 +BRDA:21,1,0,126 +BRDA:21,1,1,125 +BRDA:21,1,2,125 +BRDA:22,2,0,1 BRDA:22,2,1,0 BRDA:24,3,0,0 -BRDA:24,3,1,0 -BRDA:24,4,0,0 -BRDA:24,4,1,0 -BRDA:24,4,2,0 +BRDA:24,3,1,1 +BRDA:24,4,0,1 +BRDA:24,4,1,1 +BRDA:24,4,2,1 BRDA:26,5,0,0 -BRDA:26,5,1,0 -BRDA:26,6,0,0 +BRDA:26,5,1,1 +BRDA:26,6,0,1 BRDA:26,6,1,0 BRDA:28,7,0,0 -BRDA:28,7,1,0 +BRDA:28,7,1,1 BRDA:30,8,0,0 -BRDA:30,8,1,0 +BRDA:30,8,1,1 BRDA:35,9,0,0 BRDA:35,9,1,0 BRDA:41,10,0,0 -BRDA:41,10,1,0 +BRDA:41,10,1,126 BRDA:48,11,0,0 BRDA:48,11,1,0 -BRDA:54,12,0,0 -BRDA:54,12,1,0 -BRDA:59,13,0,0 -BRDA:59,13,1,0 -BRDA:63,14,0,0 -BRDA:63,14,1,0 -BRDA:63,15,0,0 -BRDA:63,15,1,0 -BRDA:65,16,0,0 +BRDA:54,12,0,48 +BRDA:54,12,1,24 +BRDA:59,13,0,12 +BRDA:59,13,1,12 +BRDA:63,14,0,12 +BRDA:63,14,1,12 +BRDA:63,15,0,24 +BRDA:63,15,1,12 +BRDA:65,16,0,12 BRDA:65,16,1,0 -BRDA:67,17,0,0 +BRDA:67,17,0,12 BRDA:67,17,1,0 -BRDA:67,18,0,0 -BRDA:67,18,1,0 -BRDA:67,18,2,0 -BRDA:69,19,0,0 +BRDA:67,18,0,12 +BRDA:67,18,1,12 +BRDA:67,18,2,12 +BRDA:69,19,0,12 BRDA:69,19,1,0 -BRDA:69,20,0,0 -BRDA:69,20,1,0 +BRDA:69,20,0,12 +BRDA:69,20,1,12 BRDA:71,21,0,0 -BRDA:71,21,1,0 -BRDA:71,22,0,0 +BRDA:71,21,1,12 +BRDA:71,22,0,12 BRDA:71,22,1,0 BRDA:73,23,0,0 -BRDA:73,23,1,0 +BRDA:73,23,1,12 BRDA:78,24,0,0 BRDA:78,24,1,0 BRDA:78,25,0,0 BRDA:78,25,1,0 BRDA:83,26,0,0 -BRDA:83,26,1,0 +BRDA:83,26,1,12 BRDA:95,27,0,0 -BRDA:95,27,1,0 +BRDA:95,27,1,10 BRDA:99,28,0,0 -BRDA:99,28,1,0 -BRDA:99,29,0,0 -BRDA:99,29,1,0 +BRDA:99,28,1,10 +BRDA:99,29,0,10 +BRDA:99,29,1,10 BRDA:101,30,0,0 BRDA:101,30,1,0 BRDA:103,31,0,0 @@ -4692,101 +4607,101 @@ BRDA:105,34,1,0 BRDA:107,35,0,0 BRDA:107,35,1,0 BRDA:117,36,0,0 -BRDA:117,36,1,0 -BRDA:119,37,0,0 -BRDA:119,37,1,0 -BRDA:122,38,0,0 -BRDA:122,38,1,0 +BRDA:117,36,1,4354 +BRDA:119,37,0,250 +BRDA:119,37,1,4104 +BRDA:122,38,0,811 +BRDA:122,38,1,3543 BRDA:149,39,0,0 -BRDA:149,39,1,0 +BRDA:149,39,1,125 BRDA:153,40,0,0 BRDA:153,40,1,0 BRDA:157,41,0,0 BRDA:157,41,1,0 BRDA:163,42,0,0 -BRDA:163,42,1,0 -BRDA:165,43,0,0 +BRDA:163,42,1,125 +BRDA:165,43,0,125 BRDA:165,43,1,0 -BRDA:167,44,0,0 +BRDA:167,44,0,125 BRDA:167,44,1,0 -BRDA:170,45,0,0 -BRDA:170,45,1,0 -BRDA:174,46,0,0 -BRDA:174,46,1,0 -BRDA:174,47,0,0 -BRDA:174,47,1,0 +BRDA:170,45,0,875 +BRDA:170,45,1,1750 +BRDA:174,46,0,125 +BRDA:174,46,1,2500 +BRDA:174,47,0,2625 +BRDA:174,47,1,2500 BRDA:181,48,0,0 -BRDA:181,48,1,0 -BRDA:181,49,0,0 +BRDA:181,48,1,125 +BRDA:181,49,0,125 BRDA:181,49,1,0 -BRDA:237,50,0,0 +BRDA:237,50,0,52 BRDA:237,50,1,0 -BRDA:239,51,0,0 -BRDA:239,51,1,0 -BRDA:241,52,0,0 +BRDA:239,51,0,12 +BRDA:239,51,1,40 +BRDA:241,52,0,52 BRDA:241,52,1,0 -BRDA:249,53,0,0 -BRDA:249,53,1,0 -BRDA:253,54,0,0 -BRDA:253,54,1,0 -BRDA:253,55,0,0 -BRDA:253,55,1,0 +BRDA:249,53,0,186 +BRDA:249,53,1,572 +BRDA:253,54,0,52 +BRDA:253,54,1,706 +BRDA:253,55,0,758 +BRDA:253,55,1,758 BRDA:259,56,0,0 -BRDA:259,56,1,0 -BRDA:259,57,0,0 +BRDA:259,56,1,52 +BRDA:259,57,0,52 BRDA:259,57,1,0 -BRDA:260,58,0,0 +BRDA:260,58,0,52 BRDA:260,58,1,0 -BRDA:263,59,0,0 -BRDA:263,59,1,0 -BRDA:266,60,0,0 +BRDA:263,59,0,30 +BRDA:263,59,1,22 +BRDA:266,60,0,52 BRDA:266,60,1,0 BRDA:272,61,0,0 -BRDA:272,61,1,0 +BRDA:272,61,1,52 BRDA:274,62,0,0 BRDA:274,62,1,0 -BRDA:304,63,0,0 -BRDA:304,63,1,0 -BRDA:308,64,0,0 -BRDA:308,64,1,0 -BRDA:308,65,0,0 -BRDA:308,65,1,0 +BRDA:304,63,0,20 +BRDA:304,63,1,70 +BRDA:308,64,0,10 +BRDA:308,64,1,80 +BRDA:308,65,0,90 +BRDA:308,65,1,80 BRDA:314,66,0,0 -BRDA:314,66,1,0 +BRDA:314,66,1,10 BRDA:316,67,0,0 BRDA:316,67,1,0 BRDA:327,68,0,0 -BRDA:327,68,1,0 +BRDA:327,68,1,10 BRDA:328,69,0,0 -BRDA:328,69,1,0 +BRDA:328,69,1,10 BRDA:329,70,0,0 -BRDA:329,70,1,0 +BRDA:329,70,1,10 BRDA:333,71,0,0 -BRDA:333,71,1,0 +BRDA:333,71,1,10 BRDA:334,72,0,0 -BRDA:334,72,1,0 -BRDA:386,73,0,0 +BRDA:334,72,1,10 +BRDA:386,73,0,1 BRDA:386,73,1,0 -BRDA:394,74,0,0 +BRDA:394,74,0,1 BRDA:394,74,1,0 -BRDA:397,75,0,0 +BRDA:397,75,0,1 BRDA:397,75,1,0 -BRDA:407,76,0,0 +BRDA:407,76,0,1 BRDA:407,76,1,0 -BRDA:410,77,0,0 +BRDA:410,77,0,12 BRDA:410,77,1,0 -BRDA:412,78,0,0 +BRDA:412,78,0,12 BRDA:412,78,1,0 -BRDA:418,79,0,0 +BRDA:418,79,0,1 BRDA:418,79,1,0 -BRDA:421,80,0,0 +BRDA:421,80,0,10 BRDA:421,80,1,0 -BRDA:423,81,0,0 +BRDA:423,81,0,10 BRDA:423,81,1,0 BRDA:455,82,0,1 BRDA:455,82,1,0 BRF:169 -BRH:1 +BRH:95 end_of_record TN: SF:src\main\server\adapter\case\caseIngest.js @@ -4815,10 +4730,10 @@ FN:234,(anonymous_21) FN:234,(anonymous_22) FN:241,(anonymous_23) FNF:24 -FNH:0 +FNH:9 FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) -FNDA:0,(anonymous_2) +FNDA:1,(anonymous_1) +FNDA:1,(anonymous_2) FNDA:0,(anonymous_3) FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) @@ -4828,24 +4743,24 @@ FNDA:0,(anonymous_8) FNDA:0,(anonymous_9) FNDA:0,(anonymous_10) FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) +FNDA:75,(anonymous_12) FNDA:0,(anonymous_13) FNDA:0,(anonymous_14) -FNDA:0,(anonymous_15) -FNDA:0,(anonymous_16) -FNDA:0,(anonymous_17) -FNDA:0,(anonymous_18) +FNDA:1,(anonymous_15) +FNDA:75,(anonymous_16) +FNDA:75,(anonymous_17) +FNDA:1,(anonymous_18) FNDA:0,(anonymous_19) -FNDA:0,(anonymous_20) -FNDA:0,(anonymous_21) +FNDA:1,(anonymous_20) +FNDA:1,(anonymous_21) FNDA:0,(anonymous_22) FNDA:0,(anonymous_23) DA:1,1 DA:2,1 DA:4,1 DA:6,0 -DA:9,0 -DA:12,0 +DA:9,1 +DA:12,1 DA:15,0 DA:18,0 DA:21,0 @@ -4856,15 +4771,15 @@ DA:33,0 DA:36,0 DA:39,0 DA:43,1 -DA:44,0 +DA:44,75 DA:45,0 -DA:46,0 -DA:47,0 -DA:48,0 -DA:49,0 -DA:50,0 -DA:51,0 -DA:54,0 +DA:46,75 +DA:47,75 +DA:48,675 +DA:49,675 +DA:50,225 +DA:51,225 +DA:54,75 DA:57,1 DA:58,0 DA:59,0 @@ -4878,74 +4793,74 @@ DA:72,0 DA:73,0 DA:75,0 DA:79,1 -DA:80,0 -DA:81,0 -DA:82,0 +DA:80,1 +DA:81,1 +DA:82,1 DA:83,0 DA:84,0 DA:85,0 DA:86,0 -DA:88,0 -DA:89,0 -DA:90,0 -DA:91,0 -DA:92,0 -DA:93,0 -DA:96,0 -DA:97,0 +DA:88,1 +DA:89,1 +DA:90,1 +DA:91,13 +DA:92,9 +DA:93,9 +DA:96,1 +DA:97,1 DA:99,0 -DA:101,0 +DA:101,1 DA:102,0 -DA:104,0 +DA:104,1 DA:107,1 -DA:108,0 -DA:109,0 -DA:110,0 -DA:111,0 -DA:112,0 -DA:113,0 -DA:114,0 -DA:115,0 -DA:116,0 -DA:119,0 -DA:123,0 -DA:124,0 -DA:125,0 -DA:126,0 +DA:108,75 +DA:109,75 +DA:110,75 +DA:111,75 +DA:112,75 +DA:113,75 +DA:114,675 +DA:115,450 +DA:116,450 +DA:119,75 +DA:123,75 +DA:124,75 +DA:125,75 +DA:126,75 DA:129,1 -DA:130,0 -DA:131,0 -DA:132,0 -DA:133,0 +DA:130,75 +DA:131,75 +DA:132,75 +DA:133,75 DA:134,0 DA:135,0 DA:136,0 -DA:143,0 -DA:144,0 -DA:145,0 -DA:146,0 -DA:149,0 -DA:150,0 -DA:151,0 +DA:143,75 +DA:144,807 +DA:145,582 +DA:146,582 +DA:149,75 +DA:150,75 +DA:151,75 DA:152,0 -DA:154,0 +DA:154,75 DA:158,1 -DA:159,0 -DA:160,0 -DA:161,0 -DA:162,0 -DA:163,0 -DA:165,0 -DA:166,0 -DA:167,0 -DA:169,0 -DA:170,0 -DA:171,0 -DA:173,0 -DA:174,0 -DA:175,0 -DA:177,0 -DA:178,0 +DA:159,1 +DA:160,1 +DA:161,1 +DA:162,1 +DA:163,1 +DA:165,75 +DA:166,75 +DA:167,75 +DA:169,1 +DA:170,1 +DA:171,1 +DA:173,75 +DA:174,75 +DA:175,75 +DA:177,1 +DA:178,1 DA:181,1 DA:182,0 DA:183,0 @@ -4962,36 +4877,36 @@ DA:193,0 DA:194,0 DA:197,1 DA:198,1 -DA:199,0 +DA:199,1 DA:200,0 -DA:202,0 -DA:203,0 -DA:204,0 -DA:206,0 -DA:207,0 -DA:208,0 -DA:209,0 -DA:211,0 -DA:212,0 +DA:202,1 +DA:203,1 +DA:204,1 +DA:206,1 +DA:207,1 +DA:208,1 +DA:209,1 +DA:211,1 +DA:212,1 DA:213,0 -DA:214,0 +DA:214,1 DA:215,0 -DA:216,0 -DA:217,0 -DA:218,0 -DA:219,0 +DA:216,1 +DA:217,1 +DA:218,1 +DA:219,1 DA:223,0 -DA:225,0 -DA:226,0 -DA:227,0 -DA:228,0 -DA:229,0 -DA:230,0 -DA:231,0 +DA:225,1 +DA:226,1 +DA:227,1 +DA:228,1 +DA:229,1 +DA:230,151 +DA:231,151 DA:232,0 -DA:234,0 +DA:234,1 DA:235,0 -DA:238,0 +DA:238,1 DA:241,1 DA:242,0 DA:243,0 @@ -5001,13 +4916,13 @@ DA:248,1 DA:249,1 DA:250,1 LF:160 -LH:17 +LH:106 BRDA:44,0,0,0 -BRDA:44,0,1,0 -BRDA:44,1,0,0 -BRDA:44,1,1,0 -BRDA:49,2,0,0 -BRDA:49,2,1,0 +BRDA:44,0,1,75 +BRDA:44,1,0,75 +BRDA:44,1,1,75 +BRDA:49,2,0,225 +BRDA:49,2,1,450 BRDA:58,3,0,0 BRDA:58,3,1,0 BRDA:58,4,0,0 @@ -5017,61 +4932,61 @@ BRDA:61,5,1,0 BRDA:72,6,0,0 BRDA:72,6,1,0 BRDA:82,7,0,0 -BRDA:82,7,1,0 -BRDA:91,8,0,0 -BRDA:91,8,1,0 +BRDA:82,7,1,1 +BRDA:91,8,0,9 +BRDA:91,8,1,4 BRDA:97,9,0,0 -BRDA:97,9,1,0 -BRDA:97,10,0,0 -BRDA:97,10,1,0 +BRDA:97,9,1,1 +BRDA:97,10,0,1 +BRDA:97,10,1,1 BRDA:97,10,2,0 BRDA:97,10,3,0 BRDA:101,11,0,0 -BRDA:101,11,1,0 -BRDA:101,12,0,0 +BRDA:101,11,1,1 +BRDA:101,12,0,1 BRDA:101,12,1,0 -BRDA:114,13,0,0 -BRDA:114,13,1,0 +BRDA:114,13,0,450 +BRDA:114,13,1,225 BRDA:133,14,0,0 -BRDA:133,14,1,0 +BRDA:133,14,1,75 BRDA:135,15,0,0 BRDA:135,15,1,0 -BRDA:144,16,0,0 -BRDA:144,16,1,0 +BRDA:144,16,0,582 +BRDA:144,16,1,225 BRDA:151,17,0,0 -BRDA:151,17,1,0 -BRDA:151,18,0,0 +BRDA:151,17,1,75 +BRDA:151,18,0,75 BRDA:151,18,1,0 -BRDA:162,19,0,0 +BRDA:162,19,0,1 BRDA:162,19,1,0 -BRDA:170,20,0,0 +BRDA:170,20,0,1 BRDA:170,20,1,0 BRDA:199,21,0,0 -BRDA:199,21,1,0 +BRDA:199,21,1,1 BRDA:212,22,0,0 -BRDA:212,22,1,0 +BRDA:212,22,1,1 BRDA:214,23,0,0 -BRDA:214,23,1,0 -BRDA:218,24,0,0 +BRDA:214,23,1,1 +BRDA:218,24,0,1 BRDA:218,24,1,0 BRDA:231,25,0,0 -BRDA:231,25,1,0 +BRDA:231,25,1,151 BRDA:248,26,0,1 BRDA:248,26,1,0 BRF:56 -BRH:1 +BRH:28 end_of_record TN: SF:src\main\server\adapter\ce\pna.js FN:7,pnaEndpoint -FN:74,(anonymous_1) -FN:79,(anonymous_2) -FN:95,(anonymous_3) -FN:99,(anonymous_4) -FN:101,(anonymous_5) -FN:114,uploadToAws -FN:173,(anonymous_7) -FN:176,(anonymous_8) +FN:71,(anonymous_1) +FN:77,(anonymous_2) +FN:93,(anonymous_3) +FN:97,(anonymous_4) +FN:99,(anonymous_5) +FN:112,uploadToAws +FN:170,(anonymous_7) +FN:173,(anonymous_8) FNF:9 FNH:0 FNDA:0,pnaEndpoint @@ -5083,140 +4998,138 @@ FNDA:0,(anonymous_5) FNDA:0,uploadToAws FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) +DA:8,0 DA:9,0 DA:10,0 DA:11,0 DA:12,0 DA:13,0 -DA:14,0 DA:15,0 DA:16,0 -DA:18,0 DA:19,0 +DA:20,0 DA:22,0 DA:23,0 -DA:25,0 -DA:26,0 +DA:27,0 +DA:29,0 DA:30,0 DA:32,0 -DA:33,0 -DA:35,0 +DA:38,0 +DA:39,0 +DA:40,0 DA:41,0 -DA:42,0 DA:43,0 -DA:44,0 DA:46,0 -DA:49,0 +DA:47,0 +DA:48,0 DA:50,0 -DA:51,0 DA:53,0 -DA:56,0 +DA:67,0 +DA:69,0 DA:70,0 +DA:71,0 DA:72,0 -DA:73,0 -DA:74,0 -DA:75,0 +DA:78,0 +DA:79,0 DA:80,0 DA:81,0 DA:82,0 DA:83,0 DA:84,0 -DA:85,0 -DA:86,0 -DA:96,0 -DA:99,0 +DA:94,0 +DA:97,0 +DA:98,0 DA:100,0 -DA:102,0 +DA:103,0 DA:105,0 -DA:107,0 +DA:106,0 DA:108,0 -DA:110,0 +DA:113,0 +DA:115,0 DA:116,0 +DA:117,0 DA:118,0 DA:119,0 -DA:120,0 DA:121,0 DA:122,0 +DA:123,0 DA:124,0 -DA:125,0 -DA:126,0 -DA:127,0 -DA:132,0 -DA:133,0 -DA:134,0 -DA:139,0 -DA:140,0 -DA:141,0 -DA:146,0 -DA:147,0 -DA:148,0 -DA:153,0 -DA:154,0 -DA:155,0 -DA:160,0 -DA:168,0 -DA:173,0 +DA:129,0 +DA:130,0 +DA:131,0 +DA:136,0 +DA:137,0 +DA:138,0 +DA:143,0 +DA:144,0 +DA:145,0 +DA:150,0 +DA:151,0 +DA:152,0 +DA:157,0 +DA:165,0 +DA:170,0 +DA:171,0 +DA:172,0 DA:174,0 DA:175,0 -DA:177,0 +DA:176,0 DA:178,0 -DA:179,0 -DA:181,0 -DA:186,0 -DA:187,0 -DA:188,0 -DA:195,1 -DA:196,1 -LF:84 +DA:183,0 +DA:184,0 +DA:185,0 +DA:192,1 +DA:193,1 +LF:82 LH:2 -BRDA:11,0,0,0 -BRDA:11,0,1,0 -BRDA:11,1,0,0 -BRDA:11,1,1,0 -BRDA:15,2,0,0 -BRDA:15,2,1,0 -BRDA:18,3,0,0 -BRDA:18,3,1,0 -BRDA:23,4,0,0 -BRDA:23,4,1,0 -BRDA:23,5,0,0 -BRDA:23,5,1,0 -BRDA:25,6,0,0 -BRDA:25,6,1,0 -BRDA:36,7,0,0 -BRDA:36,7,1,0 -BRDA:38,8,0,0 -BRDA:38,8,1,0 -BRDA:42,9,0,0 -BRDA:42,9,1,0 -BRDA:43,10,0,0 -BRDA:43,10,1,0 -BRDA:43,11,0,0 -BRDA:43,11,1,0 -BRDA:49,12,0,0 -BRDA:49,12,1,0 -BRDA:49,13,0,0 -BRDA:49,13,1,0 -BRDA:50,14,0,0 -BRDA:50,14,1,0 -BRDA:50,15,0,0 -BRDA:50,15,1,0 -BRDA:59,16,0,0 -BRDA:59,16,1,0 -BRDA:62,17,0,0 -BRDA:62,17,1,0 -BRDA:63,18,0,0 -BRDA:63,18,1,0 -BRDA:64,19,0,0 -BRDA:64,19,1,0 +BRDA:12,0,0,0 +BRDA:12,0,1,0 +BRDA:15,1,0,0 +BRDA:15,1,1,0 +BRDA:20,2,0,0 +BRDA:20,2,1,0 +BRDA:20,3,0,0 +BRDA:20,3,1,0 +BRDA:22,4,0,0 +BRDA:22,4,1,0 +BRDA:33,5,0,0 +BRDA:33,5,1,0 +BRDA:35,6,0,0 +BRDA:35,6,1,0 +BRDA:39,7,0,0 +BRDA:39,7,1,0 +BRDA:40,8,0,0 +BRDA:40,8,1,0 +BRDA:40,9,0,0 +BRDA:40,9,1,0 +BRDA:46,10,0,0 +BRDA:46,10,1,0 +BRDA:46,11,0,0 +BRDA:46,11,1,0 +BRDA:47,12,0,0 +BRDA:47,12,1,0 +BRDA:47,13,0,0 +BRDA:47,13,1,0 +BRDA:56,14,0,0 +BRDA:56,14,1,0 +BRDA:59,15,0,0 +BRDA:59,15,1,0 +BRDA:60,16,0,0 +BRDA:60,16,1,0 +BRDA:61,17,0,0 +BRDA:61,17,1,0 +BRDA:61,18,0,0 +BRDA:61,18,1,0 +BRDA:63,19,0,0 +BRDA:63,19,1,0 BRDA:64,20,0,0 BRDA:64,20,1,0 -BRDA:66,21,0,0 -BRDA:66,21,1,0 -BRDA:67,22,0,0 -BRDA:67,22,1,0 -BRDA:70,23,0,0 -BRDA:70,23,1,0 +BRDA:67,21,0,0 +BRDA:67,21,1,0 +BRDA:78,22,0,0 +BRDA:78,22,1,0 +BRDA:78,23,0,0 +BRDA:78,23,1,0 BRDA:80,24,0,0 BRDA:80,24,1,0 BRDA:80,25,0,0 @@ -5225,151 +5138,135 @@ BRDA:82,26,0,0 BRDA:82,26,1,0 BRDA:82,27,0,0 BRDA:82,27,1,0 -BRDA:84,28,0,0 -BRDA:84,28,1,0 -BRDA:84,29,0,0 -BRDA:84,29,1,0 -BRDA:90,30,0,0 -BRDA:90,30,1,0 +BRDA:88,28,0,0 +BRDA:88,28,1,0 +BRDA:88,29,0,0 +BRDA:88,29,1,0 +BRDA:88,30,0,0 +BRDA:88,30,1,0 BRDA:90,31,0,0 BRDA:90,31,1,0 -BRDA:90,32,0,0 -BRDA:90,32,1,0 -BRDA:92,33,0,0 -BRDA:92,33,1,0 -BRDA:105,34,0,0 -BRDA:105,34,1,0 -BRDA:105,35,0,0 -BRDA:105,35,1,0 -BRDA:118,36,0,0 -BRDA:118,36,1,0 -BRDA:119,37,0,0 -BRDA:119,37,1,0 -BRDA:120,38,0,0 -BRDA:120,38,1,0 -BRDA:121,39,0,0 -BRDA:121,39,1,0 -BRDA:125,40,0,0 -BRDA:125,40,1,0 -BRDA:132,41,0,0 -BRDA:132,41,1,0 -BRDA:139,42,0,0 -BRDA:139,42,1,0 -BRDA:146,43,0,0 -BRDA:146,43,1,0 -BRDA:153,44,0,0 -BRDA:153,44,1,0 -BRDA:195,45,0,1 -BRDA:195,45,1,0 -BRF:92 +BRDA:103,32,0,0 +BRDA:103,32,1,0 +BRDA:103,33,0,0 +BRDA:103,33,1,0 +BRDA:115,34,0,0 +BRDA:115,34,1,0 +BRDA:116,35,0,0 +BRDA:116,35,1,0 +BRDA:117,36,0,0 +BRDA:117,36,1,0 +BRDA:118,37,0,0 +BRDA:118,37,1,0 +BRDA:122,38,0,0 +BRDA:122,38,1,0 +BRDA:129,39,0,0 +BRDA:129,39,1,0 +BRDA:136,40,0,0 +BRDA:136,40,1,0 +BRDA:143,41,0,0 +BRDA:143,41,1,0 +BRDA:150,42,0,0 +BRDA:150,42,1,0 +BRDA:192,43,0,1 +BRDA:192,43,1,0 +BRF:88 BRH:1 end_of_record TN: SF:src\main\server\adapter\ceasn\ceasn.js FN:33,ceasnExportUriTransform FN:59,competencyPromise -FN:60,(anonymous_2) -FN:69,(anonymous_3) -FN:172,cassFrameworkAsCeasn -FN:240,(anonymous_5) -FN:392,(anonymous_6) -FN:556,stripNonCe -FN:591,(anonymous_8) -FN:604,orderFields +FN:68,(anonymous_2) +FN:170,cassFrameworkAsCeasn +FN:236,(anonymous_4) +FN:388,(anonymous_5) +FN:552,stripNonCe +FN:587,(anonymous_7) +FN:600,orderFields +FN:602,(anonymous_9) FN:606,(anonymous_10) -FN:610,(anonymous_11) -FN:616,competencyInCollectionPromise -FN:617,(anonymous_13) -FN:726,cassFrameworkAsCeasnCollection -FN:748,(anonymous_15) -FN:872,(anonymous_16) -FN:977,conceptArrays -FN:1005,(anonymous_18) -FN:1014,conceptPromise -FN:1015,(anonymous_20) -FN:1080,levelPromise -FN:1081,(anonymous_22) -FN:1136,cassConceptSchemeAsCeasn -FN:1146,(anonymous_24) -FN:1156,getSubConcepts -FN:1157,(anonymous_26) -FN:1179,(anonymous_27) -FN:1257,cassConceptSchemeAsCeasnProgression -FN:1267,(anonymous_29) -FN:1277,getSubConcepts -FN:1278,(anonymous_31) -FN:1300,(anonymous_32) -FN:1380,createEachRelation -FN:1402,createRelations -FN:1411,importCompetencyPromise -FN:1412,(anonymous_36) -FN:1538,importCeFrameworkToCass -FN:1544,(anonymous_38) -FN:1590,(anonymous_39) -FN:1656,importCompetencyToCollectionPromise -FN:1657,(anonymous_41) -FN:1739,importCeCollectionToCass -FN:1745,(anonymous_43) -FN:1791,(anonymous_44) -FN:1850,ceasnFrameworkToCass -FN:1908,ceasnEndpoint -FNF:47 -FNH:0 -FNDA:0,ceasnExportUriTransform -FNDA:0,competencyPromise -FNDA:0,(anonymous_2) -FNDA:0,(anonymous_3) -FNDA:0,cassFrameworkAsCeasn -FNDA:0,(anonymous_5) -FNDA:0,(anonymous_6) -FNDA:0,stripNonCe -FNDA:0,(anonymous_8) -FNDA:0,orderFields -FNDA:0,(anonymous_10) -FNDA:0,(anonymous_11) +FN:612,competencyInCollectionPromise +FN:718,cassFrameworkAsCeasnCollection +FN:740,(anonymous_13) +FN:864,(anonymous_14) +FN:969,conceptArrays +FN:997,(anonymous_16) +FN:1006,conceptPromise +FN:1070,levelPromise +FN:1124,cassConceptSchemeAsCeasn +FN:1134,(anonymous_20) +FN:1144,getSubConcepts +FN:1145,(anonymous_22) +FN:1167,(anonymous_23) +FN:1245,cassConceptSchemeAsCeasnProgression +FN:1255,(anonymous_25) +FN:1265,getSubConcepts +FN:1266,(anonymous_27) +FN:1288,(anonymous_28) +FN:1368,createEachRelation +FN:1390,createRelations +FN:1399,importCompetencyPromise +FN:1522,importCeFrameworkToCass +FN:1528,(anonymous_33) +FN:1571,(anonymous_34) +FN:1637,importCompetencyToCollectionPromise +FN:1715,importCeCollectionToCass +FN:1721,(anonymous_37) +FN:1764,(anonymous_38) +FN:1823,ceasnFrameworkToCass +FN:1881,ceasnEndpoint +FNF:41 +FNH:17 +FNDA:74,ceasnExportUriTransform +FNDA:12,competencyPromise +FNDA:8,(anonymous_2) +FNDA:1,cassFrameworkAsCeasn +FNDA:2,(anonymous_4) +FNDA:12,(anonymous_5) +FNDA:13,stripNonCe +FNDA:11,(anonymous_7) +FNDA:13,orderFields +FNDA:156,(anonymous_9) +FNDA:156,(anonymous_10) FNDA:0,competencyInCollectionPromise -FNDA:0,(anonymous_13) FNDA:0,cassFrameworkAsCeasnCollection -FNDA:0,(anonymous_15) -FNDA:0,(anonymous_16) +FNDA:0,(anonymous_13) +FNDA:0,(anonymous_14) FNDA:0,conceptArrays -FNDA:0,(anonymous_18) +FNDA:0,(anonymous_16) FNDA:0,conceptPromise -FNDA:0,(anonymous_20) FNDA:0,levelPromise -FNDA:0,(anonymous_22) FNDA:0,cassConceptSchemeAsCeasn -FNDA:0,(anonymous_24) +FNDA:0,(anonymous_20) FNDA:0,getSubConcepts -FNDA:0,(anonymous_26) -FNDA:0,(anonymous_27) +FNDA:0,(anonymous_22) +FNDA:0,(anonymous_23) FNDA:0,cassConceptSchemeAsCeasnProgression -FNDA:0,(anonymous_29) +FNDA:0,(anonymous_25) FNDA:0,getSubConcepts -FNDA:0,(anonymous_31) -FNDA:0,(anonymous_32) +FNDA:0,(anonymous_27) +FNDA:0,(anonymous_28) FNDA:0,createEachRelation FNDA:0,createRelations -FNDA:0,importCompetencyPromise -FNDA:0,(anonymous_36) -FNDA:0,importCeFrameworkToCass -FNDA:0,(anonymous_38) -FNDA:0,(anonymous_39) +FNDA:8512,importCompetencyPromise +FNDA:2,importCeFrameworkToCass +FNDA:17028,(anonymous_33) +FNDA:8512,(anonymous_34) FNDA:0,importCompetencyToCollectionPromise -FNDA:0,(anonymous_41) FNDA:0,importCeCollectionToCass -FNDA:0,(anonymous_43) -FNDA:0,(anonymous_44) -FNDA:0,ceasnFrameworkToCass -FNDA:0,ceasnEndpoint +FNDA:0,(anonymous_37) +FNDA:0,(anonymous_38) +FNDA:2,ceasnFrameworkToCass +FNDA:3,ceasnEndpoint DA:1,1 DA:3,1 DA:5,1 DA:27,1 DA:28,1 DA:30,1 -DA:34,0 -DA:35,0 +DA:34,74 +DA:35,74 DA:36,0 DA:37,0 DA:38,0 @@ -5387,99 +5284,100 @@ DA:53,0 DA:54,0 DA:55,0 DA:56,0 -DA:60,0 -DA:61,0 -DA:62,0 +DA:60,12 +DA:61,12 +DA:62,12 DA:63,0 -DA:64,0 -DA:65,0 -DA:67,0 -DA:68,0 -DA:69,0 -DA:70,0 -DA:72,0 -DA:73,0 -DA:74,0 -DA:75,0 +DA:65,12 +DA:66,0 +DA:67,12 +DA:68,2 +DA:69,8 +DA:71,12 +DA:72,12 +DA:73,12 +DA:74,2 +DA:76,12 DA:77,0 DA:78,0 DA:79,0 -DA:80,0 +DA:81,12 DA:82,0 -DA:83,0 -DA:84,0 -DA:85,0 +DA:83,12 +DA:84,12 +DA:87,12 DA:88,0 -DA:89,0 +DA:89,12 DA:90,0 DA:91,0 -DA:92,0 +DA:93,0 DA:94,0 DA:95,0 -DA:96,0 -DA:102,0 +DA:101,12 +DA:102,190 DA:103,0 -DA:104,0 -DA:107,0 -DA:108,0 -DA:109,0 -DA:111,0 -DA:112,0 -DA:113,0 -DA:114,0 -DA:116,0 -DA:117,0 -DA:121,0 +DA:106,12 +DA:107,12 +DA:108,12 +DA:110,12 +DA:111,190 +DA:112,32 +DA:113,32 +DA:115,190 +DA:116,12 +DA:120,12 +DA:121,12 DA:122,0 -DA:123,0 +DA:124,12 DA:125,0 -DA:126,0 +DA:127,12 DA:128,0 -DA:129,0 -DA:132,0 -DA:133,0 -DA:135,0 -DA:136,0 -DA:137,0 -DA:139,0 +DA:131,12 +DA:132,12 +DA:134,12 +DA:135,12 +DA:136,12 +DA:138,0 +DA:140,12 DA:141,0 -DA:142,0 -DA:143,0 -DA:144,0 -DA:145,0 -DA:147,0 -DA:148,0 -DA:149,0 +DA:142,12 +DA:143,12 +DA:144,12 +DA:146,12 +DA:147,10 +DA:148,10 +DA:150,12 DA:151,0 DA:152,0 -DA:153,0 +DA:155,0 DA:156,0 DA:157,0 -DA:158,0 -DA:162,0 -DA:163,0 -DA:164,0 +DA:161,12 +DA:162,12 +DA:163,12 +DA:165,0 DA:166,0 -DA:167,0 -DA:173,0 -DA:174,0 -DA:175,0 -DA:176,0 -DA:177,0 +DA:171,1 +DA:172,1 +DA:173,1 +DA:174,1 +DA:175,1 +DA:176,1 +DA:177,1 DA:178,0 -DA:179,0 -DA:180,0 +DA:180,1 DA:181,0 -DA:182,0 +DA:183,1 DA:184,0 -DA:185,0 +DA:186,1 DA:187,0 -DA:188,0 +DA:189,1 DA:190,0 DA:191,0 -DA:193,0 +DA:193,1 DA:194,0 -DA:195,0 +DA:195,1 +DA:196,1 DA:197,0 DA:198,0 DA:199,0 @@ -5487,44 +5385,43 @@ DA:200,0 DA:201,0 DA:202,0 DA:203,0 -DA:204,0 DA:205,0 DA:206,0 DA:207,0 DA:209,0 DA:210,0 DA:211,0 -DA:213,0 +DA:212,0 DA:214,0 -DA:215,0 DA:216,0 -DA:218,0 -DA:220,0 -DA:221,0 +DA:217,0 +DA:219,0 +DA:222,1 DA:223,0 -DA:226,0 -DA:227,0 -DA:229,0 -DA:230,0 -DA:231,0 -DA:232,0 -DA:234,0 -DA:235,0 -DA:236,0 -DA:237,0 -DA:238,0 -DA:240,0 -DA:242,0 -DA:243,0 -DA:245,0 -DA:246,0 -DA:247,0 -DA:248,0 -DA:252,0 -DA:253,0 -DA:254,0 +DA:225,1 +DA:226,1 +DA:227,1 +DA:228,1 +DA:230,1 +DA:231,1 +DA:232,1 +DA:233,1 +DA:234,1 +DA:236,1 +DA:238,1 +DA:239,1 +DA:241,1 +DA:242,12 +DA:243,12 +DA:244,12 +DA:248,1 +DA:249,10 +DA:250,10 +DA:251,10 +DA:252,10 +DA:253,10 +DA:254,10 DA:255,0 -DA:256,0 DA:257,0 DA:258,0 DA:259,0 @@ -5532,33 +5429,33 @@ DA:261,0 DA:262,0 DA:263,0 DA:265,0 -DA:266,0 DA:267,0 +DA:268,0 DA:269,0 DA:271,0 DA:272,0 DA:273,0 DA:275,0 -DA:276,0 -DA:277,0 -DA:279,0 -DA:281,0 -DA:283,0 -DA:285,0 -DA:286,0 -DA:287,0 +DA:277,10 +DA:279,10 +DA:281,10 +DA:282,10 +DA:283,10 +DA:285,10 +DA:286,10 +DA:287,10 DA:289,0 -DA:290,0 -DA:291,0 -DA:293,0 -DA:295,0 -DA:296,0 -DA:297,0 +DA:291,10 +DA:292,10 +DA:293,2 +DA:297,10 +DA:298,10 +DA:299,10 DA:301,0 -DA:302,0 -DA:303,0 +DA:304,10 DA:305,0 -DA:308,0 +DA:306,0 +DA:307,0 DA:309,0 DA:310,0 DA:311,0 @@ -5566,15 +5463,15 @@ DA:313,0 DA:314,0 DA:315,0 DA:317,0 -DA:318,0 DA:319,0 +DA:320,0 DA:321,0 DA:323,0 -DA:324,0 -DA:325,0 +DA:325,10 +DA:326,0 DA:327,0 +DA:328,0 DA:329,0 -DA:330,0 DA:331,0 DA:332,0 DA:333,0 @@ -5582,15 +5479,15 @@ DA:335,0 DA:336,0 DA:337,0 DA:339,0 -DA:340,0 DA:341,0 +DA:342,0 DA:343,0 DA:345,0 -DA:346,0 -DA:347,0 +DA:347,10 +DA:348,0 DA:349,0 +DA:350,0 DA:351,0 -DA:352,0 DA:353,0 DA:354,0 DA:355,0 @@ -5598,433 +5495,435 @@ DA:357,0 DA:358,0 DA:359,0 DA:361,0 -DA:362,0 DA:363,0 +DA:364,0 DA:365,0 DA:367,0 -DA:368,0 -DA:369,0 +DA:369,10 +DA:370,0 DA:371,0 +DA:372,0 DA:373,0 -DA:374,0 DA:375,0 DA:376,0 DA:377,0 DA:379,0 -DA:380,0 -DA:381,0 -DA:383,0 -DA:387,0 -DA:388,0 -DA:389,0 -DA:390,0 -DA:391,0 -DA:392,0 -DA:393,0 -DA:395,0 -DA:396,0 -DA:397,0 -DA:401,0 -DA:402,0 -DA:403,0 -DA:404,0 -DA:406,0 +DA:383,1 +DA:384,1 +DA:385,1 +DA:386,1 +DA:387,1 +DA:388,12 +DA:389,1 +DA:391,1 +DA:392,1 +DA:393,1 +DA:397,1 +DA:398,12 +DA:399,12 +DA:400,2 +DA:402,12 +DA:405,1 +DA:406,1 +DA:408,1 DA:409,0 -DA:410,0 -DA:412,0 -DA:413,0 -DA:414,0 -DA:415,0 -DA:416,0 +DA:410,1 +DA:411,1 +DA:412,1 +DA:413,1 +DA:416,1 DA:417,0 +DA:418,0 DA:420,0 DA:421,0 -DA:422,0 +DA:422,1 +DA:423,0 DA:424,0 DA:425,0 DA:426,0 -DA:427,0 DA:428,0 DA:429,0 -DA:430,0 -DA:432,0 -DA:433,0 +DA:435,1 +DA:436,0 +DA:437,1 +DA:438,0 DA:439,0 -DA:440,0 DA:441,0 DA:442,0 DA:443,0 -DA:445,0 -DA:446,0 -DA:447,0 -DA:453,0 -DA:454,0 -DA:455,0 -DA:458,0 -DA:459,0 -DA:460,0 -DA:461,0 -DA:463,0 -DA:464,0 -DA:465,0 -DA:466,0 -DA:469,0 +DA:449,1 +DA:450,19 +DA:451,0 +DA:454,1 +DA:455,1 +DA:456,1 +DA:457,1 +DA:459,1 +DA:460,19 +DA:461,6 +DA:462,6 +DA:465,19 +DA:466,1 +DA:469,19 DA:470,0 -DA:473,0 -DA:474,0 -DA:475,0 -DA:480,0 +DA:471,0 +DA:476,1 +DA:477,1 +DA:478,0 +DA:480,1 DA:481,0 -DA:482,0 +DA:483,1 DA:484,0 -DA:485,0 +DA:486,1 DA:487,0 -DA:488,0 -DA:490,0 -DA:491,0 +DA:488,1 +DA:489,1 +DA:490,1 DA:492,0 -DA:493,0 -DA:494,0 -DA:496,0 +DA:494,1 +DA:495,0 +DA:497,1 DA:498,0 DA:499,0 -DA:501,0 -DA:502,0 -DA:503,0 -DA:504,0 -DA:507,0 -DA:509,0 -DA:511,0 -DA:513,0 -DA:514,0 -DA:515,0 -DA:516,0 -DA:517,0 -DA:518,0 -DA:519,0 -DA:521,0 -DA:522,0 -DA:523,0 -DA:524,0 -DA:525,0 -DA:527,0 -DA:528,0 -DA:529,0 -DA:530,0 -DA:531,0 -DA:534,0 -DA:536,0 -DA:538,0 -DA:539,0 -DA:540,0 -DA:541,0 -DA:542,0 -DA:544,0 -DA:545,0 -DA:546,0 -DA:547,0 -DA:548,0 -DA:549,0 -DA:551,0 -DA:552,0 -DA:553,0 -DA:557,0 -DA:558,0 -DA:559,0 -DA:560,0 -DA:561,0 -DA:562,0 -DA:563,0 -DA:564,0 -DA:565,0 -DA:566,0 -DA:567,0 -DA:568,0 -DA:569,0 -DA:570,0 -DA:571,0 -DA:572,0 -DA:573,0 -DA:574,0 -DA:575,0 -DA:576,0 -DA:577,0 -DA:578,0 -DA:579,0 -DA:580,0 -DA:581,0 -DA:582,0 -DA:583,0 -DA:584,0 -DA:585,0 -DA:586,0 -DA:587,0 -DA:588,0 -DA:590,0 -DA:591,0 -DA:592,0 -DA:593,0 -DA:596,0 -DA:599,0 -DA:601,0 -DA:605,0 -DA:606,0 -DA:607,0 -DA:608,0 -DA:610,0 -DA:611,0 +DA:500,0 +DA:503,0 +DA:505,0 +DA:507,1 +DA:509,1 +DA:510,1 +DA:511,1 +DA:512,1 +DA:513,12 +DA:514,12 +DA:515,0 +DA:517,12 +DA:518,12 +DA:519,78 +DA:520,0 +DA:521,0 +DA:523,12 +DA:524,12 +DA:525,0 +DA:526,0 +DA:527,0 +DA:530,0 +DA:532,0 +DA:534,12 +DA:535,12 +DA:536,12 +DA:537,0 +DA:538,0 +DA:540,1 +DA:541,1 +DA:542,1 +DA:543,1 +DA:544,0 +DA:545,0 +DA:547,0 +DA:548,1 +DA:549,1 +DA:553,13 +DA:554,195 +DA:555,134 +DA:556,108 +DA:557,95 +DA:558,95 +DA:559,95 +DA:560,95 +DA:561,95 +DA:562,93 +DA:563,81 +DA:564,81 +DA:565,81 +DA:566,81 +DA:567,81 +DA:568,81 +DA:569,68 +DA:570,68 +DA:571,68 +DA:572,68 +DA:573,68 +DA:574,67 +DA:575,67 +DA:576,66 +DA:577,54 +DA:578,54 +DA:579,54 +DA:580,54 +DA:581,54 +DA:582,54 +DA:583,54 +DA:584,50 +DA:586,195 +DA:587,11 +DA:588,11 +DA:589,11 +DA:592,195 +DA:595,39 +DA:597,13 +DA:601,13 +DA:602,13 +DA:603,156 +DA:604,156 +DA:606,13 +DA:607,156 +DA:609,13 DA:613,0 -DA:617,0 +DA:614,0 +DA:615,0 +DA:616,0 DA:618,0 DA:619,0 -DA:620,0 -DA:621,0 DA:622,0 +DA:623,0 DA:624,0 DA:625,0 +DA:626,0 +DA:627,0 DA:628,0 DA:629,0 DA:630,0 -DA:631,0 DA:632,0 -DA:633,0 -DA:634,0 -DA:635,0 DA:636,0 DA:637,0 +DA:638,0 DA:639,0 +DA:640,0 +DA:641,0 +DA:642,0 DA:643,0 -DA:644,0 DA:645,0 DA:646,0 DA:647,0 DA:648,0 -DA:649,0 -DA:650,0 +DA:651,0 DA:652,0 DA:653,0 -DA:654,0 -DA:655,0 +DA:656,0 +DA:657,0 DA:658,0 -DA:659,0 DA:660,0 +DA:661,0 +DA:662,0 DA:663,0 -DA:664,0 DA:665,0 -DA:667,0 -DA:668,0 +DA:666,0 DA:669,0 DA:670,0 -DA:672,0 +DA:671,0 DA:673,0 +DA:674,0 DA:676,0 DA:677,0 -DA:678,0 DA:680,0 -DA:681,0 +DA:682,0 DA:683,0 DA:684,0 -DA:687,0 +DA:686,0 +DA:688,0 DA:689,0 DA:690,0 DA:691,0 -DA:693,0 +DA:692,0 +DA:694,0 DA:695,0 DA:696,0 -DA:697,0 DA:698,0 DA:699,0 -DA:701,0 -DA:702,0 +DA:700,0 DA:703,0 +DA:704,0 DA:705,0 -DA:706,0 -DA:707,0 +DA:709,0 DA:710,0 DA:711,0 -DA:712,0 -DA:716,0 -DA:717,0 -DA:718,0 +DA:713,0 +DA:714,0 +DA:719,0 DA:720,0 -DA:721,0 +DA:722,0 +DA:723,0 +DA:724,0 +DA:725,0 +DA:726,0 DA:727,0 -DA:728,0 +DA:729,0 DA:730,0 DA:731,0 DA:732,0 -DA:733,0 DA:734,0 DA:735,0 +DA:736,0 DA:737,0 DA:738,0 -DA:739,0 DA:740,0 DA:742,0 DA:743,0 -DA:744,0 DA:745,0 DA:746,0 +DA:747,0 DA:748,0 -DA:750,0 -DA:751,0 +DA:752,0 DA:753,0 DA:754,0 DA:755,0 DA:756,0 -DA:760,0 +DA:757,0 +DA:758,0 +DA:759,0 DA:761,0 DA:762,0 DA:763,0 -DA:764,0 DA:765,0 DA:766,0 DA:767,0 DA:769,0 -DA:770,0 DA:771,0 +DA:772,0 DA:773,0 -DA:774,0 DA:775,0 +DA:776,0 DA:777,0 DA:779,0 -DA:780,0 -DA:781,0 +DA:782,0 DA:783,0 DA:784,0 DA:785,0 DA:787,0 -DA:790,0 +DA:788,0 +DA:789,0 DA:791,0 DA:792,0 DA:793,0 DA:795,0 -DA:796,0 DA:797,0 +DA:798,0 DA:799,0 -DA:800,0 DA:801,0 DA:803,0 +DA:804,0 DA:805,0 DA:806,0 DA:807,0 DA:809,0 +DA:810,0 DA:811,0 -DA:812,0 DA:813,0 DA:814,0 DA:815,0 DA:817,0 -DA:818,0 DA:819,0 +DA:820,0 DA:821,0 -DA:822,0 DA:823,0 DA:825,0 +DA:826,0 DA:827,0 DA:828,0 DA:829,0 DA:831,0 +DA:832,0 DA:833,0 -DA:834,0 DA:835,0 DA:836,0 DA:837,0 DA:839,0 -DA:840,0 DA:841,0 +DA:842,0 DA:843,0 -DA:844,0 DA:845,0 DA:847,0 +DA:848,0 DA:849,0 DA:850,0 DA:851,0 DA:853,0 +DA:854,0 DA:855,0 -DA:856,0 DA:857,0 -DA:858,0 -DA:859,0 DA:861,0 -DA:862,0 DA:863,0 -DA:865,0 -DA:869,0 +DA:864,0 +DA:867,0 +DA:868,0 +DA:870,0 DA:871,0 DA:872,0 +DA:873,0 +DA:874,0 DA:875,0 -DA:876,0 DA:878,0 DA:879,0 DA:880,0 -DA:881,0 -DA:882,0 DA:883,0 +DA:884,0 +DA:885,0 DA:886,0 DA:887,0 -DA:888,0 +DA:889,0 +DA:890,0 DA:891,0 DA:892,0 -DA:893,0 DA:894,0 DA:895,0 -DA:897,0 -DA:898,0 DA:899,0 DA:900,0 -DA:902,0 +DA:901,0 DA:903,0 +DA:904,0 +DA:906,0 DA:907,0 -DA:908,0 DA:909,0 +DA:910,0 DA:911,0 -DA:912,0 -DA:914,0 +DA:913,0 DA:915,0 -DA:917,0 +DA:916,0 DA:918,0 DA:919,0 +DA:920,0 DA:921,0 -DA:923,0 DA:924,0 DA:926,0 -DA:927,0 DA:928,0 -DA:929,0 +DA:930,0 +DA:931,0 DA:932,0 +DA:933,0 DA:934,0 +DA:935,0 DA:936,0 +DA:937,0 DA:938,0 DA:939,0 -DA:940,0 DA:941,0 DA:942,0 DA:943,0 DA:944,0 DA:945,0 -DA:946,0 -DA:947,0 -DA:949,0 +DA:948,0 DA:950,0 -DA:951,0 DA:952,0 DA:953,0 +DA:955,0 DA:956,0 +DA:957,0 DA:958,0 +DA:959,0 DA:960,0 DA:961,0 -DA:963,0 +DA:962,0 DA:964,0 DA:965,0 DA:966,0 -DA:967,0 -DA:968,0 -DA:969,0 DA:970,0 +DA:971,0 DA:972,0 DA:973,0 DA:974,0 +DA:975,0 +DA:976,0 +DA:977,0 DA:978,0 DA:979,0 DA:980,0 @@ -6042,597 +5941,576 @@ DA:991,0 DA:992,0 DA:993,0 DA:994,0 -DA:995,0 DA:996,0 DA:997,0 DA:998,0 DA:999,0 -DA:1000,0 -DA:1001,0 -DA:1002,0 -DA:1004,0 -DA:1005,0 -DA:1006,0 +DA:1003,0 DA:1007,0 +DA:1008,0 +DA:1009,0 +DA:1010,0 DA:1011,0 +DA:1012,0 +DA:1013,0 +DA:1014,0 DA:1015,0 -DA:1016,0 DA:1017,0 DA:1018,0 DA:1019,0 DA:1020,0 DA:1021,0 -DA:1022,0 -DA:1023,0 DA:1024,0 DA:1026,0 -DA:1027,0 DA:1028,0 DA:1029,0 DA:1030,0 +DA:1031,0 DA:1033,0 +DA:1034,0 DA:1035,0 +DA:1036,0 DA:1037,0 DA:1038,0 DA:1039,0 DA:1040,0 DA:1042,0 DA:1043,0 -DA:1044,0 -DA:1045,0 DA:1046,0 -DA:1047,0 DA:1048,0 DA:1049,0 -DA:1051,0 +DA:1050,0 DA:1052,0 -DA:1055,0 +DA:1056,0 DA:1057,0 -DA:1058,0 DA:1059,0 DA:1061,0 +DA:1063,0 DA:1065,0 DA:1066,0 -DA:1068,0 -DA:1070,0 +DA:1071,0 DA:1072,0 +DA:1073,0 DA:1074,0 DA:1075,0 +DA:1076,0 +DA:1077,0 +DA:1078,0 +DA:1079,0 DA:1081,0 DA:1082,0 DA:1083,0 DA:1084,0 -DA:1085,0 DA:1086,0 DA:1087,0 DA:1088,0 DA:1089,0 DA:1090,0 +DA:1091,0 DA:1092,0 DA:1093,0 -DA:1094,0 DA:1095,0 -DA:1097,0 -DA:1098,0 +DA:1096,0 DA:1099,0 -DA:1100,0 DA:1101,0 DA:1102,0 DA:1103,0 -DA:1104,0 -DA:1106,0 -DA:1107,0 +DA:1105,0 +DA:1109,0 DA:1110,0 DA:1112,0 -DA:1113,0 DA:1114,0 -DA:1116,0 +DA:1115,0 +DA:1117,0 +DA:1119,0 DA:1120,0 -DA:1121,0 -DA:1123,0 DA:1125,0 DA:1126,0 -DA:1128,0 +DA:1127,0 +DA:1129,0 DA:1130,0 DA:1131,0 +DA:1132,0 +DA:1134,0 +DA:1136,0 DA:1137,0 -DA:1138,0 DA:1139,0 +DA:1140,0 DA:1141,0 DA:1142,0 DA:1143,0 -DA:1144,0 +DA:1145,0 DA:1146,0 +DA:1147,0 DA:1148,0 DA:1149,0 +DA:1150,0 DA:1151,0 DA:1152,0 -DA:1153,0 -DA:1154,0 -DA:1155,0 -DA:1157,0 DA:1158,0 -DA:1159,0 -DA:1160,0 -DA:1161,0 -DA:1162,0 DA:1163,0 DA:1164,0 +DA:1166,0 +DA:1167,0 DA:1170,0 +DA:1172,0 +DA:1173,0 +DA:1174,0 DA:1175,0 DA:1176,0 +DA:1177,0 DA:1178,0 DA:1179,0 -DA:1182,0 +DA:1180,0 +DA:1181,0 +DA:1183,0 DA:1184,0 -DA:1185,0 -DA:1186,0 DA:1187,0 DA:1188,0 DA:1189,0 -DA:1190,0 DA:1191,0 DA:1192,0 DA:1193,0 DA:1195,0 -DA:1196,0 +DA:1198,0 DA:1199,0 -DA:1200,0 -DA:1201,0 +DA:1202,0 DA:1203,0 DA:1204,0 DA:1205,0 -DA:1207,0 +DA:1208,0 DA:1210,0 -DA:1211,0 +DA:1212,0 DA:1214,0 -DA:1215,0 DA:1216,0 DA:1217,0 +DA:1218,0 +DA:1219,0 DA:1220,0 +DA:1221,0 DA:1222,0 +DA:1223,0 DA:1224,0 -DA:1226,0 +DA:1227,0 DA:1228,0 DA:1229,0 -DA:1230,0 -DA:1231,0 DA:1232,0 DA:1233,0 DA:1234,0 DA:1235,0 DA:1236,0 +DA:1237,0 DA:1239,0 DA:1240,0 -DA:1241,0 -DA:1244,0 -DA:1245,0 +DA:1242,0 DA:1246,0 DA:1247,0 DA:1248,0 -DA:1249,0 +DA:1250,0 DA:1251,0 DA:1252,0 -DA:1254,0 +DA:1253,0 +DA:1255,0 +DA:1257,0 DA:1258,0 -DA:1259,0 DA:1260,0 +DA:1261,0 DA:1262,0 DA:1263,0 DA:1264,0 -DA:1265,0 +DA:1266,0 DA:1267,0 +DA:1268,0 DA:1269,0 DA:1270,0 +DA:1271,0 DA:1272,0 DA:1273,0 -DA:1274,0 -DA:1275,0 -DA:1276,0 -DA:1278,0 DA:1279,0 -DA:1280,0 -DA:1281,0 -DA:1282,0 -DA:1283,0 DA:1284,0 DA:1285,0 +DA:1287,0 +DA:1288,0 DA:1291,0 +DA:1293,0 +DA:1294,0 +DA:1295,0 DA:1296,0 DA:1297,0 +DA:1298,0 DA:1299,0 DA:1300,0 -DA:1303,0 +DA:1301,0 +DA:1302,0 +DA:1304,0 DA:1305,0 -DA:1306,0 -DA:1307,0 DA:1308,0 DA:1309,0 DA:1310,0 -DA:1311,0 DA:1312,0 DA:1313,0 DA:1314,0 DA:1316,0 -DA:1317,0 +DA:1319,0 DA:1320,0 -DA:1321,0 -DA:1322,0 +DA:1323,0 DA:1324,0 DA:1325,0 DA:1326,0 -DA:1328,0 +DA:1329,0 DA:1331,0 -DA:1332,0 -DA:1335,0 +DA:1333,0 +DA:1334,0 DA:1336,0 -DA:1337,0 DA:1338,0 +DA:1339,0 +DA:1340,0 DA:1341,0 +DA:1342,0 DA:1343,0 +DA:1344,0 DA:1345,0 DA:1346,0 -DA:1348,0 +DA:1349,0 DA:1350,0 DA:1351,0 -DA:1352,0 -DA:1353,0 DA:1354,0 DA:1355,0 DA:1356,0 DA:1357,0 DA:1358,0 +DA:1359,0 DA:1361,0 DA:1362,0 -DA:1363,0 -DA:1366,0 -DA:1367,0 -DA:1368,0 +DA:1364,0 DA:1369,0 DA:1370,0 DA:1371,0 +DA:1372,0 DA:1373,0 DA:1374,0 DA:1376,0 -DA:1381,0 +DA:1377,0 +DA:1378,0 +DA:1379,0 DA:1382,0 DA:1383,0 -DA:1384,0 -DA:1385,0 DA:1386,0 -DA:1388,0 -DA:1389,0 -DA:1390,0 +DA:1387,0 DA:1391,0 +DA:1392,0 DA:1394,0 DA:1395,0 -DA:1398,0 -DA:1399,0 -DA:1403,0 -DA:1404,0 -DA:1406,0 -DA:1407,0 -DA:1412,0 -DA:1413,0 +DA:1400,8512 +DA:1401,8512 +DA:1403,8512 +DA:1404,8512 +DA:1405,148 +DA:1406,8506 +DA:1407,8506 +DA:1408,8506 +DA:1409,8506 +DA:1410,8506 +DA:1411,8506 +DA:1413,8506 DA:1414,0 -DA:1416,0 -DA:1417,0 -DA:1418,0 -DA:1419,0 -DA:1420,0 -DA:1421,0 -DA:1422,0 -DA:1423,0 -DA:1424,0 -DA:1426,0 -DA:1427,0 -DA:1429,0 -DA:1430,0 -DA:1431,0 -DA:1432,0 -DA:1433,0 -DA:1438,0 -DA:1439,0 -DA:1441,0 -DA:1442,0 -DA:1443,0 -DA:1444,0 -DA:1445,0 -DA:1447,0 -DA:1448,0 -DA:1451,0 -DA:1452,0 -DA:1454,0 +DA:1416,8506 +DA:1417,8506 +DA:1418,8506 +DA:1419,8506 +DA:1420,8506 +DA:1425,8512 +DA:1426,8512 +DA:1428,8512 +DA:1429,8512 +DA:1430,68281 +DA:1431,16943 +DA:1432,16943 +DA:1434,68281 +DA:1435,8512 +DA:1438,8512 +DA:1439,8512 +DA:1441,8512 +DA:1442,8512 +DA:1443,8512 +DA:1445,8512 +DA:1446,8512 +DA:1447,8512 +DA:1449,8512 +DA:1452,8512 +DA:1453,8512 DA:1455,0 -DA:1456,0 +DA:1457,8512 DA:1458,0 -DA:1459,0 -DA:1460,0 -DA:1462,0 +DA:1460,8512 +DA:1462,8512 +DA:1464,8512 DA:1465,0 -DA:1466,0 +DA:1467,8512 DA:1468,0 -DA:1470,0 +DA:1470,8512 DA:1471,0 -DA:1473,0 -DA:1475,0 +DA:1473,8512 +DA:1474,0 +DA:1476,8512 DA:1477,0 -DA:1478,0 +DA:1479,8512 DA:1480,0 -DA:1481,0 -DA:1483,0 -DA:1484,0 -DA:1486,0 -DA:1487,0 -DA:1489,0 +DA:1482,8512 +DA:1483,8512 +DA:1484,8512 +DA:1485,8512 +DA:1486,8512 +DA:1487,8512 +DA:1489,8512 DA:1490,0 -DA:1492,0 +DA:1492,8512 DA:1493,0 -DA:1495,0 +DA:1495,8512 DA:1496,0 -DA:1497,0 -DA:1498,0 +DA:1498,8512 DA:1499,0 -DA:1500,0 +DA:1501,8512 DA:1502,0 -DA:1503,0 +DA:1504,8512 DA:1505,0 -DA:1506,0 -DA:1508,0 -DA:1509,0 -DA:1511,0 -DA:1512,0 -DA:1514,0 +DA:1507,8512 +DA:1508,8512 +DA:1509,8512 +DA:1510,8512 +DA:1511,8512 +DA:1512,8512 +DA:1514,8512 DA:1515,0 -DA:1517,0 +DA:1516,8512 DA:1518,0 -DA:1520,0 -DA:1521,0 -DA:1522,0 -DA:1523,0 -DA:1524,0 -DA:1525,0 -DA:1527,0 -DA:1528,0 -DA:1529,0 -DA:1530,0 -DA:1532,0 -DA:1533,0 -DA:1539,0 -DA:1540,0 -DA:1541,0 -DA:1542,0 +DA:1523,2 +DA:1524,2 +DA:1525,2 +DA:1526,2 +DA:1528,2 +DA:1529,17028 +DA:1530,8514 +DA:1536,8514 +DA:1537,8514 DA:1544,0 -DA:1545,0 -DA:1546,0 -DA:1552,0 -DA:1553,0 -DA:1560,0 -DA:1563,0 -DA:1565,0 -DA:1567,0 -DA:1568,0 -DA:1569,0 -DA:1570,0 -DA:1572,0 -DA:1573,0 -DA:1575,0 -DA:1576,0 -DA:1577,0 -DA:1579,0 -DA:1580,0 -DA:1581,0 -DA:1582,0 -DA:1583,0 -DA:1588,0 -DA:1589,0 -DA:1590,0 -DA:1593,0 -DA:1594,0 -DA:1596,0 -DA:1597,0 -DA:1598,0 -DA:1599,0 -DA:1600,0 -DA:1602,0 +DA:1547,2 +DA:1549,2 +DA:1551,2 +DA:1552,2 +DA:1553,2 +DA:1554,2 +DA:1556,2 +DA:1557,2 +DA:1558,2 +DA:1560,2 +DA:1561,2 +DA:1562,2 +DA:1563,2 +DA:1564,6 +DA:1569,2 +DA:1570,2 +DA:1571,8512 +DA:1574,2 +DA:1575,2 +DA:1577,2 +DA:1578,2 +DA:1579,30 +DA:1580,12 +DA:1581,12 +DA:1583,30 +DA:1584,2 +DA:1587,2 +DA:1588,2 +DA:1590,2 +DA:1591,2 +DA:1593,2 +DA:1594,2 +DA:1598,2 +DA:1599,2 +DA:1600,2 +DA:1602,2 DA:1603,0 +DA:1605,2 DA:1606,0 DA:1607,0 -DA:1609,0 DA:1610,0 -DA:1612,0 -DA:1613,0 -DA:1617,0 -DA:1618,0 -DA:1619,0 -DA:1621,0 -DA:1622,0 -DA:1624,0 -DA:1625,0 -DA:1626,0 -DA:1629,0 -DA:1633,0 -DA:1636,0 -DA:1637,0 +DA:1614,2 +DA:1617,2 +DA:1618,2 +DA:1620,0 +DA:1622,2 +DA:1623,0 +DA:1625,2 +DA:1627,2 +DA:1630,2 +DA:1632,2 +DA:1633,2 +DA:1638,0 DA:1639,0 DA:1641,0 DA:1642,0 -DA:1644,0 +DA:1643,0 DA:1646,0 +DA:1647,0 +DA:1648,0 DA:1649,0 -DA:1651,0 +DA:1650,0 DA:1652,0 +DA:1653,0 +DA:1656,0 DA:1657,0 -DA:1658,0 DA:1659,0 +DA:1660,0 DA:1661,0 -DA:1662,0 DA:1663,0 DA:1664,0 +DA:1665,0 DA:1667,0 -DA:1668,0 -DA:1669,0 DA:1670,0 DA:1671,0 DA:1673,0 -DA:1674,0 -DA:1677,0 +DA:1675,0 +DA:1676,0 DA:1678,0 DA:1680,0 -DA:1681,0 DA:1682,0 -DA:1684,0 +DA:1683,0 DA:1685,0 DA:1686,0 DA:1688,0 +DA:1689,0 DA:1691,0 DA:1692,0 DA:1694,0 -DA:1696,0 +DA:1695,0 DA:1697,0 -DA:1699,0 +DA:1698,0 +DA:1700,0 DA:1701,0 +DA:1702,0 DA:1703,0 DA:1704,0 -DA:1706,0 +DA:1705,0 DA:1707,0 +DA:1708,0 DA:1709,0 -DA:1710,0 -DA:1712,0 -DA:1713,0 -DA:1715,0 +DA:1711,0 DA:1716,0 +DA:1717,0 DA:1718,0 DA:1719,0 DA:1721,0 DA:1722,0 DA:1723,0 -DA:1724,0 -DA:1725,0 -DA:1726,0 -DA:1728,0 DA:1729,0 DA:1730,0 -DA:1731,0 -DA:1733,0 -DA:1734,0 +DA:1737,0 DA:1740,0 -DA:1741,0 DA:1742,0 -DA:1743,0 +DA:1744,0 DA:1745,0 DA:1746,0 DA:1747,0 +DA:1749,0 +DA:1750,0 +DA:1751,0 DA:1753,0 DA:1754,0 -DA:1761,0 +DA:1755,0 +DA:1756,0 +DA:1757,0 +DA:1762,0 +DA:1763,0 DA:1764,0 -DA:1766,0 +DA:1767,0 DA:1768,0 -DA:1769,0 DA:1770,0 DA:1771,0 +DA:1772,0 DA:1773,0 DA:1774,0 DA:1776,0 DA:1777,0 -DA:1778,0 DA:1780,0 DA:1781,0 -DA:1782,0 DA:1783,0 DA:1784,0 +DA:1786,0 +DA:1787,0 +DA:1788,0 DA:1789,0 DA:1790,0 -DA:1791,0 +DA:1792,0 +DA:1793,0 DA:1794,0 -DA:1795,0 +DA:1796,0 DA:1797,0 -DA:1798,0 DA:1799,0 -DA:1800,0 -DA:1801,0 +DA:1802,0 DA:1803,0 -DA:1804,0 +DA:1805,0 DA:1807,0 DA:1808,0 DA:1810,0 -DA:1811,0 -DA:1813,0 -DA:1814,0 +DA:1812,0 DA:1815,0 -DA:1816,0 DA:1817,0 +DA:1818,0 DA:1819,0 -DA:1820,0 -DA:1821,0 -DA:1823,0 -DA:1824,0 -DA:1826,0 +DA:1824,2 +DA:1827,2 +DA:1828,2 DA:1829,0 DA:1830,0 -DA:1832,0 -DA:1834,0 -DA:1835,0 -DA:1837,0 +DA:1831,0 +DA:1834,2 +DA:1835,2 +DA:1836,2 +DA:1838,0 DA:1839,0 -DA:1842,0 -DA:1844,0 -DA:1845,0 -DA:1846,0 -DA:1851,0 -DA:1854,0 -DA:1855,0 -DA:1856,0 -DA:1857,0 -DA:1858,0 -DA:1861,0 -DA:1862,0 -DA:1863,0 -DA:1865,0 -DA:1866,0 -DA:1867,0 -DA:1872,0 -DA:1873,0 +DA:1840,0 +DA:1845,2 +DA:1846,2 +DA:1847,2 +DA:1849,2 +DA:1850,2 +DA:1852,2 +DA:1853,8514 +DA:1855,8514 +DA:1856,2 +DA:1857,2 +DA:1858,8512 +DA:1859,0 +DA:1860,0 +DA:1861,8512 +DA:1862,8512 +DA:1863,8512 +DA:1867,2 +DA:1868,0 +DA:1869,2 +DA:1870,0 +DA:1871,2 +DA:1872,2 DA:1874,0 -DA:1876,0 DA:1877,0 -DA:1879,0 -DA:1880,0 -DA:1882,0 -DA:1883,0 -DA:1884,0 -DA:1885,0 +DA:1882,3 +DA:1883,1 +DA:1884,2 +DA:1885,2 DA:1886,0 DA:1887,0 -DA:1888,0 DA:1889,0 DA:1890,0 -DA:1894,0 -DA:1895,0 -DA:1896,0 -DA:1897,0 -DA:1898,0 -DA:1899,0 -DA:1901,0 -DA:1904,0 -DA:1909,0 -DA:1910,0 -DA:1911,0 -DA:1912,0 -DA:1913,0 -DA:1914,0 -DA:1916,0 -DA:1917,0 -DA:1919,1 -DA:1920,1 -DA:1921,1 -DA:1922,1 -LF:1266 -LH:10 -BRDA:34,0,0,0 +DA:1892,1 +DA:1893,1 +DA:1894,1 +DA:1895,1 +LF:1247 +LH:381 +BRDA:34,0,0,74 BRDA:34,0,1,0 -BRDA:34,1,0,0 +BRDA:34,1,0,74 BRDA:34,1,1,0 BRDA:36,2,0,0 BRDA:36,2,1,0 @@ -6644,194 +6522,194 @@ BRDA:50,5,0,0 BRDA:50,5,1,0 BRDA:54,6,0,0 BRDA:54,6,1,0 -BRDA:63,7,0,0 -BRDA:63,7,1,0 -BRDA:67,8,0,0 -BRDA:67,8,1,0 -BRDA:68,9,0,0 -BRDA:68,9,1,0 -BRDA:68,10,0,0 -BRDA:68,10,1,0 -BRDA:68,10,2,0 -BRDA:74,11,0,0 -BRDA:74,11,1,0 -BRDA:74,12,0,0 -BRDA:74,12,1,0 -BRDA:77,13,0,0 -BRDA:77,13,1,0 -BRDA:77,14,0,0 -BRDA:77,14,1,0 -BRDA:78,15,0,0 -BRDA:78,15,1,0 -BRDA:78,16,0,0 -BRDA:78,16,1,0 -BRDA:82,17,0,0 -BRDA:82,17,1,0 -BRDA:88,18,0,0 -BRDA:88,18,1,0 -BRDA:88,19,0,0 -BRDA:88,19,1,0 -BRDA:88,19,2,0 -BRDA:90,20,0,0 -BRDA:90,20,1,0 -BRDA:91,21,0,0 -BRDA:91,21,1,0 -BRDA:95,22,0,0 -BRDA:95,22,1,0 -BRDA:103,23,0,0 -BRDA:103,23,1,0 -BRDA:103,24,0,0 -BRDA:103,24,1,0 -BRDA:112,25,0,0 -BRDA:112,25,1,0 -BRDA:112,26,0,0 -BRDA:112,26,1,0 -BRDA:116,27,0,0 -BRDA:116,27,1,0 -BRDA:122,28,0,0 -BRDA:122,28,1,0 -BRDA:125,29,0,0 -BRDA:125,29,1,0 -BRDA:128,30,0,0 -BRDA:128,30,1,0 -BRDA:132,31,0,0 -BRDA:132,31,1,0 -BRDA:135,32,0,0 -BRDA:135,32,1,0 -BRDA:136,33,0,0 -BRDA:136,33,1,0 -BRDA:141,34,0,0 -BRDA:141,34,1,0 -BRDA:143,35,0,0 -BRDA:143,35,1,0 -BRDA:147,36,0,0 -BRDA:147,36,1,0 -BRDA:151,37,0,0 -BRDA:151,37,1,0 -BRDA:152,38,0,0 -BRDA:152,38,1,0 -BRDA:175,39,0,0 +BRDA:62,7,0,0 +BRDA:62,7,1,12 +BRDA:65,8,0,0 +BRDA:65,8,1,12 +BRDA:67,9,0,2 +BRDA:67,9,1,10 +BRDA:67,10,0,12 +BRDA:67,10,1,2 +BRDA:67,10,2,2 +BRDA:73,11,0,2 +BRDA:73,11,1,10 +BRDA:73,12,0,12 +BRDA:73,12,1,10 +BRDA:76,13,0,0 +BRDA:76,13,1,12 +BRDA:76,14,0,12 +BRDA:76,14,1,12 +BRDA:77,15,0,0 +BRDA:77,15,1,0 +BRDA:77,16,0,0 +BRDA:77,16,1,0 +BRDA:81,17,0,0 +BRDA:81,17,1,12 +BRDA:87,18,0,0 +BRDA:87,18,1,12 +BRDA:87,19,0,12 +BRDA:87,19,1,0 +BRDA:87,19,2,0 +BRDA:89,20,0,0 +BRDA:89,20,1,12 +BRDA:90,21,0,0 +BRDA:90,21,1,0 +BRDA:94,22,0,0 +BRDA:94,22,1,0 +BRDA:102,23,0,0 +BRDA:102,23,1,190 +BRDA:102,24,0,190 +BRDA:102,24,1,110 +BRDA:111,25,0,32 +BRDA:111,25,1,158 +BRDA:111,26,0,190 +BRDA:111,26,1,32 +BRDA:115,27,0,12 +BRDA:115,27,1,178 +BRDA:121,28,0,0 +BRDA:121,28,1,12 +BRDA:124,29,0,0 +BRDA:124,29,1,12 +BRDA:127,30,0,0 +BRDA:127,30,1,12 +BRDA:131,31,0,12 +BRDA:131,31,1,0 +BRDA:134,32,0,12 +BRDA:134,32,1,0 +BRDA:135,33,0,12 +BRDA:135,33,1,0 +BRDA:140,34,0,0 +BRDA:140,34,1,12 +BRDA:142,35,0,12 +BRDA:142,35,1,0 +BRDA:146,36,0,10 +BRDA:146,36,1,2 +BRDA:150,37,0,0 +BRDA:150,37,1,12 +BRDA:151,38,0,0 +BRDA:151,38,1,0 +BRDA:175,39,0,1 BRDA:175,39,1,0 -BRDA:175,40,0,0 -BRDA:175,40,1,0 -BRDA:179,41,0,0 -BRDA:179,41,1,0 -BRDA:181,42,0,0 -BRDA:181,42,1,0 -BRDA:181,43,0,0 -BRDA:181,43,1,0 -BRDA:181,43,2,0 -BRDA:181,43,3,0 -BRDA:184,44,0,0 -BRDA:184,44,1,0 -BRDA:184,45,0,0 -BRDA:184,45,1,0 -BRDA:184,45,2,0 -BRDA:187,46,0,0 -BRDA:187,46,1,0 -BRDA:187,47,0,0 -BRDA:187,47,1,0 -BRDA:190,48,0,0 -BRDA:190,48,1,0 -BRDA:190,49,0,0 -BRDA:190,49,1,0 +BRDA:177,40,0,0 +BRDA:177,40,1,1 +BRDA:177,41,0,1 +BRDA:177,41,1,1 +BRDA:177,41,2,1 +BRDA:177,41,3,0 +BRDA:180,42,0,0 +BRDA:180,42,1,1 +BRDA:180,43,0,1 +BRDA:180,43,1,1 +BRDA:180,43,2,1 +BRDA:183,44,0,0 +BRDA:183,44,1,1 +BRDA:183,45,0,1 +BRDA:183,45,1,1 +BRDA:186,46,0,0 +BRDA:186,46,1,1 +BRDA:186,47,0,1 +BRDA:186,47,1,0 +BRDA:189,48,0,0 +BRDA:189,48,1,1 +BRDA:189,49,0,1 +BRDA:189,49,1,0 BRDA:193,50,0,0 -BRDA:193,50,1,0 -BRDA:193,51,0,0 -BRDA:193,51,1,0 -BRDA:197,52,0,0 -BRDA:197,52,1,0 -BRDA:197,53,0,0 -BRDA:197,53,1,0 -BRDA:197,53,2,0 -BRDA:200,54,0,0 -BRDA:200,54,1,0 -BRDA:202,55,0,0 -BRDA:202,55,1,0 -BRDA:202,56,0,0 -BRDA:202,56,1,0 -BRDA:204,57,0,0 -BRDA:204,57,1,0 +BRDA:193,50,1,1 +BRDA:193,51,0,1 +BRDA:193,51,1,1 +BRDA:193,51,2,1 +BRDA:196,52,0,0 +BRDA:196,52,1,1 +BRDA:198,53,0,0 +BRDA:198,53,1,0 +BRDA:198,54,0,0 +BRDA:198,54,1,0 +BRDA:200,55,0,0 +BRDA:200,55,1,0 +BRDA:205,56,0,0 +BRDA:205,56,1,0 +BRDA:205,57,0,0 +BRDA:205,57,1,0 BRDA:209,58,0,0 BRDA:209,58,1,0 -BRDA:209,59,0,0 -BRDA:209,59,1,0 -BRDA:213,60,0,0 -BRDA:213,60,1,0 -BRDA:220,61,0,0 -BRDA:220,61,1,0 -BRDA:226,62,0,0 -BRDA:226,62,1,0 -BRDA:231,63,0,0 +BRDA:216,59,0,0 +BRDA:216,59,1,0 +BRDA:222,60,0,0 +BRDA:222,60,1,1 +BRDA:227,61,0,0 +BRDA:227,61,1,1 +BRDA:228,62,0,0 +BRDA:228,62,1,1 +BRDA:231,63,0,1 BRDA:231,63,1,0 -BRDA:232,64,0,0 -BRDA:232,64,1,0 -BRDA:235,65,0,0 -BRDA:235,65,1,0 -BRDA:237,66,0,0 -BRDA:237,66,1,0 -BRDA:247,67,0,0 -BRDA:247,67,1,0 -BRDA:254,68,0,0 -BRDA:254,68,1,0 -BRDA:255,69,0,0 -BRDA:255,69,1,0 -BRDA:255,70,0,0 -BRDA:255,70,1,0 -BRDA:256,71,0,0 -BRDA:256,71,1,0 -BRDA:256,72,0,0 -BRDA:256,72,1,0 -BRDA:257,73,0,0 -BRDA:257,73,1,0 -BRDA:258,74,0,0 -BRDA:258,74,1,0 -BRDA:258,75,0,0 -BRDA:258,75,1,0 -BRDA:259,76,0,0 -BRDA:259,76,1,0 -BRDA:259,77,0,0 -BRDA:259,77,1,0 +BRDA:233,64,0,1 +BRDA:233,64,1,0 +BRDA:243,65,0,12 +BRDA:243,65,1,0 +BRDA:250,66,0,0 +BRDA:250,66,1,10 +BRDA:251,67,0,0 +BRDA:251,67,1,10 +BRDA:251,68,0,10 +BRDA:251,68,1,10 +BRDA:252,69,0,0 +BRDA:252,69,1,10 +BRDA:252,70,0,10 +BRDA:252,70,1,10 +BRDA:253,71,0,10 +BRDA:253,71,1,0 +BRDA:254,72,0,0 +BRDA:254,72,1,10 +BRDA:254,73,0,10 +BRDA:254,73,1,10 +BRDA:255,74,0,0 +BRDA:255,74,1,0 +BRDA:255,75,0,0 +BRDA:255,75,1,0 +BRDA:257,76,0,0 +BRDA:257,76,1,0 +BRDA:258,77,0,0 +BRDA:258,77,1,0 BRDA:261,78,0,0 BRDA:261,78,1,0 BRDA:262,79,0,0 BRDA:262,79,1,0 -BRDA:265,80,0,0 -BRDA:265,80,1,0 -BRDA:266,81,0,0 -BRDA:266,81,1,0 +BRDA:267,80,0,0 +BRDA:267,80,1,0 +BRDA:268,81,0,0 +BRDA:268,81,1,0 BRDA:271,82,0,0 BRDA:271,82,1,0 BRDA:272,83,0,0 BRDA:272,83,1,0 -BRDA:275,84,0,0 -BRDA:275,84,1,0 -BRDA:276,85,0,0 -BRDA:276,85,1,0 -BRDA:283,86,0,0 -BRDA:283,86,1,0 -BRDA:283,87,0,0 -BRDA:283,87,1,0 -BRDA:285,88,0,0 -BRDA:285,88,1,0 -BRDA:286,89,0,0 -BRDA:286,89,1,0 -BRDA:286,90,0,0 +BRDA:279,84,0,0 +BRDA:279,84,1,10 +BRDA:279,85,0,10 +BRDA:279,85,1,10 +BRDA:281,86,0,10 +BRDA:281,86,1,0 +BRDA:282,87,0,10 +BRDA:282,87,1,0 +BRDA:282,88,0,10 +BRDA:282,88,1,0 +BRDA:285,89,0,10 +BRDA:285,89,1,0 +BRDA:286,90,0,10 BRDA:286,90,1,0 -BRDA:289,91,0,0 -BRDA:289,91,1,0 -BRDA:290,92,0,0 -BRDA:290,92,1,0 -BRDA:295,93,0,0 -BRDA:295,93,1,0 -BRDA:296,94,0,0 -BRDA:296,94,1,0 -BRDA:301,95,0,0 -BRDA:301,95,1,0 -BRDA:302,96,0,0 -BRDA:302,96,1,0 -BRDA:308,97,0,0 -BRDA:308,97,1,0 +BRDA:291,91,0,10 +BRDA:291,91,1,0 +BRDA:292,92,0,2 +BRDA:292,92,1,8 +BRDA:297,93,0,10 +BRDA:297,93,1,0 +BRDA:298,94,0,10 +BRDA:298,94,1,0 +BRDA:304,95,0,0 +BRDA:304,95,1,10 +BRDA:305,96,0,0 +BRDA:305,96,1,0 +BRDA:306,97,0,0 +BRDA:306,97,1,0 BRDA:309,98,0,0 BRDA:309,98,1,0 BRDA:310,99,0,0 @@ -6840,16 +6718,16 @@ BRDA:313,100,0,0 BRDA:313,100,1,0 BRDA:314,101,0,0 BRDA:314,101,1,0 -BRDA:317,102,0,0 -BRDA:317,102,1,0 -BRDA:318,103,0,0 -BRDA:318,103,1,0 -BRDA:323,104,0,0 -BRDA:323,104,1,0 -BRDA:324,105,0,0 -BRDA:324,105,1,0 -BRDA:329,106,0,0 -BRDA:329,106,1,0 +BRDA:319,102,0,0 +BRDA:319,102,1,0 +BRDA:320,103,0,0 +BRDA:320,103,1,0 +BRDA:325,104,0,0 +BRDA:325,104,1,10 +BRDA:327,105,0,0 +BRDA:327,105,1,0 +BRDA:328,106,0,0 +BRDA:328,106,1,0 BRDA:331,107,0,0 BRDA:331,107,1,0 BRDA:332,108,0,0 @@ -6858,16 +6736,16 @@ BRDA:335,109,0,0 BRDA:335,109,1,0 BRDA:336,110,0,0 BRDA:336,110,1,0 -BRDA:339,111,0,0 -BRDA:339,111,1,0 -BRDA:340,112,0,0 -BRDA:340,112,1,0 -BRDA:345,113,0,0 -BRDA:345,113,1,0 -BRDA:346,114,0,0 -BRDA:346,114,1,0 -BRDA:351,115,0,0 -BRDA:351,115,1,0 +BRDA:341,111,0,0 +BRDA:341,111,1,0 +BRDA:342,112,0,0 +BRDA:342,112,1,0 +BRDA:347,113,0,0 +BRDA:347,113,1,10 +BRDA:349,114,0,0 +BRDA:349,114,1,0 +BRDA:350,115,0,0 +BRDA:350,115,1,0 BRDA:353,116,0,0 BRDA:353,116,1,0 BRDA:354,117,0,0 @@ -6876,801 +6754,789 @@ BRDA:357,118,0,0 BRDA:357,118,1,0 BRDA:358,119,0,0 BRDA:358,119,1,0 -BRDA:361,120,0,0 -BRDA:361,120,1,0 -BRDA:362,121,0,0 -BRDA:362,121,1,0 -BRDA:367,122,0,0 -BRDA:367,122,1,0 -BRDA:368,123,0,0 -BRDA:368,123,1,0 -BRDA:373,124,0,0 -BRDA:373,124,1,0 +BRDA:363,120,0,0 +BRDA:363,120,1,0 +BRDA:364,121,0,0 +BRDA:364,121,1,0 +BRDA:369,122,0,0 +BRDA:369,122,1,10 +BRDA:371,123,0,0 +BRDA:371,123,1,0 +BRDA:372,124,0,0 +BRDA:372,124,1,0 BRDA:375,125,0,0 BRDA:375,125,1,0 BRDA:376,126,0,0 BRDA:376,126,1,0 -BRDA:379,127,0,0 -BRDA:379,127,1,0 -BRDA:380,128,0,0 -BRDA:380,128,1,0 -BRDA:396,129,0,0 -BRDA:396,129,1,0 -BRDA:402,130,0,0 -BRDA:402,130,1,0 -BRDA:402,131,0,0 -BRDA:402,131,1,0 -BRDA:403,132,0,0 -BRDA:403,132,1,0 -BRDA:403,133,0,0 -BRDA:403,133,1,0 -BRDA:412,134,0,0 -BRDA:412,134,1,0 -BRDA:420,135,0,0 -BRDA:420,135,1,0 -BRDA:420,136,0,0 -BRDA:420,136,1,0 -BRDA:420,136,2,0 -BRDA:421,137,0,0 -BRDA:421,137,1,0 -BRDA:426,138,0,0 -BRDA:426,138,1,0 -BRDA:426,139,0,0 -BRDA:426,139,1,0 -BRDA:428,140,0,0 -BRDA:428,140,1,0 -BRDA:429,141,0,0 -BRDA:429,141,1,0 -BRDA:439,142,0,0 -BRDA:439,142,1,0 -BRDA:439,143,0,0 -BRDA:439,143,1,0 -BRDA:439,143,2,0 -BRDA:441,144,0,0 -BRDA:441,144,1,0 -BRDA:442,145,0,0 -BRDA:442,145,1,0 -BRDA:446,146,0,0 -BRDA:446,146,1,0 -BRDA:454,147,0,0 -BRDA:454,147,1,0 -BRDA:454,148,0,0 -BRDA:454,148,1,0 -BRDA:464,149,0,0 -BRDA:464,149,1,0 -BRDA:464,150,0,0 -BRDA:464,150,1,0 -BRDA:469,151,0,0 -BRDA:469,151,1,0 -BRDA:473,152,0,0 -BRDA:473,152,1,0 -BRDA:473,153,0,0 -BRDA:473,153,1,0 -BRDA:474,154,0,0 -BRDA:474,154,1,0 -BRDA:474,155,0,0 -BRDA:474,155,1,0 -BRDA:481,156,0,0 -BRDA:481,156,1,0 -BRDA:484,157,0,0 -BRDA:484,157,1,0 -BRDA:487,158,0,0 -BRDA:487,158,1,0 -BRDA:490,159,0,0 -BRDA:490,159,1,0 -BRDA:492,160,0,0 -BRDA:492,160,1,0 -BRDA:493,161,0,0 -BRDA:493,161,1,0 +BRDA:392,127,0,1 +BRDA:392,127,1,0 +BRDA:398,128,0,12 +BRDA:398,128,1,0 +BRDA:398,129,0,12 +BRDA:398,129,1,12 +BRDA:399,130,0,2 +BRDA:399,130,1,10 +BRDA:399,131,0,12 +BRDA:399,131,1,10 +BRDA:408,132,0,0 +BRDA:408,132,1,1 +BRDA:416,133,0,0 +BRDA:416,133,1,1 +BRDA:416,134,0,1 +BRDA:416,134,1,1 +BRDA:416,134,2,1 +BRDA:417,135,0,0 +BRDA:417,135,1,0 +BRDA:422,136,0,0 +BRDA:422,136,1,1 +BRDA:422,137,0,1 +BRDA:422,137,1,1 +BRDA:424,138,0,0 +BRDA:424,138,1,0 +BRDA:425,139,0,0 +BRDA:425,139,1,0 +BRDA:435,140,0,0 +BRDA:435,140,1,1 +BRDA:435,141,0,1 +BRDA:435,141,1,0 +BRDA:435,141,2,0 +BRDA:437,142,0,0 +BRDA:437,142,1,1 +BRDA:438,143,0,0 +BRDA:438,143,1,0 +BRDA:442,144,0,0 +BRDA:442,144,1,0 +BRDA:450,145,0,0 +BRDA:450,145,1,19 +BRDA:450,146,0,19 +BRDA:450,146,1,11 +BRDA:460,147,0,6 +BRDA:460,147,1,13 +BRDA:460,148,0,19 +BRDA:460,148,1,6 +BRDA:465,149,0,1 +BRDA:465,149,1,18 +BRDA:469,150,0,0 +BRDA:469,150,1,19 +BRDA:469,151,0,19 +BRDA:469,151,1,19 +BRDA:470,152,0,0 +BRDA:470,152,1,0 +BRDA:470,153,0,0 +BRDA:470,153,1,0 +BRDA:477,154,0,0 +BRDA:477,154,1,1 +BRDA:480,155,0,0 +BRDA:480,155,1,1 +BRDA:483,156,0,0 +BRDA:483,156,1,1 +BRDA:486,157,0,0 +BRDA:486,157,1,1 +BRDA:488,158,0,1 +BRDA:488,158,1,0 +BRDA:489,159,0,1 +BRDA:489,159,1,0 +BRDA:494,160,0,0 +BRDA:494,160,1,1 +BRDA:497,161,0,0 +BRDA:497,161,1,1 BRDA:498,162,0,0 BRDA:498,162,1,0 -BRDA:501,163,0,0 -BRDA:501,163,1,0 -BRDA:502,164,0,0 -BRDA:502,164,1,0 -BRDA:503,165,0,0 -BRDA:503,165,1,0 -BRDA:518,166,0,0 -BRDA:518,166,1,0 -BRDA:523,167,0,0 -BRDA:523,167,1,0 -BRDA:527,168,0,0 -BRDA:527,168,1,0 -BRDA:528,169,0,0 -BRDA:528,169,1,0 -BRDA:529,170,0,0 -BRDA:529,170,1,0 -BRDA:530,171,0,0 -BRDA:530,171,1,0 -BRDA:540,172,0,0 -BRDA:540,172,1,0 -BRDA:541,173,0,0 -BRDA:541,173,1,0 -BRDA:541,174,0,0 -BRDA:541,174,1,0 -BRDA:547,175,0,0 -BRDA:547,175,1,0 -BRDA:548,176,0,0 -BRDA:548,176,1,0 -BRDA:558,177,0,0 -BRDA:558,177,1,0 -BRDA:559,178,0,0 -BRDA:559,178,1,0 -BRDA:560,179,0,0 -BRDA:560,179,1,0 -BRDA:561,180,0,0 -BRDA:561,180,1,0 -BRDA:562,181,0,0 -BRDA:562,181,1,0 -BRDA:563,182,0,0 -BRDA:563,182,1,0 -BRDA:564,183,0,0 -BRDA:564,183,1,0 -BRDA:565,184,0,0 -BRDA:565,184,1,0 -BRDA:566,185,0,0 -BRDA:566,185,1,0 -BRDA:567,186,0,0 -BRDA:567,186,1,0 -BRDA:568,187,0,0 -BRDA:568,187,1,0 -BRDA:569,188,0,0 -BRDA:569,188,1,0 -BRDA:570,189,0,0 -BRDA:570,189,1,0 -BRDA:571,190,0,0 -BRDA:571,190,1,0 -BRDA:572,191,0,0 -BRDA:572,191,1,0 -BRDA:573,192,0,0 -BRDA:573,192,1,0 -BRDA:574,193,0,0 -BRDA:574,193,1,0 -BRDA:575,194,0,0 -BRDA:575,194,1,0 -BRDA:576,195,0,0 -BRDA:576,195,1,0 -BRDA:577,196,0,0 -BRDA:577,196,1,0 -BRDA:578,197,0,0 -BRDA:578,197,1,0 -BRDA:579,198,0,0 -BRDA:579,198,1,0 -BRDA:580,199,0,0 -BRDA:580,199,1,0 -BRDA:581,200,0,0 -BRDA:581,200,1,0 -BRDA:582,201,0,0 -BRDA:582,201,1,0 -BRDA:583,202,0,0 -BRDA:583,202,1,0 -BRDA:584,203,0,0 -BRDA:584,203,1,0 -BRDA:585,204,0,0 -BRDA:585,204,1,0 -BRDA:586,205,0,0 -BRDA:586,205,1,0 -BRDA:587,206,0,0 -BRDA:587,206,1,0 -BRDA:590,207,0,0 -BRDA:590,207,1,0 -BRDA:590,208,0,0 -BRDA:590,208,1,0 -BRDA:590,208,2,0 -BRDA:590,208,3,0 -BRDA:592,209,0,0 -BRDA:592,209,1,0 -BRDA:596,210,0,0 -BRDA:596,210,1,0 -BRDA:596,211,0,0 -BRDA:596,211,1,0 -BRDA:596,211,2,0 -BRDA:596,211,3,0 -BRDA:596,211,4,0 -BRDA:596,211,5,0 -BRDA:596,211,6,0 -BRDA:620,212,0,0 -BRDA:620,212,1,0 -BRDA:624,213,0,0 -BRDA:624,213,1,0 -BRDA:624,214,0,0 -BRDA:624,214,1,0 -BRDA:631,215,0,0 -BRDA:631,215,1,0 -BRDA:631,216,0,0 -BRDA:631,216,1,0 -BRDA:633,217,0,0 -BRDA:633,217,1,0 -BRDA:647,218,0,0 -BRDA:647,218,1,0 -BRDA:647,219,0,0 -BRDA:647,219,1,0 -BRDA:648,220,0,0 -BRDA:648,220,1,0 -BRDA:648,221,0,0 -BRDA:648,221,1,0 +BRDA:499,163,0,0 +BRDA:499,163,1,0 +BRDA:514,164,0,0 +BRDA:514,164,1,12 +BRDA:519,165,0,0 +BRDA:519,165,1,78 +BRDA:523,166,0,0 +BRDA:523,166,1,12 +BRDA:524,167,0,0 +BRDA:524,167,1,12 +BRDA:525,168,0,0 +BRDA:525,168,1,0 +BRDA:526,169,0,0 +BRDA:526,169,1,0 +BRDA:536,170,0,0 +BRDA:536,170,1,12 +BRDA:537,171,0,0 +BRDA:537,171,1,0 +BRDA:537,172,0,0 +BRDA:537,172,1,0 +BRDA:543,173,0,0 +BRDA:543,173,1,1 +BRDA:544,174,0,0 +BRDA:544,174,1,0 +BRDA:554,175,0,134 +BRDA:554,175,1,61 +BRDA:555,176,0,108 +BRDA:555,176,1,26 +BRDA:556,177,0,95 +BRDA:556,177,1,13 +BRDA:557,178,0,95 +BRDA:557,178,1,0 +BRDA:558,179,0,95 +BRDA:558,179,1,0 +BRDA:559,180,0,95 +BRDA:559,180,1,0 +BRDA:560,181,0,95 +BRDA:560,181,1,0 +BRDA:561,182,0,93 +BRDA:561,182,1,2 +BRDA:562,183,0,81 +BRDA:562,183,1,12 +BRDA:563,184,0,81 +BRDA:563,184,1,0 +BRDA:564,185,0,81 +BRDA:564,185,1,0 +BRDA:565,186,0,81 +BRDA:565,186,1,0 +BRDA:566,187,0,81 +BRDA:566,187,1,0 +BRDA:567,188,0,81 +BRDA:567,188,1,0 +BRDA:568,189,0,68 +BRDA:568,189,1,13 +BRDA:569,190,0,68 +BRDA:569,190,1,0 +BRDA:570,191,0,68 +BRDA:570,191,1,0 +BRDA:571,192,0,68 +BRDA:571,192,1,0 +BRDA:572,193,0,68 +BRDA:572,193,1,0 +BRDA:573,194,0,67 +BRDA:573,194,1,1 +BRDA:574,195,0,67 +BRDA:574,195,1,0 +BRDA:575,196,0,66 +BRDA:575,196,1,1 +BRDA:576,197,0,54 +BRDA:576,197,1,12 +BRDA:577,198,0,54 +BRDA:577,198,1,0 +BRDA:578,199,0,54 +BRDA:578,199,1,0 +BRDA:579,200,0,54 +BRDA:579,200,1,0 +BRDA:580,201,0,54 +BRDA:580,201,1,0 +BRDA:581,202,0,54 +BRDA:581,202,1,0 +BRDA:582,203,0,54 +BRDA:582,203,1,0 +BRDA:583,204,0,50 +BRDA:583,204,1,4 +BRDA:586,205,0,11 +BRDA:586,205,1,184 +BRDA:586,206,0,195 +BRDA:586,206,1,194 +BRDA:586,206,2,194 +BRDA:586,206,3,184 +BRDA:588,207,0,11 +BRDA:588,207,1,0 +BRDA:592,208,0,156 +BRDA:592,208,1,39 +BRDA:592,209,0,195 +BRDA:592,209,1,79 +BRDA:592,209,2,66 +BRDA:592,209,3,66 +BRDA:592,209,4,39 +BRDA:592,209,5,39 +BRDA:592,209,6,39 +BRDA:615,210,0,0 +BRDA:615,210,1,0 +BRDA:618,211,0,0 +BRDA:618,211,1,0 +BRDA:618,212,0,0 +BRDA:618,212,1,0 +BRDA:625,213,0,0 +BRDA:625,213,1,0 +BRDA:625,214,0,0 +BRDA:625,214,1,0 +BRDA:627,215,0,0 +BRDA:627,215,1,0 +BRDA:640,216,0,0 +BRDA:640,216,1,0 +BRDA:640,217,0,0 +BRDA:640,217,1,0 +BRDA:641,218,0,0 +BRDA:641,218,1,0 +BRDA:641,219,0,0 +BRDA:641,219,1,0 +BRDA:645,220,0,0 +BRDA:645,220,1,0 +BRDA:652,221,0,0 +BRDA:652,221,1,0 BRDA:652,222,0,0 BRDA:652,222,1,0 -BRDA:659,223,0,0 -BRDA:659,223,1,0 -BRDA:659,224,0,0 -BRDA:659,224,1,0 -BRDA:668,225,0,0 -BRDA:668,225,1,0 -BRDA:668,226,0,0 -BRDA:668,226,1,0 -BRDA:672,227,0,0 -BRDA:672,227,1,0 -BRDA:677,228,0,0 -BRDA:677,228,1,0 -BRDA:680,229,0,0 -BRDA:680,229,1,0 +BRDA:661,223,0,0 +BRDA:661,223,1,0 +BRDA:661,224,0,0 +BRDA:661,224,1,0 +BRDA:665,225,0,0 +BRDA:665,225,1,0 +BRDA:670,226,0,0 +BRDA:670,226,1,0 +BRDA:673,227,0,0 +BRDA:673,227,1,0 +BRDA:676,228,0,0 +BRDA:676,228,1,0 +BRDA:682,229,0,0 +BRDA:682,229,1,0 BRDA:683,230,0,0 BRDA:683,230,1,0 -BRDA:689,231,0,0 -BRDA:689,231,1,0 +BRDA:688,231,0,0 +BRDA:688,231,1,0 BRDA:690,232,0,0 BRDA:690,232,1,0 -BRDA:695,233,0,0 -BRDA:695,233,1,0 -BRDA:697,234,0,0 -BRDA:697,234,1,0 -BRDA:701,235,0,0 -BRDA:701,235,1,0 -BRDA:705,236,0,0 -BRDA:705,236,1,0 -BRDA:706,237,0,0 -BRDA:706,237,1,0 -BRDA:739,238,0,0 -BRDA:739,238,1,0 -BRDA:740,239,0,0 -BRDA:740,239,1,0 -BRDA:743,240,0,0 -BRDA:743,240,1,0 -BRDA:745,241,0,0 -BRDA:745,241,1,0 +BRDA:694,233,0,0 +BRDA:694,233,1,0 +BRDA:698,234,0,0 +BRDA:698,234,1,0 +BRDA:699,235,0,0 +BRDA:699,235,1,0 +BRDA:731,236,0,0 +BRDA:731,236,1,0 +BRDA:732,237,0,0 +BRDA:732,237,1,0 +BRDA:735,238,0,0 +BRDA:735,238,1,0 +BRDA:737,239,0,0 +BRDA:737,239,1,0 +BRDA:747,240,0,0 +BRDA:747,240,1,0 +BRDA:754,241,0,0 +BRDA:754,241,1,0 BRDA:755,242,0,0 BRDA:755,242,1,0 -BRDA:762,243,0,0 -BRDA:762,243,1,0 -BRDA:763,244,0,0 -BRDA:763,244,1,0 -BRDA:763,245,0,0 -BRDA:763,245,1,0 -BRDA:764,246,0,0 -BRDA:764,246,1,0 -BRDA:764,247,0,0 -BRDA:764,247,1,0 -BRDA:765,248,0,0 -BRDA:765,248,1,0 -BRDA:766,249,0,0 -BRDA:766,249,1,0 -BRDA:766,250,0,0 -BRDA:766,250,1,0 -BRDA:767,251,0,0 -BRDA:767,251,1,0 -BRDA:767,252,0,0 -BRDA:767,252,1,0 -BRDA:769,253,0,0 -BRDA:769,253,1,0 -BRDA:770,254,0,0 -BRDA:770,254,1,0 -BRDA:773,255,0,0 -BRDA:773,255,1,0 -BRDA:774,256,0,0 -BRDA:774,256,1,0 -BRDA:779,257,0,0 -BRDA:779,257,1,0 -BRDA:780,258,0,0 -BRDA:780,258,1,0 -BRDA:783,259,0,0 -BRDA:783,259,1,0 -BRDA:784,260,0,0 -BRDA:784,260,1,0 -BRDA:790,261,0,0 -BRDA:790,261,1,0 -BRDA:791,262,0,0 -BRDA:791,262,1,0 -BRDA:792,263,0,0 -BRDA:792,263,1,0 -BRDA:795,264,0,0 -BRDA:795,264,1,0 -BRDA:796,265,0,0 -BRDA:796,265,1,0 -BRDA:799,266,0,0 -BRDA:799,266,1,0 -BRDA:800,267,0,0 -BRDA:800,267,1,0 -BRDA:805,268,0,0 -BRDA:805,268,1,0 -BRDA:806,269,0,0 -BRDA:806,269,1,0 -BRDA:811,270,0,0 -BRDA:811,270,1,0 -BRDA:813,271,0,0 -BRDA:813,271,1,0 -BRDA:814,272,0,0 -BRDA:814,272,1,0 -BRDA:817,273,0,0 -BRDA:817,273,1,0 -BRDA:818,274,0,0 -BRDA:818,274,1,0 -BRDA:821,275,0,0 -BRDA:821,275,1,0 -BRDA:822,276,0,0 -BRDA:822,276,1,0 -BRDA:827,277,0,0 -BRDA:827,277,1,0 -BRDA:828,278,0,0 -BRDA:828,278,1,0 -BRDA:833,279,0,0 -BRDA:833,279,1,0 -BRDA:835,280,0,0 -BRDA:835,280,1,0 -BRDA:836,281,0,0 -BRDA:836,281,1,0 -BRDA:839,282,0,0 -BRDA:839,282,1,0 -BRDA:840,283,0,0 -BRDA:840,283,1,0 -BRDA:843,284,0,0 -BRDA:843,284,1,0 -BRDA:844,285,0,0 -BRDA:844,285,1,0 -BRDA:849,286,0,0 -BRDA:849,286,1,0 -BRDA:850,287,0,0 -BRDA:850,287,1,0 -BRDA:855,288,0,0 -BRDA:855,288,1,0 -BRDA:857,289,0,0 -BRDA:857,289,1,0 -BRDA:858,290,0,0 -BRDA:858,290,1,0 -BRDA:861,291,0,0 -BRDA:861,291,1,0 -BRDA:862,292,0,0 -BRDA:862,292,1,0 -BRDA:878,293,0,0 -BRDA:878,293,1,0 -BRDA:887,294,0,0 -BRDA:887,294,1,0 -BRDA:887,295,0,0 -BRDA:887,295,1,0 -BRDA:898,296,0,0 -BRDA:898,296,1,0 -BRDA:898,297,0,0 -BRDA:898,297,1,0 -BRDA:902,298,0,0 -BRDA:902,298,1,0 -BRDA:908,299,0,0 -BRDA:908,299,1,0 -BRDA:911,300,0,0 -BRDA:911,300,1,0 -BRDA:914,301,0,0 -BRDA:914,301,1,0 -BRDA:917,302,0,0 -BRDA:917,302,1,0 +BRDA:755,243,0,0 +BRDA:755,243,1,0 +BRDA:756,244,0,0 +BRDA:756,244,1,0 +BRDA:756,245,0,0 +BRDA:756,245,1,0 +BRDA:757,246,0,0 +BRDA:757,246,1,0 +BRDA:758,247,0,0 +BRDA:758,247,1,0 +BRDA:758,248,0,0 +BRDA:758,248,1,0 +BRDA:759,249,0,0 +BRDA:759,249,1,0 +BRDA:759,250,0,0 +BRDA:759,250,1,0 +BRDA:761,251,0,0 +BRDA:761,251,1,0 +BRDA:762,252,0,0 +BRDA:762,252,1,0 +BRDA:765,253,0,0 +BRDA:765,253,1,0 +BRDA:766,254,0,0 +BRDA:766,254,1,0 +BRDA:771,255,0,0 +BRDA:771,255,1,0 +BRDA:772,256,0,0 +BRDA:772,256,1,0 +BRDA:775,257,0,0 +BRDA:775,257,1,0 +BRDA:776,258,0,0 +BRDA:776,258,1,0 +BRDA:782,259,0,0 +BRDA:782,259,1,0 +BRDA:783,260,0,0 +BRDA:783,260,1,0 +BRDA:784,261,0,0 +BRDA:784,261,1,0 +BRDA:787,262,0,0 +BRDA:787,262,1,0 +BRDA:788,263,0,0 +BRDA:788,263,1,0 +BRDA:791,264,0,0 +BRDA:791,264,1,0 +BRDA:792,265,0,0 +BRDA:792,265,1,0 +BRDA:797,266,0,0 +BRDA:797,266,1,0 +BRDA:798,267,0,0 +BRDA:798,267,1,0 +BRDA:803,268,0,0 +BRDA:803,268,1,0 +BRDA:805,269,0,0 +BRDA:805,269,1,0 +BRDA:806,270,0,0 +BRDA:806,270,1,0 +BRDA:809,271,0,0 +BRDA:809,271,1,0 +BRDA:810,272,0,0 +BRDA:810,272,1,0 +BRDA:813,273,0,0 +BRDA:813,273,1,0 +BRDA:814,274,0,0 +BRDA:814,274,1,0 +BRDA:819,275,0,0 +BRDA:819,275,1,0 +BRDA:820,276,0,0 +BRDA:820,276,1,0 +BRDA:825,277,0,0 +BRDA:825,277,1,0 +BRDA:827,278,0,0 +BRDA:827,278,1,0 +BRDA:828,279,0,0 +BRDA:828,279,1,0 +BRDA:831,280,0,0 +BRDA:831,280,1,0 +BRDA:832,281,0,0 +BRDA:832,281,1,0 +BRDA:835,282,0,0 +BRDA:835,282,1,0 +BRDA:836,283,0,0 +BRDA:836,283,1,0 +BRDA:841,284,0,0 +BRDA:841,284,1,0 +BRDA:842,285,0,0 +BRDA:842,285,1,0 +BRDA:847,286,0,0 +BRDA:847,286,1,0 +BRDA:849,287,0,0 +BRDA:849,287,1,0 +BRDA:850,288,0,0 +BRDA:850,288,1,0 +BRDA:853,289,0,0 +BRDA:853,289,1,0 +BRDA:854,290,0,0 +BRDA:854,290,1,0 +BRDA:870,291,0,0 +BRDA:870,291,1,0 +BRDA:879,292,0,0 +BRDA:879,292,1,0 +BRDA:879,293,0,0 +BRDA:879,293,1,0 +BRDA:890,294,0,0 +BRDA:890,294,1,0 +BRDA:890,295,0,0 +BRDA:890,295,1,0 +BRDA:894,296,0,0 +BRDA:894,296,1,0 +BRDA:900,297,0,0 +BRDA:900,297,1,0 +BRDA:903,298,0,0 +BRDA:903,298,1,0 +BRDA:906,299,0,0 +BRDA:906,299,1,0 +BRDA:909,300,0,0 +BRDA:909,300,1,0 +BRDA:910,301,0,0 +BRDA:910,301,1,0 +BRDA:915,302,0,0 +BRDA:915,302,1,0 BRDA:918,303,0,0 BRDA:918,303,1,0 -BRDA:923,304,0,0 -BRDA:923,304,1,0 -BRDA:926,305,0,0 -BRDA:926,305,1,0 -BRDA:927,306,0,0 -BRDA:927,306,1,0 -BRDA:928,307,0,0 -BRDA:928,307,1,0 -BRDA:945,308,0,0 -BRDA:945,308,1,0 -BRDA:949,309,0,0 -BRDA:949,309,1,0 -BRDA:950,310,0,0 -BRDA:950,310,1,0 -BRDA:951,311,0,0 -BRDA:951,311,1,0 -BRDA:952,312,0,0 -BRDA:952,312,1,0 -BRDA:968,313,0,0 -BRDA:968,313,1,0 -BRDA:969,314,0,0 -BRDA:969,314,1,0 -BRDA:979,315,0,0 -BRDA:979,315,1,0 -BRDA:980,316,0,0 -BRDA:980,316,1,0 -BRDA:981,317,0,0 -BRDA:981,317,1,0 -BRDA:982,318,0,0 -BRDA:982,318,1,0 -BRDA:983,319,0,0 -BRDA:983,319,1,0 -BRDA:984,320,0,0 -BRDA:984,320,1,0 -BRDA:985,321,0,0 -BRDA:985,321,1,0 -BRDA:986,322,0,0 -BRDA:986,322,1,0 -BRDA:987,323,0,0 -BRDA:987,323,1,0 -BRDA:988,324,0,0 -BRDA:988,324,1,0 -BRDA:989,325,0,0 -BRDA:989,325,1,0 -BRDA:990,326,0,0 -BRDA:990,326,1,0 -BRDA:991,327,0,0 -BRDA:991,327,1,0 -BRDA:992,328,0,0 -BRDA:992,328,1,0 -BRDA:993,329,0,0 -BRDA:993,329,1,0 -BRDA:994,330,0,0 -BRDA:994,330,1,0 -BRDA:995,331,0,0 -BRDA:995,331,1,0 -BRDA:996,332,0,0 -BRDA:996,332,1,0 -BRDA:997,333,0,0 -BRDA:997,333,1,0 -BRDA:998,334,0,0 -BRDA:998,334,1,0 -BRDA:999,335,0,0 -BRDA:999,335,1,0 -BRDA:1000,336,0,0 -BRDA:1000,336,1,0 -BRDA:1001,337,0,0 -BRDA:1001,337,1,0 -BRDA:1004,338,0,0 -BRDA:1004,338,1,0 -BRDA:1004,339,0,0 -BRDA:1004,339,1,0 -BRDA:1004,339,2,0 -BRDA:1004,339,3,0 -BRDA:1004,339,4,0 -BRDA:1006,340,0,0 -BRDA:1006,340,1,0 -BRDA:1019,341,0,0 -BRDA:1019,341,1,0 +BRDA:919,304,0,0 +BRDA:919,304,1,0 +BRDA:920,305,0,0 +BRDA:920,305,1,0 +BRDA:937,306,0,0 +BRDA:937,306,1,0 +BRDA:941,307,0,0 +BRDA:941,307,1,0 +BRDA:942,308,0,0 +BRDA:942,308,1,0 +BRDA:943,309,0,0 +BRDA:943,309,1,0 +BRDA:944,310,0,0 +BRDA:944,310,1,0 +BRDA:960,311,0,0 +BRDA:960,311,1,0 +BRDA:961,312,0,0 +BRDA:961,312,1,0 +BRDA:971,313,0,0 +BRDA:971,313,1,0 +BRDA:972,314,0,0 +BRDA:972,314,1,0 +BRDA:973,315,0,0 +BRDA:973,315,1,0 +BRDA:974,316,0,0 +BRDA:974,316,1,0 +BRDA:975,317,0,0 +BRDA:975,317,1,0 +BRDA:976,318,0,0 +BRDA:976,318,1,0 +BRDA:977,319,0,0 +BRDA:977,319,1,0 +BRDA:978,320,0,0 +BRDA:978,320,1,0 +BRDA:979,321,0,0 +BRDA:979,321,1,0 +BRDA:980,322,0,0 +BRDA:980,322,1,0 +BRDA:981,323,0,0 +BRDA:981,323,1,0 +BRDA:982,324,0,0 +BRDA:982,324,1,0 +BRDA:983,325,0,0 +BRDA:983,325,1,0 +BRDA:984,326,0,0 +BRDA:984,326,1,0 +BRDA:985,327,0,0 +BRDA:985,327,1,0 +BRDA:986,328,0,0 +BRDA:986,328,1,0 +BRDA:987,329,0,0 +BRDA:987,329,1,0 +BRDA:988,330,0,0 +BRDA:988,330,1,0 +BRDA:989,331,0,0 +BRDA:989,331,1,0 +BRDA:990,332,0,0 +BRDA:990,332,1,0 +BRDA:991,333,0,0 +BRDA:991,333,1,0 +BRDA:992,334,0,0 +BRDA:992,334,1,0 +BRDA:993,335,0,0 +BRDA:993,335,1,0 +BRDA:996,336,0,0 +BRDA:996,336,1,0 +BRDA:996,337,0,0 +BRDA:996,337,1,0 +BRDA:996,337,2,0 +BRDA:996,337,3,0 +BRDA:996,337,4,0 +BRDA:998,338,0,0 +BRDA:998,338,1,0 +BRDA:1010,339,0,0 +BRDA:1010,339,1,0 +BRDA:1010,340,0,0 +BRDA:1010,340,1,0 +BRDA:1018,341,0,0 +BRDA:1018,341,1,0 BRDA:1019,342,0,0 BRDA:1019,342,1,0 -BRDA:1027,343,0,0 -BRDA:1027,343,1,0 -BRDA:1028,344,0,0 -BRDA:1028,344,1,0 -BRDA:1029,345,0,0 -BRDA:1029,345,1,0 -BRDA:1039,346,0,0 -BRDA:1039,346,1,0 -BRDA:1042,347,0,0 -BRDA:1042,347,1,0 -BRDA:1047,348,0,0 -BRDA:1047,348,1,0 -BRDA:1047,349,0,0 -BRDA:1047,349,1,0 -BRDA:1051,350,0,0 -BRDA:1051,350,1,0 -BRDA:1057,351,0,0 -BRDA:1057,351,1,0 -BRDA:1058,352,0,0 -BRDA:1058,352,1,0 -BRDA:1065,353,0,0 -BRDA:1065,353,1,0 -BRDA:1085,354,0,0 -BRDA:1085,354,1,0 -BRDA:1085,355,0,0 -BRDA:1085,355,1,0 -BRDA:1094,356,0,0 -BRDA:1094,356,1,0 -BRDA:1097,357,0,0 -BRDA:1097,357,1,0 -BRDA:1102,358,0,0 -BRDA:1102,358,1,0 -BRDA:1102,359,0,0 -BRDA:1102,359,1,0 -BRDA:1106,360,0,0 -BRDA:1106,360,1,0 -BRDA:1112,361,0,0 -BRDA:1112,361,1,0 -BRDA:1113,362,0,0 -BRDA:1113,362,1,0 -BRDA:1120,363,0,0 -BRDA:1120,363,1,0 -BRDA:1138,364,0,0 -BRDA:1138,364,1,0 +BRDA:1020,343,0,0 +BRDA:1020,343,1,0 +BRDA:1030,344,0,0 +BRDA:1030,344,1,0 +BRDA:1033,345,0,0 +BRDA:1033,345,1,0 +BRDA:1038,346,0,0 +BRDA:1038,346,1,0 +BRDA:1038,347,0,0 +BRDA:1038,347,1,0 +BRDA:1042,348,0,0 +BRDA:1042,348,1,0 +BRDA:1048,349,0,0 +BRDA:1048,349,1,0 +BRDA:1049,350,0,0 +BRDA:1049,350,1,0 +BRDA:1056,351,0,0 +BRDA:1056,351,1,0 +BRDA:1074,352,0,0 +BRDA:1074,352,1,0 +BRDA:1074,353,0,0 +BRDA:1074,353,1,0 +BRDA:1083,354,0,0 +BRDA:1083,354,1,0 +BRDA:1086,355,0,0 +BRDA:1086,355,1,0 +BRDA:1091,356,0,0 +BRDA:1091,356,1,0 +BRDA:1091,357,0,0 +BRDA:1091,357,1,0 +BRDA:1095,358,0,0 +BRDA:1095,358,1,0 +BRDA:1101,359,0,0 +BRDA:1101,359,1,0 +BRDA:1102,360,0,0 +BRDA:1102,360,1,0 +BRDA:1109,361,0,0 +BRDA:1109,361,1,0 +BRDA:1126,362,0,0 +BRDA:1126,362,1,0 +BRDA:1131,363,0,0 +BRDA:1131,363,1,0 +BRDA:1141,364,0,0 +BRDA:1141,364,1,0 BRDA:1143,365,0,0 BRDA:1143,365,1,0 -BRDA:1153,366,0,0 -BRDA:1153,366,1,0 -BRDA:1155,367,0,0 -BRDA:1155,367,1,0 -BRDA:1160,368,0,0 -BRDA:1160,368,1,0 -BRDA:1163,369,0,0 -BRDA:1163,369,1,0 -BRDA:1191,370,0,0 -BRDA:1191,370,1,0 -BRDA:1191,371,0,0 -BRDA:1191,371,1,0 -BRDA:1195,372,0,0 -BRDA:1195,372,1,0 -BRDA:1200,373,0,0 -BRDA:1200,373,1,0 -BRDA:1203,374,0,0 -BRDA:1203,374,1,0 -BRDA:1204,375,0,0 -BRDA:1204,375,1,0 -BRDA:1210,376,0,0 -BRDA:1210,376,1,0 -BRDA:1214,377,0,0 -BRDA:1214,377,1,0 -BRDA:1215,378,0,0 -BRDA:1215,378,1,0 -BRDA:1216,379,0,0 -BRDA:1216,379,1,0 -BRDA:1234,380,0,0 -BRDA:1234,380,1,0 -BRDA:1239,381,0,0 -BRDA:1239,381,1,0 +BRDA:1148,366,0,0 +BRDA:1148,366,1,0 +BRDA:1151,367,0,0 +BRDA:1151,367,1,0 +BRDA:1179,368,0,0 +BRDA:1179,368,1,0 +BRDA:1179,369,0,0 +BRDA:1179,369,1,0 +BRDA:1183,370,0,0 +BRDA:1183,370,1,0 +BRDA:1188,371,0,0 +BRDA:1188,371,1,0 +BRDA:1191,372,0,0 +BRDA:1191,372,1,0 +BRDA:1192,373,0,0 +BRDA:1192,373,1,0 +BRDA:1198,374,0,0 +BRDA:1198,374,1,0 +BRDA:1202,375,0,0 +BRDA:1202,375,1,0 +BRDA:1203,376,0,0 +BRDA:1203,376,1,0 +BRDA:1204,377,0,0 +BRDA:1204,377,1,0 +BRDA:1222,378,0,0 +BRDA:1222,378,1,0 +BRDA:1227,379,0,0 +BRDA:1227,379,1,0 +BRDA:1235,380,0,0 +BRDA:1235,380,1,0 +BRDA:1236,381,0,0 +BRDA:1236,381,1,0 BRDA:1247,382,0,0 BRDA:1247,382,1,0 -BRDA:1248,383,0,0 -BRDA:1248,383,1,0 -BRDA:1259,384,0,0 -BRDA:1259,384,1,0 +BRDA:1252,383,0,0 +BRDA:1252,383,1,0 +BRDA:1262,384,0,0 +BRDA:1262,384,1,0 BRDA:1264,385,0,0 BRDA:1264,385,1,0 -BRDA:1274,386,0,0 -BRDA:1274,386,1,0 -BRDA:1276,387,0,0 -BRDA:1276,387,1,0 -BRDA:1281,388,0,0 -BRDA:1281,388,1,0 -BRDA:1284,389,0,0 -BRDA:1284,389,1,0 -BRDA:1312,390,0,0 -BRDA:1312,390,1,0 -BRDA:1312,391,0,0 -BRDA:1312,391,1,0 -BRDA:1316,392,0,0 -BRDA:1316,392,1,0 -BRDA:1321,393,0,0 -BRDA:1321,393,1,0 -BRDA:1324,394,0,0 -BRDA:1324,394,1,0 -BRDA:1325,395,0,0 -BRDA:1325,395,1,0 -BRDA:1331,396,0,0 -BRDA:1331,396,1,0 -BRDA:1335,397,0,0 -BRDA:1335,397,1,0 -BRDA:1336,398,0,0 -BRDA:1336,398,1,0 -BRDA:1337,399,0,0 -BRDA:1337,399,1,0 -BRDA:1356,400,0,0 -BRDA:1356,400,1,0 -BRDA:1361,401,0,0 -BRDA:1361,401,1,0 -BRDA:1369,402,0,0 -BRDA:1369,402,1,0 -BRDA:1370,403,0,0 -BRDA:1370,403,1,0 -BRDA:1382,404,0,0 -BRDA:1382,404,1,0 -BRDA:1383,405,0,0 -BRDA:1383,405,1,0 -BRDA:1385,406,0,0 -BRDA:1385,406,1,0 -BRDA:1389,407,0,0 -BRDA:1389,407,1,0 -BRDA:1403,408,0,0 -BRDA:1403,408,1,0 -BRDA:1417,409,0,0 -BRDA:1417,409,1,0 -BRDA:1417,410,0,0 -BRDA:1417,410,1,0 -BRDA:1426,411,0,0 -BRDA:1426,411,1,0 -BRDA:1429,412,0,0 -BRDA:1429,412,1,0 -BRDA:1443,413,0,0 -BRDA:1443,413,1,0 -BRDA:1443,414,0,0 -BRDA:1443,414,1,0 -BRDA:1447,415,0,0 -BRDA:1447,415,1,0 -BRDA:1454,416,0,0 -BRDA:1454,416,1,0 -BRDA:1455,417,0,0 -BRDA:1455,417,1,0 -BRDA:1456,418,0,0 -BRDA:1456,418,1,0 -BRDA:1462,419,0,0 -BRDA:1462,419,1,0 -BRDA:1462,420,0,0 -BRDA:1462,420,1,0 -BRDA:1465,421,0,0 -BRDA:1465,421,1,0 -BRDA:1470,422,0,0 -BRDA:1470,422,1,0 -BRDA:1477,423,0,0 -BRDA:1477,423,1,0 -BRDA:1480,424,0,0 -BRDA:1480,424,1,0 -BRDA:1483,425,0,0 -BRDA:1483,425,1,0 -BRDA:1486,426,0,0 -BRDA:1486,426,1,0 +BRDA:1269,386,0,0 +BRDA:1269,386,1,0 +BRDA:1272,387,0,0 +BRDA:1272,387,1,0 +BRDA:1300,388,0,0 +BRDA:1300,388,1,0 +BRDA:1300,389,0,0 +BRDA:1300,389,1,0 +BRDA:1304,390,0,0 +BRDA:1304,390,1,0 +BRDA:1309,391,0,0 +BRDA:1309,391,1,0 +BRDA:1312,392,0,0 +BRDA:1312,392,1,0 +BRDA:1313,393,0,0 +BRDA:1313,393,1,0 +BRDA:1319,394,0,0 +BRDA:1319,394,1,0 +BRDA:1323,395,0,0 +BRDA:1323,395,1,0 +BRDA:1324,396,0,0 +BRDA:1324,396,1,0 +BRDA:1325,397,0,0 +BRDA:1325,397,1,0 +BRDA:1344,398,0,0 +BRDA:1344,398,1,0 +BRDA:1349,399,0,0 +BRDA:1349,399,1,0 +BRDA:1357,400,0,0 +BRDA:1357,400,1,0 +BRDA:1358,401,0,0 +BRDA:1358,401,1,0 +BRDA:1370,402,0,0 +BRDA:1370,402,1,0 +BRDA:1371,403,0,0 +BRDA:1371,403,1,0 +BRDA:1373,404,0,0 +BRDA:1373,404,1,0 +BRDA:1377,405,0,0 +BRDA:1377,405,1,0 +BRDA:1391,406,0,0 +BRDA:1391,406,1,0 +BRDA:1404,407,0,148 +BRDA:1404,407,1,8364 +BRDA:1404,408,0,8512 +BRDA:1404,408,1,148 +BRDA:1413,409,0,0 +BRDA:1413,409,1,8506 +BRDA:1416,410,0,8506 +BRDA:1416,410,1,0 +BRDA:1430,411,0,16943 +BRDA:1430,411,1,51338 +BRDA:1430,412,0,68281 +BRDA:1430,412,1,16943 +BRDA:1434,413,0,8512 +BRDA:1434,413,1,59769 +BRDA:1441,414,0,8506 +BRDA:1441,414,1,6 +BRDA:1442,415,0,0 +BRDA:1442,415,1,8512 +BRDA:1443,416,0,8512 +BRDA:1443,416,1,0 +BRDA:1449,417,0,8512 +BRDA:1449,417,1,0 +BRDA:1449,418,0,8512 +BRDA:1449,418,1,0 +BRDA:1452,419,0,8512 +BRDA:1452,419,1,0 +BRDA:1457,420,0,0 +BRDA:1457,420,1,8512 +BRDA:1464,421,0,0 +BRDA:1464,421,1,8512 +BRDA:1467,422,0,0 +BRDA:1467,422,1,8512 +BRDA:1470,423,0,0 +BRDA:1470,423,1,8512 +BRDA:1473,424,0,0 +BRDA:1473,424,1,8512 +BRDA:1476,425,0,0 +BRDA:1476,425,1,8512 +BRDA:1479,426,0,0 +BRDA:1479,426,1,8512 BRDA:1489,427,0,0 -BRDA:1489,427,1,0 +BRDA:1489,427,1,8512 BRDA:1492,428,0,0 -BRDA:1492,428,1,0 -BRDA:1502,429,0,0 -BRDA:1502,429,1,0 -BRDA:1505,430,0,0 -BRDA:1505,430,1,0 -BRDA:1508,431,0,0 -BRDA:1508,431,1,0 -BRDA:1511,432,0,0 -BRDA:1511,432,1,0 +BRDA:1492,428,1,8512 +BRDA:1495,429,0,0 +BRDA:1495,429,1,8512 +BRDA:1498,430,0,0 +BRDA:1498,430,1,8512 +BRDA:1501,431,0,0 +BRDA:1501,431,1,8512 +BRDA:1504,432,0,0 +BRDA:1504,432,1,8512 BRDA:1514,433,0,0 -BRDA:1514,433,1,0 -BRDA:1517,434,0,0 -BRDA:1517,434,1,0 -BRDA:1527,435,0,0 -BRDA:1527,435,1,0 -BRDA:1545,436,0,0 -BRDA:1545,436,1,0 -BRDA:1552,437,0,0 -BRDA:1552,437,1,0 -BRDA:1572,438,0,0 -BRDA:1572,438,1,0 -BRDA:1572,439,0,0 -BRDA:1572,439,1,0 -BRDA:1579,440,0,0 -BRDA:1579,440,1,0 -BRDA:1580,441,0,0 -BRDA:1580,441,1,0 -BRDA:1581,442,0,0 -BRDA:1581,442,1,0 -BRDA:1581,443,0,0 -BRDA:1581,443,1,0 -BRDA:1593,444,0,0 -BRDA:1593,444,1,0 -BRDA:1598,445,0,0 -BRDA:1598,445,1,0 -BRDA:1598,446,0,0 -BRDA:1598,446,1,0 -BRDA:1602,447,0,0 -BRDA:1602,447,1,0 -BRDA:1621,448,0,0 -BRDA:1621,448,1,0 -BRDA:1624,449,0,0 -BRDA:1624,449,1,0 -BRDA:1624,450,0,0 -BRDA:1624,450,1,0 -BRDA:1625,451,0,0 -BRDA:1625,451,1,0 -BRDA:1625,452,0,0 -BRDA:1625,452,1,0 -BRDA:1633,453,0,0 -BRDA:1633,453,1,0 -BRDA:1633,454,0,0 -BRDA:1633,454,1,0 -BRDA:1636,455,0,0 -BRDA:1636,455,1,0 -BRDA:1641,456,0,0 -BRDA:1641,456,1,0 -BRDA:1662,457,0,0 -BRDA:1662,457,1,0 -BRDA:1662,458,0,0 -BRDA:1662,458,1,0 -BRDA:1669,459,0,0 -BRDA:1669,459,1,0 -BRDA:1669,460,0,0 -BRDA:1669,460,1,0 -BRDA:1673,461,0,0 -BRDA:1673,461,1,0 -BRDA:1680,462,0,0 -BRDA:1680,462,1,0 -BRDA:1681,463,0,0 -BRDA:1681,463,1,0 -BRDA:1682,464,0,0 -BRDA:1682,464,1,0 -BRDA:1688,465,0,0 -BRDA:1688,465,1,0 -BRDA:1688,466,0,0 -BRDA:1688,466,1,0 -BRDA:1691,467,0,0 -BRDA:1691,467,1,0 -BRDA:1696,468,0,0 -BRDA:1696,468,1,0 -BRDA:1703,469,0,0 -BRDA:1703,469,1,0 -BRDA:1706,470,0,0 -BRDA:1706,470,1,0 -BRDA:1709,471,0,0 -BRDA:1709,471,1,0 -BRDA:1712,472,0,0 -BRDA:1712,472,1,0 -BRDA:1715,473,0,0 -BRDA:1715,473,1,0 -BRDA:1718,474,0,0 -BRDA:1718,474,1,0 -BRDA:1728,475,0,0 -BRDA:1728,475,1,0 -BRDA:1746,476,0,0 -BRDA:1746,476,1,0 -BRDA:1753,477,0,0 -BRDA:1753,477,1,0 -BRDA:1773,478,0,0 -BRDA:1773,478,1,0 -BRDA:1773,479,0,0 -BRDA:1773,479,1,0 -BRDA:1780,480,0,0 -BRDA:1780,480,1,0 -BRDA:1782,481,0,0 -BRDA:1782,481,1,0 -BRDA:1782,482,0,0 -BRDA:1782,482,1,0 -BRDA:1794,483,0,0 -BRDA:1794,483,1,0 -BRDA:1799,484,0,0 -BRDA:1799,484,1,0 -BRDA:1799,485,0,0 -BRDA:1799,485,1,0 -BRDA:1803,486,0,0 -BRDA:1803,486,1,0 -BRDA:1823,487,0,0 -BRDA:1823,487,1,0 -BRDA:1826,488,0,0 -BRDA:1826,488,1,0 -BRDA:1826,489,0,0 -BRDA:1826,489,1,0 -BRDA:1829,490,0,0 -BRDA:1829,490,1,0 -BRDA:1834,491,0,0 -BRDA:1834,491,1,0 -BRDA:1855,492,0,0 -BRDA:1855,492,1,0 -BRDA:1855,493,0,0 -BRDA:1855,493,1,0 -BRDA:1857,494,0,0 -BRDA:1857,494,1,0 -BRDA:1857,495,0,0 -BRDA:1857,495,1,0 -BRDA:1876,496,0,0 -BRDA:1876,496,1,0 -BRDA:1876,497,0,0 -BRDA:1876,497,1,0 -BRDA:1882,498,0,0 -BRDA:1882,498,1,0 -BRDA:1885,499,0,0 -BRDA:1885,499,1,0 -BRDA:1888,500,0,0 -BRDA:1888,500,1,0 -BRDA:1894,501,0,0 -BRDA:1894,501,1,0 -BRDA:1894,502,0,0 -BRDA:1894,502,1,0 -BRDA:1894,502,2,0 -BRDA:1896,503,0,0 -BRDA:1896,503,1,0 -BRDA:1898,504,0,0 -BRDA:1898,504,1,0 -BRDA:1909,505,0,0 -BRDA:1909,505,1,0 -BRDA:1911,506,0,0 -BRDA:1911,506,1,0 -BRDA:1911,507,0,0 -BRDA:1911,507,1,0 -BRDA:1913,508,0,0 -BRDA:1913,508,1,0 -BRDA:1919,509,0,1 -BRDA:1919,509,1,0 -BRF:1039 -BRH:1 +BRDA:1514,433,1,8512 +BRDA:1529,434,0,8514 +BRDA:1529,434,1,8514 +BRDA:1536,435,0,8514 +BRDA:1536,435,1,0 +BRDA:1560,436,0,2 +BRDA:1560,436,1,0 +BRDA:1561,437,0,2 +BRDA:1561,437,1,0 +BRDA:1562,438,0,2 +BRDA:1562,438,1,0 +BRDA:1562,439,0,2 +BRDA:1562,439,1,2 +BRDA:1574,440,0,2 +BRDA:1574,440,1,0 +BRDA:1579,441,0,12 +BRDA:1579,441,1,18 +BRDA:1579,442,0,30 +BRDA:1579,442,1,12 +BRDA:1583,443,0,2 +BRDA:1583,443,1,28 +BRDA:1602,444,0,0 +BRDA:1602,444,1,2 +BRDA:1605,445,0,0 +BRDA:1605,445,1,2 +BRDA:1605,446,0,2 +BRDA:1605,446,1,2 +BRDA:1606,447,0,0 +BRDA:1606,447,1,0 +BRDA:1606,448,0,0 +BRDA:1606,448,1,0 +BRDA:1614,449,0,2 +BRDA:1614,449,1,0 +BRDA:1614,450,0,2 +BRDA:1614,450,1,0 +BRDA:1617,451,0,2 +BRDA:1617,451,1,0 +BRDA:1622,452,0,0 +BRDA:1622,452,1,2 +BRDA:1642,453,0,0 +BRDA:1642,453,1,0 +BRDA:1642,454,0,0 +BRDA:1642,454,1,0 +BRDA:1648,455,0,0 +BRDA:1648,455,1,0 +BRDA:1648,456,0,0 +BRDA:1648,456,1,0 +BRDA:1652,457,0,0 +BRDA:1652,457,1,0 +BRDA:1659,458,0,0 +BRDA:1659,458,1,0 +BRDA:1660,459,0,0 +BRDA:1660,459,1,0 +BRDA:1661,460,0,0 +BRDA:1661,460,1,0 +BRDA:1667,461,0,0 +BRDA:1667,461,1,0 +BRDA:1667,462,0,0 +BRDA:1667,462,1,0 +BRDA:1670,463,0,0 +BRDA:1670,463,1,0 +BRDA:1675,464,0,0 +BRDA:1675,464,1,0 +BRDA:1682,465,0,0 +BRDA:1682,465,1,0 +BRDA:1685,466,0,0 +BRDA:1685,466,1,0 +BRDA:1688,467,0,0 +BRDA:1688,467,1,0 +BRDA:1691,468,0,0 +BRDA:1691,468,1,0 +BRDA:1694,469,0,0 +BRDA:1694,469,1,0 +BRDA:1697,470,0,0 +BRDA:1697,470,1,0 +BRDA:1707,471,0,0 +BRDA:1707,471,1,0 +BRDA:1722,472,0,0 +BRDA:1722,472,1,0 +BRDA:1729,473,0,0 +BRDA:1729,473,1,0 +BRDA:1753,474,0,0 +BRDA:1753,474,1,0 +BRDA:1755,475,0,0 +BRDA:1755,475,1,0 +BRDA:1755,476,0,0 +BRDA:1755,476,1,0 +BRDA:1767,477,0,0 +BRDA:1767,477,1,0 +BRDA:1772,478,0,0 +BRDA:1772,478,1,0 +BRDA:1772,479,0,0 +BRDA:1772,479,1,0 +BRDA:1776,480,0,0 +BRDA:1776,480,1,0 +BRDA:1796,481,0,0 +BRDA:1796,481,1,0 +BRDA:1799,482,0,0 +BRDA:1799,482,1,0 +BRDA:1799,483,0,0 +BRDA:1799,483,1,0 +BRDA:1802,484,0,0 +BRDA:1802,484,1,0 +BRDA:1807,485,0,0 +BRDA:1807,485,1,0 +BRDA:1828,486,0,0 +BRDA:1828,486,1,2 +BRDA:1828,487,0,2 +BRDA:1828,487,1,2 +BRDA:1830,488,0,0 +BRDA:1830,488,1,0 +BRDA:1830,489,0,0 +BRDA:1830,489,1,0 +BRDA:1849,490,0,2 +BRDA:1849,490,1,0 +BRDA:1849,491,0,2 +BRDA:1849,491,1,2 +BRDA:1855,492,0,2 +BRDA:1855,492,1,8512 +BRDA:1858,493,0,0 +BRDA:1858,493,1,8512 +BRDA:1861,494,0,8512 +BRDA:1861,494,1,0 +BRDA:1867,495,0,0 +BRDA:1867,495,1,2 +BRDA:1867,496,0,2 +BRDA:1867,496,1,0 +BRDA:1867,496,2,0 +BRDA:1869,497,0,0 +BRDA:1869,497,1,2 +BRDA:1871,498,0,2 +BRDA:1871,498,1,0 +BRDA:1882,499,0,1 +BRDA:1882,499,1,2 +BRDA:1884,500,0,2 +BRDA:1884,500,1,0 +BRDA:1884,501,0,2 +BRDA:1884,501,1,0 +BRDA:1886,502,0,0 +BRDA:1886,502,1,0 +BRDA:1892,503,0,1 +BRDA:1892,503,1,0 +BRF:1027 +BRH:271 end_of_record TN: SF:src\main\server\adapter\jsonLd\jsonLd.js @@ -7777,14 +7643,14 @@ end_of_record TN: SF:src\main\server\adapter\openbadges\openbadges.js FN:3,(anonymous_0) -FN:16,(anonymous_1) -FN:21,(anonymous_2) -FN:34,(anonymous_3) -FN:51,(anonymous_4) -FN:76,(anonymous_5) -FN:122,(anonymous_6) -FN:167,(anonymous_7) -FN:225,(anonymous_8) +FN:13,(anonymous_1) +FN:18,(anonymous_2) +FN:31,(anonymous_3) +FN:48,(anonymous_4) +FN:73,(anonymous_5) +FN:119,(anonymous_6) +FN:164,(anonymous_7) +FN:222,(anonymous_8) FNF:9 FNH:0 FNDA:0,(anonymous_0) @@ -7799,98 +7665,99 @@ FNDA:0,(anonymous_8) DA:1,1 DA:3,1 DA:4,0 -DA:5,0 +DA:6,0 DA:7,0 +DA:8,0 DA:9,0 DA:10,0 -DA:11,0 -DA:12,0 -DA:13,0 -DA:16,1 -DA:17,0 -DA:21,1 -DA:22,0 +DA:13,1 +DA:14,0 +DA:18,1 +DA:19,0 +DA:20,0 +DA:21,0 DA:23,0 DA:24,0 +DA:25,0 DA:26,0 -DA:27,0 DA:28,0 -DA:29,0 -DA:31,0 -DA:34,1 +DA:31,1 +DA:32,0 +DA:33,0 +DA:34,0 DA:35,0 DA:36,0 DA:37,0 -DA:38,0 DA:39,0 -DA:40,0 -DA:42,0 -DA:51,1 +DA:48,1 +DA:49,0 +DA:50,0 +DA:51,0 DA:52,0 DA:53,0 DA:54,0 -DA:55,0 DA:56,0 -DA:57,0 -DA:59,0 -DA:76,1 +DA:73,1 +DA:74,0 +DA:75,0 +DA:76,0 DA:77,0 DA:78,0 DA:79,0 -DA:80,0 DA:81,0 DA:82,0 +DA:83,0 DA:84,0 DA:85,0 DA:86,0 -DA:87,0 -DA:88,0 -DA:89,0 +DA:93,0 +DA:94,0 +DA:95,0 DA:96,0 DA:97,0 DA:98,0 -DA:99,0 -DA:100,0 -DA:101,0 +DA:105,0 +DA:106,0 +DA:107,0 DA:108,0 DA:109,0 DA:110,0 -DA:111,0 -DA:112,0 -DA:113,0 -DA:122,1 +DA:119,1 +DA:120,0 +DA:122,0 DA:123,0 -DA:125,0 +DA:124,0 DA:126,0 DA:127,0 +DA:128,0 DA:129,0 -DA:130,0 -DA:131,0 DA:132,0 +DA:133,0 +DA:134,0 DA:135,0 DA:136,0 DA:137,0 -DA:138,0 DA:139,0 DA:140,0 +DA:141,0 DA:142,0 DA:143,0 -DA:144,0 -DA:145,0 DA:146,0 -DA:149,0 +DA:147,0 +DA:148,0 DA:150,0 DA:151,0 -DA:153,0 -DA:154,0 -DA:167,1 +DA:164,1 +DA:165,0 +DA:167,0 DA:168,0 +DA:169,0 DA:170,0 DA:171,0 DA:172,0 -DA:173,0 DA:174,0 DA:175,0 +DA:176,0 DA:177,0 DA:178,0 DA:179,0 @@ -7903,22 +7770,21 @@ DA:185,0 DA:186,0 DA:187,0 DA:188,0 -DA:189,0 DA:190,0 DA:191,0 DA:193,0 DA:194,0 +DA:195,0 DA:196,0 DA:197,0 -DA:198,0 DA:199,0 -DA:200,0 +DA:201,0 DA:202,0 -DA:204,0 -DA:205,0 -DA:206,0 -DA:222,0 -DA:225,1 +DA:203,0 +DA:219,0 +DA:222,1 +DA:223,0 +DA:225,0 DA:226,0 DA:228,0 DA:229,0 @@ -7930,104 +7796,98 @@ DA:237,0 DA:238,0 DA:240,0 DA:241,0 +DA:242,0 DA:243,0 DA:244,0 DA:245,0 -DA:246,0 DA:247,0 DA:248,0 DA:250,0 -DA:251,0 -DA:253,0 +DA:257,1 +DA:258,1 +DA:259,1 DA:260,1 DA:261,1 DA:262,1 -DA:263,1 -DA:264,1 -DA:265,1 -LF:149 +LF:147 LH:16 -BRDA:4,0,0,0 -BRDA:4,0,1,0 -BRDA:4,1,0,0 -BRDA:4,1,1,0 -BRDA:23,2,0,0 -BRDA:23,2,1,0 -BRDA:26,3,0,0 -BRDA:26,3,1,0 -BRDA:36,4,0,0 -BRDA:36,4,1,0 -BRDA:39,5,0,0 -BRDA:39,5,1,0 -BRDA:53,6,0,0 -BRDA:53,6,1,0 -BRDA:56,7,0,0 -BRDA:56,7,1,0 -BRDA:64,8,0,0 -BRDA:64,8,1,0 -BRDA:78,9,0,0 -BRDA:78,9,1,0 -BRDA:81,10,0,0 -BRDA:81,10,1,0 -BRDA:84,11,0,0 -BRDA:84,11,1,0 -BRDA:96,12,0,0 -BRDA:96,12,1,0 -BRDA:108,13,0,0 -BRDA:108,13,1,0 -BRDA:126,14,0,0 -BRDA:126,14,1,0 -BRDA:139,15,0,0 -BRDA:139,15,1,0 -BRDA:143,16,0,0 -BRDA:143,16,1,0 -BRDA:150,17,0,0 -BRDA:150,17,1,0 -BRDA:161,18,0,0 -BRDA:161,18,1,0 -BRDA:172,19,0,0 -BRDA:172,19,1,0 -BRDA:178,20,0,0 -BRDA:178,20,1,0 -BRDA:181,21,0,0 -BRDA:181,21,1,0 -BRDA:184,22,0,0 -BRDA:184,22,1,0 -BRDA:187,23,0,0 -BRDA:187,23,1,0 -BRDA:190,24,0,0 -BRDA:190,24,1,0 -BRDA:197,25,0,0 -BRDA:197,25,1,0 -BRDA:199,26,0,0 -BRDA:199,26,1,0 -BRDA:204,27,0,0 -BRDA:204,27,1,0 +BRDA:20,0,0,0 +BRDA:20,0,1,0 +BRDA:23,1,0,0 +BRDA:23,1,1,0 +BRDA:33,2,0,0 +BRDA:33,2,1,0 +BRDA:36,3,0,0 +BRDA:36,3,1,0 +BRDA:50,4,0,0 +BRDA:50,4,1,0 +BRDA:53,5,0,0 +BRDA:53,5,1,0 +BRDA:61,6,0,0 +BRDA:61,6,1,0 +BRDA:75,7,0,0 +BRDA:75,7,1,0 +BRDA:78,8,0,0 +BRDA:78,8,1,0 +BRDA:81,9,0,0 +BRDA:81,9,1,0 +BRDA:93,10,0,0 +BRDA:93,10,1,0 +BRDA:105,11,0,0 +BRDA:105,11,1,0 +BRDA:123,12,0,0 +BRDA:123,12,1,0 +BRDA:136,13,0,0 +BRDA:136,13,1,0 +BRDA:140,14,0,0 +BRDA:140,14,1,0 +BRDA:147,15,0,0 +BRDA:147,15,1,0 +BRDA:158,16,0,0 +BRDA:158,16,1,0 +BRDA:169,17,0,0 +BRDA:169,17,1,0 +BRDA:175,18,0,0 +BRDA:175,18,1,0 +BRDA:178,19,0,0 +BRDA:178,19,1,0 +BRDA:181,20,0,0 +BRDA:181,20,1,0 +BRDA:184,21,0,0 +BRDA:184,21,1,0 +BRDA:187,22,0,0 +BRDA:187,22,1,0 +BRDA:194,23,0,0 +BRDA:194,23,1,0 +BRDA:196,24,0,0 +BRDA:196,24,1,0 +BRDA:201,25,0,0 +BRDA:201,25,1,0 +BRDA:228,26,0,0 +BRDA:228,26,1,0 +BRDA:228,27,0,0 +BRDA:228,27,1,0 BRDA:231,28,0,0 BRDA:231,28,1,0 -BRDA:231,29,0,0 -BRDA:231,29,1,0 +BRDA:234,29,0,0 +BRDA:234,29,1,0 BRDA:234,30,0,0 BRDA:234,30,1,0 +BRDA:234,30,2,0 BRDA:237,31,0,0 BRDA:237,31,1,0 BRDA:237,32,0,0 BRDA:237,32,1,0 BRDA:237,32,2,0 -BRDA:240,33,0,0 -BRDA:240,33,1,0 -BRDA:240,34,0,0 -BRDA:240,34,1,0 -BRDA:240,34,2,0 -BRDA:244,35,0,0 -BRDA:244,35,1,0 -BRDA:247,36,0,0 -BRDA:247,36,1,0 -BRDA:250,37,0,0 -BRDA:250,37,1,0 -BRDA:260,38,0,1 -BRDA:260,38,1,0 -BRF:80 +BRDA:241,33,0,0 +BRDA:241,33,1,0 +BRDA:244,34,0,0 +BRDA:244,34,1,0 +BRDA:247,35,0,0 +BRDA:247,35,1,0 +BRDA:257,36,0,1 +BRDA:257,36,1,0 +BRF:76 BRH:1 end_of_record TN: @@ -8041,9 +7901,9 @@ FN:97,(anonymous_5) FN:104,(anonymous_6) FN:119,(anonymous_7) FNF:8 -FNH:0 +FNH:1 FNDA:0,(anonymous_0) -FNDA:0,(anonymous_1) +FNDA:1,(anonymous_1) FNDA:0,(anonymous_2) FNDA:0,(anonymous_3) FNDA:0,connectWebsocket @@ -8069,8 +7929,8 @@ DA:18,0 DA:21,0 DA:22,0 DA:25,1 -DA:26,0 -DA:27,0 +DA:26,1 +DA:27,1 DA:28,0 DA:29,0 DA:30,0 @@ -8130,7 +7990,7 @@ DA:120,0 DA:121,0 DA:122,0 LF:79 -LH:15 +LH:17 BRDA:3,0,0,1 BRDA:3,0,1,1 BRDA:4,1,0,1 @@ -8139,7 +7999,7 @@ BRDA:16,2,0,0 BRDA:16,2,1,0 BRDA:17,3,0,0 BRDA:17,3,1,0 -BRDA:26,4,0,0 +BRDA:26,4,0,1 BRDA:26,4,1,0 BRDA:28,5,0,0 BRDA:28,5,1,0 @@ -8159,7 +8019,7 @@ BRDA:77,10,1,0 BRDA:106,11,0,0 BRDA:106,11,1,0 BRF:27 -BRH:4 +BRH:5 end_of_record TN: SF:src\main\server\adapter\scd\scd.js @@ -9062,10 +8922,10 @@ FN:94,(anonymous_3) FN:162,(anonymous_4) FNF:5 FNH:2 -FNDA:2,(anonymous_0) +FNDA:1,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) -FNDA:45,(anonymous_3) +FNDA:13037,(anonymous_3) FNDA:0,(anonymous_4) DA:1,1 DA:3,1 @@ -9076,8 +8936,8 @@ DA:46,1 DA:58,1 DA:60,1 DA:63,1 -DA:64,2 -DA:65,2 +DA:64,1 +DA:65,1 DA:66,0 DA:67,0 DA:68,0 @@ -9093,7 +8953,7 @@ DA:85,1 DA:87,0 DA:88,0 DA:94,1 -DA:95,45 +DA:95,13037 DA:96,0 DA:97,0 DA:98,0 @@ -9103,12 +8963,12 @@ DA:102,0 DA:104,0 DA:105,0 DA:109,0 -DA:112,45 -DA:113,45 -DA:115,45 -DA:116,45 -DA:117,45 -DA:118,45 +DA:112,13037 +DA:113,9037 +DA:115,13037 +DA:116,10133 +DA:117,10133 +DA:118,10133 DA:120,0 DA:126,1 DA:127,1 @@ -9143,25 +9003,25 @@ DA:175,1 LF:73 LH:29 BRDA:65,0,0,0 -BRDA:65,0,1,2 +BRDA:65,0,1,1 BRDA:68,1,0,0 BRDA:68,1,1,0 BRDA:95,2,0,0 -BRDA:95,2,1,45 +BRDA:95,2,1,13037 BRDA:97,3,0,0 BRDA:97,3,1,0 BRDA:101,4,0,0 BRDA:101,4,1,0 BRDA:104,5,0,0 BRDA:104,5,1,0 -BRDA:112,6,0,45 -BRDA:112,6,1,0 -BRDA:115,7,0,45 -BRDA:115,7,1,0 -BRDA:115,8,0,45 -BRDA:115,8,1,0 -BRDA:117,9,0,0 -BRDA:117,9,1,45 +BRDA:112,6,0,9037 +BRDA:112,6,1,4000 +BRDA:115,7,0,10133 +BRDA:115,7,1,2904 +BRDA:115,8,0,13037 +BRDA:115,8,1,2904 +BRDA:117,9,0,1096 +BRDA:117,9,1,9037 BRDA:129,10,0,0 BRDA:129,10,1,1 BRDA:140,11,0,0 @@ -9175,7 +9035,7 @@ BRDA:166,14,1,0 BRDA:169,15,0,0 BRDA:169,15,1,0 BRF:32 -BRH:9 +BRH:13 end_of_record TN: SF:src\main\server\shims\auth.js @@ -9205,7 +9065,7 @@ FN:544,(anonymous_22) FN:546,(anonymous_23) FN:551,(anonymous_24) FNF:25 -FNH:1 +FNH:2 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) FNDA:1,interpretAdminCSV @@ -9225,7 +9085,7 @@ FNDA:0,createAdjectiveFrom FNDA:0,createNounFrom FNDA:0,validateJwt FNDA:0,(anonymous_18) -FNDA:0,(anonymous_19) +FNDA:549,(anonymous_19) FNDA:0,(anonymous_20) FNDA:0,(anonymous_21) FNDA:0,(anonymous_22) @@ -9404,11 +9264,11 @@ DA:310,0 DA:313,0 DA:316,0 DA:320,1 -DA:321,0 -DA:322,0 -DA:323,0 -DA:324,0 -DA:325,0 +DA:321,549 +DA:322,549 +DA:323,549 +DA:324,549 +DA:325,549 DA:327,0 DA:329,0 DA:330,0 @@ -9420,26 +9280,26 @@ DA:338,0 DA:339,0 DA:340,0 DA:341,0 -DA:343,0 +DA:343,549 DA:344,0 DA:345,0 DA:346,0 DA:347,0 DA:348,0 DA:349,0 -DA:351,0 +DA:351,549 DA:353,0 DA:354,0 DA:355,0 DA:356,0 DA:357,0 DA:358,0 -DA:360,0 +DA:360,549 DA:361,0 DA:362,0 DA:364,0 DA:365,0 -DA:368,0 +DA:368,549 DA:370,0 DA:371,0 DA:372,0 @@ -9490,7 +9350,7 @@ DA:434,0 DA:437,0 DA:439,0 DA:440,0 -DA:442,0 +DA:442,549 DA:444,1 DA:446,1 DA:448,0 @@ -9560,7 +9420,7 @@ DA:563,0 DA:566,0 DA:569,0 LF:328 -LH:21 +LH:31 BRDA:9,0,0,0 BRDA:9,0,1,0 BRDA:14,1,0,0 @@ -9670,7 +9530,7 @@ BRDA:301,51,1,0 BRDA:304,52,0,0 BRDA:304,52,1,0 BRDA:325,53,0,0 -BRDA:325,53,1,0 +BRDA:325,53,1,549 BRDA:327,54,0,0 BRDA:327,54,1,0 BRDA:330,55,0,0 @@ -9682,7 +9542,7 @@ BRDA:338,57,1,0 BRDA:340,58,0,0 BRDA:340,58,1,0 BRDA:343,59,0,0 -BRDA:343,59,1,0 +BRDA:343,59,1,549 BRDA:344,60,0,0 BRDA:344,60,1,0 BRDA:346,61,0,0 @@ -9690,15 +9550,15 @@ BRDA:346,61,1,0 BRDA:348,62,0,0 BRDA:348,62,1,0 BRDA:351,63,0,0 -BRDA:351,63,1,0 +BRDA:351,63,1,549 BRDA:357,64,0,0 BRDA:357,64,1,0 BRDA:360,65,0,0 -BRDA:360,65,1,0 +BRDA:360,65,1,549 BRDA:362,66,0,0 BRDA:362,66,1,0 BRDA:368,67,0,0 -BRDA:368,67,1,0 +BRDA:368,67,1,549 BRDA:378,68,0,0 BRDA:378,68,1,0 BRDA:385,69,0,0 @@ -9867,45 +9727,45 @@ BRDA:557,146,2,0 BRDA:562,147,0,0 BRDA:562,147,1,0 BRF:305 -BRH:10 +BRH:15 end_of_record TN: SF:src\main\server\shims\cassproject.js FN:1,(anonymous_0) FN:3,(anonymous_1) FN:6,(anonymous_2) -FN:7,(anonymous_3) -FN:13,(anonymous_4) -FN:15,(anonymous_5) -FN:19,(anonymous_6) -FN:20,(anonymous_7) -FN:26,(anonymous_8) -FN:28,(anonymous_9) -FN:31,(anonymous_10) -FN:32,(anonymous_11) -FN:38,(anonymous_12) -FN:40,(anonymous_13) -FN:43,(anonymous_14) -FN:44,(anonymous_15) -FN:50,(anonymous_16) -FN:52,(anonymous_17) -FN:56,(anonymous_18) -FN:57,(anonymous_19) -FN:58,(anonymous_20) -FN:63,(anonymous_21) -FN:65,(anonymous_22) -FN:68,(anonymous_23) -FN:69,(anonymous_24) -FN:76,(anonymous_25) -FN:78,(anonymous_26) -FN:81,(anonymous_27) -FN:82,(anonymous_28) -FN:89,(anonymous_29) -FN:91,(anonymous_30) -FN:94,(anonymous_31) -FN:95,(anonymous_32) +FN:9,(anonymous_3) +FN:17,(anonymous_4) +FN:19,(anonymous_5) +FN:23,(anonymous_6) +FN:26,(anonymous_7) +FN:34,(anonymous_8) +FN:36,(anonymous_9) +FN:39,(anonymous_10) +FN:42,(anonymous_11) +FN:50,(anonymous_12) +FN:52,(anonymous_13) +FN:55,(anonymous_14) +FN:58,(anonymous_15) +FN:66,(anonymous_16) +FN:68,(anonymous_17) +FN:72,(anonymous_18) +FN:73,(anonymous_19) +FN:76,(anonymous_20) +FN:83,(anonymous_21) +FN:85,(anonymous_22) +FN:88,(anonymous_23) +FN:91,(anonymous_24) +FN:100,(anonymous_25) +FN:102,(anonymous_26) +FN:105,(anonymous_27) +FN:108,(anonymous_28) +FN:117,(anonymous_29) +FN:119,(anonymous_30) +FN:122,(anonymous_31) +FN:125,(anonymous_32) FNF:33 -FNH:0 +FNH:12 FNDA:0,(anonymous_0) FNDA:0,(anonymous_1) FNDA:0,(anonymous_2) @@ -9914,74 +9774,74 @@ FNDA:0,(anonymous_4) FNDA:0,(anonymous_5) FNDA:0,(anonymous_6) FNDA:0,(anonymous_7) -FNDA:0,(anonymous_8) -FNDA:0,(anonymous_9) -FNDA:0,(anonymous_10) +FNDA:36,(anonymous_8) +FNDA:36,(anonymous_9) +FNDA:36,(anonymous_10) FNDA:0,(anonymous_11) -FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) -FNDA:0,(anonymous_14) +FNDA:10,(anonymous_12) +FNDA:10,(anonymous_13) +FNDA:10,(anonymous_14) FNDA:0,(anonymous_15) FNDA:0,(anonymous_16) FNDA:0,(anonymous_17) FNDA:0,(anonymous_18) FNDA:0,(anonymous_19) FNDA:0,(anonymous_20) -FNDA:0,(anonymous_21) -FNDA:0,(anonymous_22) -FNDA:0,(anonymous_23) +FNDA:20,(anonymous_21) +FNDA:20,(anonymous_22) +FNDA:20,(anonymous_23) FNDA:0,(anonymous_24) FNDA:0,(anonymous_25) FNDA:0,(anonymous_26) FNDA:0,(anonymous_27) FNDA:0,(anonymous_28) -FNDA:0,(anonymous_29) -FNDA:0,(anonymous_30) -FNDA:0,(anonymous_31) +FNDA:2,(anonymous_29) +FNDA:2,(anonymous_30) +FNDA:2,(anonymous_31) FNDA:0,(anonymous_32) DA:1,1 DA:2,0 DA:4,0 -DA:6,0 DA:7,0 -DA:13,1 -DA:14,0 -DA:16,0 -DA:19,0 -DA:20,0 -DA:26,1 -DA:27,0 -DA:29,0 -DA:31,0 -DA:32,0 -DA:38,1 -DA:39,0 -DA:41,0 -DA:43,0 -DA:44,0 -DA:50,1 -DA:51,0 -DA:53,0 -DA:57,0 -DA:58,0 -DA:63,1 -DA:64,0 -DA:66,0 -DA:68,0 +DA:10,0 +DA:17,1 +DA:18,0 +DA:20,0 +DA:24,0 +DA:27,0 +DA:34,1 +DA:35,36 +DA:37,36 +DA:40,36 +DA:43,0 +DA:50,1 +DA:51,10 +DA:53,10 +DA:56,10 +DA:59,0 +DA:66,1 +DA:67,0 DA:69,0 -DA:76,1 +DA:74,0 DA:77,0 -DA:79,0 -DA:81,0 -DA:82,0 -DA:89,1 -DA:90,0 +DA:83,1 +DA:84,20 +DA:86,20 +DA:89,20 DA:92,0 -DA:94,0 -DA:95,0 -DA:101,1 +DA:100,1 +DA:101,0 +DA:103,0 +DA:106,0 +DA:109,0 +DA:117,1 +DA:118,2 +DA:120,2 +DA:123,2 +DA:126,0 +DA:133,1 LF:41 -LH:9 +LH:21 BRF:0 BRH:0 end_of_record @@ -9989,24 +9849,24 @@ TN: SF:src\main\server\shims\jobs.js FN:7,(anonymous_0) FNF:1 -FNH:0 -FNDA:0,(anonymous_0) +FNH:1 +FNDA:2,(anonymous_0) DA:1,1 DA:2,1 DA:3,1 DA:5,1 -DA:8,0 -DA:9,0 -DA:10,0 -DA:11,0 +DA:8,2 +DA:9,2 +DA:10,2 +DA:11,2 DA:12,0 DA:15,0 LF:10 -LH:4 +LH:8 BRDA:11,0,0,0 -BRDA:11,0,1,0 +BRDA:11,0,1,2 BRF:2 -BRH:0 +BRH:1 end_of_record TN: SF:src\main\server\shims\levr.js @@ -10043,26 +9903,24 @@ FN:561,(anonymous_29) FN:571,(anonymous_30) FN:577,(anonymous_31) FN:583,(anonymous_32) -FN:584,(anonymous_33) -FN:597,(anonymous_34) -FN:598,(anonymous_35) -FN:633,(anonymous_36) -FN:634,(anonymous_37) -FN:637,(anonymous_38) -FN:645,(anonymous_39) -FN:650,(anonymous_40) -FN:651,(anonymous_41) -FN:654,(anonymous_42) -FN:662,(anonymous_43) -FN:668,(anonymous_44) -FNF:45 -FNH:5 -FNDA:8,(anonymous_0) +FN:593,(anonymous_33) +FN:626,(anonymous_34) +FN:627,(anonymous_35) +FN:630,(anonymous_36) +FN:638,(anonymous_37) +FN:643,(anonymous_38) +FN:644,(anonymous_39) +FN:647,(anonymous_40) +FN:654,(anonymous_41) +FN:660,(anonymous_42) +FNF:43 +FNH:25 +FNDA:8682,(anonymous_0) FNDA:0,(anonymous_1) -FNDA:8,(anonymous_2) +FNDA:9480,(anonymous_2) FNDA:0,(anonymous_3) FNDA:43,(anonymous_4) -FNDA:0,(anonymous_5) +FNDA:13,(anonymous_5) FNDA:0,(anonymous_6) FNDA:0,(anonymous_7) FNDA:0,(anonymous_8) @@ -10070,38 +9928,36 @@ FNDA:0,(anonymous_9) FNDA:0,(anonymous_10) FNDA:0,(anonymous_11) FNDA:0,(anonymous_12) -FNDA:0,(anonymous_13) -FNDA:0,(anonymous_14) -FNDA:0,(anonymous_15) -FNDA:0,(anonymous_16) -FNDA:0,(anonymous_17) -FNDA:0,(anonymous_18) +FNDA:83,(anonymous_13) +FNDA:248,(anonymous_14) +FNDA:82,(anonymous_15) +FNDA:452,(anonymous_16) +FNDA:1462,(anonymous_17) +FNDA:429,(anonymous_18) FNDA:0,(anonymous_19) -FNDA:0,(anonymous_20) -FNDA:0,(anonymous_21) -FNDA:0,(anonymous_22) -FNDA:0,(anonymous_23) -FNDA:1,(anonymous_24) -FNDA:0,(anonymous_25) -FNDA:0,(anonymous_26) -FNDA:0,(anonymous_27) -FNDA:0,(anonymous_28) +FNDA:895,(anonymous_20) +FNDA:452,(anonymous_21) +FNDA:1286,(anonymous_22) +FNDA:461,(anonymous_23) +FNDA:890,(anonymous_24) +FNDA:338,(anonymous_25) +FNDA:5,(anonymous_26) +FNDA:1671,(anonymous_27) +FNDA:8669,(anonymous_28) FNDA:0,(anonymous_29) FNDA:0,(anonymous_30) FNDA:0,(anonymous_31) -FNDA:0,(anonymous_32) -FNDA:0,(anonymous_33) -FNDA:0,(anonymous_34) -FNDA:0,(anonymous_35) -FNDA:0,(anonymous_36) +FNDA:8527,(anonymous_32) +FNDA:8527,(anonymous_33) +FNDA:1,(anonymous_34) +FNDA:1,(anonymous_35) +FNDA:1,(anonymous_36) FNDA:0,(anonymous_37) FNDA:0,(anonymous_38) FNDA:0,(anonymous_39) FNDA:0,(anonymous_40) FNDA:0,(anonymous_41) -FNDA:0,(anonymous_42) -FNDA:0,(anonymous_43) -FNDA:425,(anonymous_44) +FNDA:448,(anonymous_42) DA:1,1 DA:2,1 DA:3,1 @@ -10109,14 +9965,14 @@ DA:4,1 DA:5,1 DA:8,1 DA:9,1 -DA:10,8 +DA:10,8682 DA:14,1 DA:15,1 DA:16,0 DA:20,1 DA:21,1 -DA:22,8 -DA:23,8 +DA:22,9480 +DA:23,9363 DA:27,1 DA:28,1 DA:29,1 @@ -10128,29 +9984,29 @@ DA:38,0 DA:42,1 DA:43,1 DA:44,43 -DA:45,0 +DA:45,13 DA:47,0 DA:50,0 -DA:53,0 -DA:54,0 -DA:55,0 -DA:56,0 -DA:57,0 -DA:58,0 -DA:59,0 -DA:60,0 -DA:64,0 -DA:65,0 -DA:66,0 -DA:67,0 -DA:71,0 -DA:73,0 +DA:53,13 +DA:54,13 +DA:55,13 +DA:56,13 +DA:57,13 +DA:58,13 +DA:59,13 +DA:60,13 +DA:64,13 +DA:65,12 +DA:66,12 +DA:67,11 +DA:71,12 +DA:73,1 DA:76,0 DA:77,0 DA:78,0 DA:80,0 DA:82,0 -DA:84,0 +DA:84,13 DA:86,43 DA:87,0 DA:89,0 @@ -10184,68 +10040,68 @@ DA:134,0 DA:136,0 DA:138,0 DA:140,43 -DA:141,0 -DA:143,0 -DA:146,0 -DA:149,0 -DA:150,0 -DA:151,0 -DA:152,0 -DA:153,0 -DA:154,0 -DA:155,0 -DA:156,0 -DA:160,0 +DA:141,83 +DA:143,248 +DA:146,82 +DA:149,83 +DA:150,83 +DA:151,83 +DA:152,83 +DA:153,83 +DA:154,83 +DA:155,83 +DA:156,83 +DA:160,83 DA:161,0 DA:162,0 DA:163,0 DA:167,0 -DA:169,0 +DA:169,83 DA:172,0 DA:173,0 DA:174,0 DA:176,0 DA:178,0 -DA:180,0 +DA:180,83 DA:182,43 -DA:183,0 -DA:185,0 -DA:188,0 -DA:193,0 -DA:194,0 -DA:195,0 -DA:196,0 -DA:198,0 -DA:199,0 +DA:183,452 +DA:185,1462 +DA:188,429 +DA:193,452 +DA:194,452 +DA:195,452 +DA:196,452 +DA:198,452 +DA:199,452 DA:200,0 -DA:203,0 -DA:204,0 -DA:205,0 -DA:206,0 -DA:207,0 +DA:203,452 +DA:204,452 +DA:205,452 +DA:206,452 +DA:207,452 DA:208,0 DA:209,0 -DA:211,0 -DA:212,0 -DA:214,0 -DA:215,0 -DA:216,0 -DA:217,0 -DA:218,0 -DA:220,0 -DA:225,0 -DA:226,0 -DA:227,0 -DA:228,0 -DA:232,0 -DA:234,0 -DA:236,0 -DA:238,0 -DA:239,0 -DA:240,0 +DA:211,452 +DA:212,895 +DA:214,452 +DA:215,452 +DA:216,452 +DA:217,452 +DA:218,895 +DA:220,452 +DA:225,450 +DA:226,332 +DA:227,332 +DA:228,330 +DA:232,332 +DA:234,118 +DA:236,450 +DA:238,2 +DA:239,2 +DA:240,2 DA:242,0 -DA:244,0 -DA:247,0 +DA:244,2 +DA:247,452 DA:249,0 DA:250,0 DA:251,0 @@ -10258,144 +10114,144 @@ DA:261,43 DA:262,43 DA:266,1 DA:267,1 -DA:268,0 -DA:269,0 +DA:268,1286 +DA:269,1117 DA:270,0 -DA:272,0 -DA:273,0 -DA:275,0 +DA:272,1117 +DA:273,436 +DA:275,681 DA:279,1 DA:280,1 -DA:281,0 +DA:281,461 DA:285,1 DA:286,1 -DA:287,1 -DA:288,1 -DA:289,1 -DA:290,1 -DA:291,1 +DA:287,890 +DA:288,890 +DA:289,890 +DA:290,890 +DA:291,890 DA:293,0 -DA:295,0 -DA:296,0 -DA:297,0 -DA:298,0 -DA:299,0 -DA:300,0 -DA:302,0 -DA:303,0 -DA:304,0 -DA:310,0 -DA:311,0 -DA:316,0 +DA:295,890 +DA:296,890 +DA:297,890 +DA:298,890 +DA:299,890 +DA:300,884 +DA:302,6 +DA:303,6 +DA:304,6 +DA:310,890 +DA:311,392 +DA:316,498 DA:317,0 -DA:319,0 -DA:320,0 -DA:322,0 -DA:323,0 -DA:324,0 -DA:325,0 -DA:326,0 -DA:329,0 +DA:319,498 +DA:320,498 +DA:322,392 +DA:323,392 +DA:324,392 +DA:325,392 +DA:326,392 +DA:329,392 DA:330,0 -DA:332,0 +DA:332,392 DA:333,0 DA:334,0 DA:336,0 DA:337,0 DA:339,0 DA:341,0 -DA:343,0 -DA:344,0 -DA:345,0 +DA:343,392 +DA:344,392 +DA:345,392 DA:353,1 DA:354,1 DA:357,1 DA:358,1 -DA:359,0 -DA:360,0 -DA:361,0 +DA:359,338 +DA:360,338 +DA:361,338 DA:363,0 -DA:365,0 -DA:366,0 -DA:367,0 -DA:368,0 -DA:369,0 -DA:370,0 +DA:365,338 +DA:366,338 +DA:367,338 +DA:368,338 +DA:369,338 +DA:370,338 DA:372,0 DA:373,0 DA:374,0 -DA:380,0 -DA:381,0 -DA:386,0 +DA:380,338 +DA:381,83 +DA:386,255 DA:387,0 -DA:389,0 -DA:390,0 -DA:392,0 -DA:393,0 -DA:394,0 -DA:395,0 -DA:396,0 -DA:399,0 +DA:389,255 +DA:390,255 +DA:392,83 +DA:393,83 +DA:394,83 +DA:395,83 +DA:396,83 +DA:399,83 DA:400,0 -DA:402,0 +DA:402,83 DA:403,0 DA:404,0 -DA:407,0 +DA:407,83 DA:412,1 DA:413,1 -DA:414,0 -DA:415,0 -DA:416,0 +DA:414,5 +DA:415,5 +DA:416,5 DA:418,0 -DA:420,0 -DA:421,0 -DA:429,0 -DA:430,0 -DA:431,0 -DA:432,0 +DA:420,5 +DA:421,5 +DA:429,5 +DA:430,5 +DA:431,5 +DA:432,5 DA:434,0 DA:435,0 DA:436,0 -DA:442,0 -DA:443,0 -DA:448,0 +DA:442,5 +DA:443,3 +DA:448,2 DA:449,0 -DA:451,0 -DA:452,0 -DA:454,0 -DA:455,0 -DA:456,0 -DA:457,0 -DA:458,0 -DA:461,0 +DA:451,2 +DA:452,2 +DA:454,3 +DA:455,3 +DA:456,3 +DA:457,3 +DA:458,3 +DA:461,3 DA:462,0 -DA:464,0 +DA:464,3 DA:465,0 DA:466,0 -DA:469,0 +DA:469,3 DA:474,1 DA:475,1 -DA:476,0 -DA:477,0 -DA:478,0 -DA:479,0 -DA:480,0 +DA:476,1671 +DA:477,1671 +DA:478,1671 +DA:479,1671 +DA:480,1671 DA:482,0 -DA:484,0 -DA:485,0 -DA:494,0 -DA:495,0 -DA:496,0 -DA:497,0 +DA:484,1671 +DA:485,1671 +DA:494,1671 +DA:495,1671 +DA:496,1671 +DA:497,1671 DA:499,0 DA:500,0 DA:501,0 -DA:507,0 +DA:507,1671 DA:508,0 -DA:513,0 +DA:513,1671 DA:514,0 -DA:516,0 -DA:517,0 +DA:516,1671 +DA:517,1671 DA:519,0 DA:520,0 DA:521,0 @@ -10414,12 +10270,12 @@ DA:540,0 DA:541,0 DA:549,1 DA:550,1 -DA:551,0 -DA:552,0 -DA:553,0 -DA:554,0 -DA:555,0 -DA:556,0 +DA:551,8669 +DA:552,8669 +DA:553,8669 +DA:554,8669 +DA:555,8669 +DA:556,8669 DA:560,1 DA:561,1 DA:562,0 @@ -10435,58 +10291,52 @@ DA:577,1 DA:578,0 DA:582,1 DA:583,1 -DA:584,0 -DA:585,0 -DA:586,0 +DA:584,8527 +DA:585,8527 DA:587,0 -DA:589,0 -DA:590,0 -DA:596,1 -DA:597,1 -DA:598,0 -DA:599,0 -DA:600,0 +DA:592,1 +DA:593,1 +DA:594,8527 +DA:595,8527 +DA:597,8527 +DA:598,8527 +DA:599,8527 +DA:600,8527 DA:602,0 -DA:603,0 -DA:604,0 -DA:605,0 -DA:607,0 -DA:608,0 +DA:624,1 +DA:625,1 +DA:626,1 +DA:627,1 +DA:628,1 +DA:629,1 +DA:630,1 DA:631,1 -DA:632,1 -DA:633,1 -DA:634,0 -DA:635,0 -DA:636,0 -DA:637,0 -DA:638,0 -DA:644,1 -DA:645,1 +DA:637,1 +DA:638,1 +DA:639,0 +DA:643,1 +DA:644,0 +DA:645,0 DA:646,0 -DA:650,1 -DA:651,0 -DA:652,0 -DA:653,0 -DA:654,0 +DA:647,0 +DA:648,0 +DA:653,1 +DA:654,1 DA:655,0 -DA:656,0 -DA:661,1 -DA:662,1 -DA:663,0 -DA:668,1 -DA:669,425 -LF:373 -LH:71 +DA:660,1 +DA:661,448 +LF:367 +LH:243 BRDA:8,0,0,1 BRDA:8,0,1,0 BRDA:14,1,0,1 BRDA:14,1,1,0 BRDA:20,2,0,1 BRDA:20,2,1,0 -BRDA:22,3,0,0 -BRDA:22,3,1,8 -BRDA:22,4,0,8 -BRDA:22,4,1,8 +BRDA:22,3,0,117 +BRDA:22,3,1,9363 +BRDA:22,4,0,9480 +BRDA:22,4,1,9480 BRDA:29,5,0,0 BRDA:29,5,1,1 BRDA:36,6,0,1 @@ -10494,11 +10344,11 @@ BRDA:36,6,1,0 BRDA:42,7,0,1 BRDA:42,7,1,0 BRDA:59,8,0,0 -BRDA:59,8,1,0 +BRDA:59,8,1,13 BRDA:59,9,0,0 -BRDA:59,9,1,0 -BRDA:64,10,0,0 -BRDA:64,10,1,0 +BRDA:59,9,1,13 +BRDA:64,10,0,12 +BRDA:64,10,1,1 BRDA:76,11,0,0 BRDA:76,11,1,0 BRDA:76,12,0,0 @@ -10513,9 +10363,9 @@ BRDA:82,15,1,0 BRDA:82,16,0,0 BRDA:82,16,1,0 BRDA:84,17,0,0 -BRDA:84,17,1,0 +BRDA:84,17,1,13 BRDA:84,18,0,0 -BRDA:84,18,1,0 +BRDA:84,18,1,13 BRDA:101,19,0,0 BRDA:101,19,1,0 BRDA:101,20,0,0 @@ -10539,11 +10389,11 @@ BRDA:138,28,1,0 BRDA:138,29,0,0 BRDA:138,29,1,0 BRDA:155,30,0,0 -BRDA:155,30,1,0 +BRDA:155,30,1,83 BRDA:155,31,0,0 -BRDA:155,31,1,0 +BRDA:155,31,1,83 BRDA:160,32,0,0 -BRDA:160,32,1,0 +BRDA:160,32,1,83 BRDA:172,33,0,0 BRDA:172,33,1,0 BRDA:172,34,0,0 @@ -10555,34 +10405,34 @@ BRDA:173,36,1,0 BRDA:178,37,0,0 BRDA:178,37,1,0 BRDA:180,38,0,0 -BRDA:180,38,1,0 +BRDA:180,38,1,83 BRDA:180,39,0,0 -BRDA:180,39,1,0 -BRDA:195,40,0,0 +BRDA:180,39,1,83 +BRDA:195,40,0,452 BRDA:195,40,1,0 -BRDA:198,41,0,0 +BRDA:198,41,0,452 BRDA:198,41,1,0 BRDA:199,42,0,0 -BRDA:199,42,1,0 +BRDA:199,42,1,452 BRDA:209,43,0,0 BRDA:209,43,1,0 BRDA:216,44,0,0 -BRDA:216,44,1,0 +BRDA:216,44,1,452 BRDA:216,45,0,0 -BRDA:216,45,1,0 -BRDA:225,46,0,0 -BRDA:225,46,1,0 +BRDA:216,45,1,452 +BRDA:225,46,0,332 +BRDA:225,46,1,118 BRDA:236,47,0,0 -BRDA:236,47,1,0 +BRDA:236,47,1,450 BRDA:238,48,0,0 -BRDA:238,48,1,0 +BRDA:238,48,1,2 BRDA:238,49,0,0 -BRDA:238,49,1,0 -BRDA:239,50,0,0 +BRDA:238,49,1,2 +BRDA:239,50,0,2 BRDA:239,50,1,0 -BRDA:239,51,0,0 -BRDA:239,51,1,0 -BRDA:244,52,0,0 +BRDA:239,51,0,2 +BRDA:239,51,1,2 +BRDA:244,52,0,2 BRDA:244,52,1,0 BRDA:250,53,0,0 BRDA:250,53,1,0 @@ -10592,107 +10442,107 @@ BRDA:255,55,0,0 BRDA:255,55,1,0 BRDA:266,56,0,1 BRDA:266,56,1,0 -BRDA:268,57,0,0 -BRDA:268,57,1,0 -BRDA:268,58,0,0 -BRDA:268,58,1,0 +BRDA:268,57,0,169 +BRDA:268,57,1,1117 +BRDA:268,58,0,1286 +BRDA:268,58,1,1117 BRDA:269,59,0,0 -BRDA:269,59,1,0 -BRDA:269,60,0,0 -BRDA:269,60,1,0 +BRDA:269,59,1,1117 +BRDA:269,60,0,1117 +BRDA:269,60,1,1117 BRDA:269,60,2,0 -BRDA:272,61,0,0 -BRDA:272,61,1,0 -BRDA:272,62,0,0 -BRDA:272,62,1,0 +BRDA:272,61,0,436 +BRDA:272,61,1,681 +BRDA:272,62,0,1117 +BRDA:272,62,1,681 BRDA:279,63,0,1 BRDA:279,63,1,0 BRDA:285,64,0,1 BRDA:285,64,1,0 -BRDA:299,65,0,0 -BRDA:299,65,1,0 -BRDA:299,66,0,0 -BRDA:299,66,1,0 -BRDA:310,67,0,0 -BRDA:310,67,1,0 +BRDA:299,65,0,884 +BRDA:299,65,1,6 +BRDA:299,66,0,890 +BRDA:299,66,1,884 +BRDA:310,67,0,392 +BRDA:310,67,1,498 BRDA:316,68,0,0 -BRDA:316,68,1,0 -BRDA:324,69,0,0 +BRDA:316,68,1,498 +BRDA:324,69,0,392 BRDA:324,69,1,0 -BRDA:325,70,0,0 +BRDA:325,70,0,392 BRDA:325,70,1,0 BRDA:329,71,0,0 -BRDA:329,71,1,0 +BRDA:329,71,1,392 BRDA:332,72,0,0 -BRDA:332,72,1,0 +BRDA:332,72,1,392 BRDA:333,73,0,0 BRDA:333,73,1,0 BRDA:336,74,0,0 BRDA:336,74,1,0 BRDA:336,75,0,0 BRDA:336,75,1,0 -BRDA:343,76,0,0 +BRDA:343,76,0,392 BRDA:343,76,1,0 -BRDA:344,77,0,0 +BRDA:344,77,0,392 BRDA:344,77,1,0 -BRDA:344,78,0,0 -BRDA:344,78,1,0 +BRDA:344,78,0,392 +BRDA:344,78,1,66 BRDA:353,79,0,1 BRDA:353,79,1,0 BRDA:357,80,0,1 BRDA:357,80,1,0 -BRDA:369,81,0,0 +BRDA:369,81,0,338 BRDA:369,81,1,0 -BRDA:369,82,0,0 -BRDA:369,82,1,0 -BRDA:380,83,0,0 -BRDA:380,83,1,0 +BRDA:369,82,0,338 +BRDA:369,82,1,338 +BRDA:380,83,0,83 +BRDA:380,83,1,255 BRDA:386,84,0,0 -BRDA:386,84,1,0 -BRDA:394,85,0,0 +BRDA:386,84,1,255 +BRDA:394,85,0,83 BRDA:394,85,1,0 -BRDA:395,86,0,0 +BRDA:395,86,0,83 BRDA:395,86,1,0 BRDA:399,87,0,0 -BRDA:399,87,1,0 +BRDA:399,87,1,83 BRDA:402,88,0,0 -BRDA:402,88,1,0 +BRDA:402,88,1,83 BRDA:403,89,0,0 BRDA:403,89,1,0 BRDA:412,90,0,1 BRDA:412,90,1,0 -BRDA:427,91,0,0 +BRDA:427,91,0,5 BRDA:427,91,1,0 -BRDA:431,92,0,0 +BRDA:431,92,0,5 BRDA:431,92,1,0 -BRDA:431,93,0,0 -BRDA:431,93,1,0 -BRDA:442,94,0,0 -BRDA:442,94,1,0 +BRDA:431,93,0,5 +BRDA:431,93,1,5 +BRDA:442,94,0,3 +BRDA:442,94,1,2 BRDA:448,95,0,0 -BRDA:448,95,1,0 -BRDA:456,96,0,0 +BRDA:448,95,1,2 +BRDA:456,96,0,3 BRDA:456,96,1,0 -BRDA:457,97,0,0 +BRDA:457,97,0,3 BRDA:457,97,1,0 BRDA:461,98,0,0 -BRDA:461,98,1,0 +BRDA:461,98,1,3 BRDA:464,99,0,0 -BRDA:464,99,1,0 +BRDA:464,99,1,3 BRDA:465,100,0,0 BRDA:465,100,1,0 BRDA:474,101,0,1 BRDA:474,101,1,0 -BRDA:491,102,0,0 -BRDA:491,102,1,0 -BRDA:496,103,0,0 +BRDA:491,102,0,1371 +BRDA:491,102,1,300 +BRDA:496,103,0,1671 BRDA:496,103,1,0 -BRDA:496,104,0,0 -BRDA:496,104,1,0 +BRDA:496,104,0,1671 +BRDA:496,104,1,1671 BRDA:507,105,0,0 -BRDA:507,105,1,0 +BRDA:507,105,1,1671 BRDA:513,106,0,0 -BRDA:513,106,1,0 +BRDA:513,106,1,1671 BRDA:521,107,0,0 BRDA:521,107,1,0 BRDA:522,108,0,0 @@ -10721,23 +10571,23 @@ BRDA:576,119,0,1 BRDA:576,119,1,0 BRDA:582,120,0,1 BRDA:582,120,1,0 -BRDA:596,121,0,1 -BRDA:596,121,1,0 -BRDA:632,122,0,1 -BRDA:632,122,1,0 -BRDA:644,123,0,1 -BRDA:644,123,1,0 -BRDA:661,124,0,1 -BRDA:661,124,1,0 +BRDA:592,121,0,1 +BRDA:592,121,1,0 +BRDA:625,122,0,1 +BRDA:625,122,1,0 +BRDA:637,123,0,1 +BRDA:637,123,1,0 +BRDA:653,124,0,1 +BRDA:653,124,1,0 BRF:252 -BRH:25 +BRH:105 end_of_record TN: SF:src\main\server\shims\mailer.js FN:21,(anonymous_0) FNF:1 -FNH:1 -FNDA:2,(anonymous_0) +FNH:0 +FNDA:0,(anonymous_0) DA:1,1 DA:3,1 DA:4,1 @@ -10747,28 +10597,28 @@ DA:7,1 DA:9,1 DA:19,1 DA:21,1 -DA:22,2 +DA:22,0 DA:23,0 DA:24,0 DA:32,0 -DA:35,2 -DA:36,1 -DA:37,1 +DA:35,0 +DA:36,0 +DA:37,0 DA:42,1 LF:17 -LH:14 +LH:10 BRDA:4,0,0,1 BRDA:4,0,1,1 BRDA:22,1,0,0 -BRDA:22,1,1,2 -BRDA:22,2,0,2 +BRDA:22,1,1,0 +BRDA:22,2,0,0 BRDA:22,2,1,0 BRDA:22,2,2,0 BRDA:22,2,3,0 -BRDA:35,3,0,1 -BRDA:35,3,1,1 +BRDA:35,3,0,0 +BRDA:35,3,1,0 BRF:10 -BRH:6 +BRH:2 end_of_record TN: SF:src\main\server\shims\stjs.js diff --git a/package.json b/package.json index 6754da195..5408f2e56 100644 --- a/package.json +++ b/package.json @@ -25,20 +25,23 @@ "dev:oidc": "npm run dev:oidcdeps && export CASS_OIDC_ENABLED=true|| set CASS_OIDC_ENABLED=true&& npm run dev:nodemon", "dev:nodemon": "nodemon --watch ../cass-npm --watch . --max-old-space-size=512 --ignore etc src/main/server.js", "dev:nodemon:docker": "nodemon --ignore etc --exec \"docker compose up -d --build\"", - "dev:nyc": "npm run dev:deps && export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&export PORT=8080|| set PORT=8080&&nyc --reporter lcov node src/main/server.js", + "dev:nyc": "nyc --reporter lcov node src/main/server.js", + "dev:node": "export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&export PORT=8080|| set PORT=8080&&node src/main/server.js", "mocha": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", "mochaEncryption": "wait-on http://localhost/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/com/eduworks/ec/crypto/*.test.js", "mochafast": "wait-on http://localhost/api/ping && mocha -b src/**/*.test.js", - "mochaNyc": "export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&wait-on http://localhost:8080/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js", + "mochaNyc": "export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&wait-on http://localhost:8080/api/ping && mocha -b --timeout 15000 node_modules/cassproject/src/**/*.test.js src/**/*.test.js && wait-on http://localhost:8080/api/kill", "nyc": "nyc --reporter lcov npm run mocha", "automocha": "nodemon --watch ../cass-npm --watch . --exec \"npm run mocha\"", + "autonyc": "npm run dev:deps && nodemon --watch ../cass-npm --watch . --exec \"npm run run:nyc\"", "automochafast": "nodemon --exec \"npm run mochafast\"", "run": "pm2 start ./pm2.config.js", "run:standalone": "pm2 start ./pm2.standalone.config.js", "run:google": "pm2 start ./pm2.google.config.js", "run:proxy": "pm2 start ./pm2.proxy.config.js", "run:test": "pm2 start ./pm2.test.config.js", - "run:nyc": "concurrently --killOthers --success=first \"npm run dev:nyc\" \"npm run mochaNyc\"", + "run:nyc": "export CASS_LOOPBACK=http://localhost:8080/api/|| set CASS_LOOPBACK=http://localhost:8080/api/&&export PORT=8080|| set PORT=8080&&export KILL=true|| set KILL=true&&concurrently --killOthers --success=first --kill-signal=SIGINT \"nyc --reporter=lcov npm run dev:node\" \"npm run mochaNyc\"", + "run:merge": "nyc report --reporter=lcov", "run:cassbase": "pm2 start ./pm2.cassbase.config.js", "run:withTests": "npm run test:start & npm run mochaEncryption", "pm2startup": "pm2 startup", diff --git a/src/main/server.js b/src/main/server.js index f89d4722d..b158b17f5 100644 --- a/src/main/server.js +++ b/src/main/server.js @@ -122,6 +122,13 @@ app.get('/api', (req, res, next) => { app.get('/api/', (req, res, next) => { return res.redirect('swagger'); }); +if (process.env.KILL) +{ + app.get('/api/kill', (req, res, next) => { + console.log("Kill received. Exiting process."); + process.exit(0); + }); +} if (process.env.DISABLED_EDITOR != 'true') { app.use(baseUrl, express.static('src/main/webapp/')); diff --git a/src/main/server/adapter/ceasn/ceasn.js b/src/main/server/adapter/ceasn/ceasn.js index 8cd6b13e0..c8fa9712d 100644 --- a/src/main/server/adapter/ceasn/ceasn.js +++ b/src/main/server/adapter/ceasn/ceasn.js @@ -60,10 +60,10 @@ async function competencyPromise(compId, competencies, allCompetencies, f, ctx, try { var c = competencies[compId]; if (!c) { - resolve(null); - return; + return null; } - if (c == null) resolve(c); + if (c == null) + return c; if (c["ceasn:hasChild"] != null && c["ceasn:hasChild"]["@list"] && c["ceasn:hasChild"]["@list"] != null) c["ceasn:hasChild"]["@list"].sort(function(a, b) { return allCompetencies.indexOf(a) - allCompetencies.indexOf(b); @@ -79,7 +79,7 @@ async function competencyPromise(compId, competencies, allCompetencies, f, ctx, delete c.description; } if (c.type == null) // Already done / referred to by another name. - resolve(); + return; var guid = c.getGuid(); var uuid = new UUID(3, "nil", c.shortId()).format(); @@ -160,10 +160,10 @@ async function competencyPromise(compId, competencies, allCompetencies, f, ctx, } delete c["@context"]; c = stripNonCe(c); - resolve(c); + return c; } catch (err) { global.auditLogger.report(global.auditLogger.LogCategory.ADAPTER, global.auditLogger.Severity.ERROR, "CeasnCompetencyError", err); - resolve(c); + return c; } } @@ -613,7 +613,6 @@ async function competencyInCollectionPromise(compId, competencies, allCompetenci try { var c = competencies[compId]; if (c == null) { - resolve(); return; } if (!f['ceterms:hasMember'] || !EcArray.isArray(f['ceterms:hasMember'])) { @@ -628,7 +627,6 @@ async function competencyInCollectionPromise(compId, competencies, allCompetenci if (frameworks[each].subType !== "Collection") { delete competencies[compId]; delete competencies[c.id]; - resolve(); return; } else { collections.push(await ceasnExportUriTransform(frameworks[each].id)); @@ -645,7 +643,7 @@ async function competencyInCollectionPromise(compId, competencies, allCompetenci delete c.description; } if (c.type == null) //Already done / referred to by another name. - resolve(); + return; var guid = c.getGuid(); var uuid = new UUID(3, "nil", c.shortId()).format(); @@ -710,10 +708,10 @@ async function competencyInCollectionPromise(compId, competencies, allCompetenci } delete competencies[id]["@context"]; competencies[id] = stripNonCe(competencies[id]); - resolve(); + return; } catch (err) { global.auditLogger.report(global.auditLogger.LogCategory.ADAPTER, global.auditLogger.Severity.INFO, "CeasnCompetencyCollection", err); - resolve(); + return; } } @@ -1033,7 +1031,7 @@ async function conceptPromise(obj, concepts, cs, ctx, terms) { c["skos:topConceptOf"] = await ceasnExportUriTransform(cs.id); } if (c.type == null) //Already done / referred to by another name. - resolve(); + return; var guid = c.getGuid(); var uuid = new UUID(3, "nil", c.shortId()).format(); for (let each in c) { @@ -1062,10 +1060,10 @@ async function conceptPromise(obj, concepts, cs, ctx, terms) { concepts[id] = conceptArrays(concepts[id]); } - resolve(); + return; } catch (err) { global.auditLogger.report(global.auditLogger.LogCategory.ADAPTER, global.auditLogger.Severity.INFO, "CeasnConcept", err); - resolve(); + return; } } @@ -1086,7 +1084,7 @@ async function levelPromise(obj, levels, cs, ctx, terms) { c["skos:topConceptOf"] = await ceasnExportUriTransform(cs.id); } if (c.type == null) //Already done / referred to by another name. - resolve(); + return; var guid = c.getGuid(); var uuid = new UUID(3, "nil", c.shortId()).format(); for (let each in c) { @@ -1116,10 +1114,10 @@ async function levelPromise(obj, levels, cs, ctx, terms) { levels[id] = conceptArrays(levels[id]); levels[id]["@type"] = "asn:ProgressionLevel"; } - resolve(); + return; } catch (err) { global.auditLogger.report(global.auditLogger.LogCategory.ADAPTER, global.auditLogger.Severity.INFO, "CeasnProgression", err); - resolve(); + return; } } @@ -1642,7 +1640,6 @@ async function importCompetencyToCollectionPromise(asnComp, listToSave, cassRela let frameworks = await EcFramework.search(repo, 'competency:"' + EcRemoteLinkedData.trimVersionFromUrl(newComp.id) + '" AND NOT subType:Collection'); if (frameworks && frameworks.length > 0) { - resolve(); return; } @@ -1710,10 +1707,8 @@ async function importCompetencyToCollectionPromise(asnComp, listToSave, cassRela if (owner != null) c.addOwner(EcPk.fromPem(owner)); listToSave.push(c); - resolve(); } catch (err) { global.auditLogger.report(global.auditLogger.LogCategory.ADAPTER, global.auditLogger.Severity.ERROR, "CeasnImportCollection", err); - resolve(); } } diff --git a/src/test/asn.test.js b/src/test/asn.test.js index be14f9462..b1f5b8b96 100644 --- a/src/test/asn.test.js +++ b/src/test/asn.test.js @@ -25,7 +25,7 @@ describe("ASN Adapter", function() { let onet = await (await fetch("https://www.onetcenter.org/ctdlasn/graph/ce-07c25f74-9119-11e8-b852-782bcb5df6ac")).json(); const formData = new FormData(); formData.append('data',JSON.stringify(onet)); - await fetch("http://localhost/api/ctdlasn",{method: 'POST', body: formData}); + await fetch(`${process.env.CASS_LOOPBACK || "http://localhost/api/"}ctdlasn`,{method: 'POST', body: formData}); } }); diff --git a/src/test/skyRepo.test.js b/src/test/skyRepo.test.js index 0471381be..9fea2e37e 100644 --- a/src/test/skyRepo.test.js +++ b/src/test/skyRepo.test.js @@ -1,9 +1,9 @@ const chai = require('chai'); require('cassproject'); -const hrtime = function() { +const hrtime = function () { try { - return [Math.round(performance.now()/1000), performance.now() * 1000]; + return [Math.round(performance.now() / 1000), performance.now() * 1000]; } catch (e) { // Eat quietly. } @@ -15,8 +15,8 @@ const expect = chai.expect; const assert = chai.assert; -describe('SkyRepo Adapter', function() { - it('Search auto-extends', async ()=>{ +describe('SkyRepo Adapter', function () { + it('Search auto-extends', async () => { }); @@ -68,7 +68,7 @@ describe('SkyRepo Adapter', function() { thing2.generateId(repo.selectedServer); thing2.name = 'Thing 2'; - + // Multiput 2 things let result = await repo.multiput([thing1, thing2]); @@ -147,7 +147,7 @@ describe('SkyRepo Adapter', function() { // If not owner, shouldn't save newId1 = new EcIdentity(); newId1.ppk = EcPpk.fromPem( - "-----BEGIN RSA PRIVATE KEY-----MIIEowIBAAKCAQEArhqVpI3B8eM8nZcg4TbBnPWp31w5c7S84nbeGvOYYkS2g/I4WKxuxeRHSgU/skGM86b2GLt2im7mmZROphZIRh0Qo6g8E58j71Kr7G62N8V8i36XRM4SEhOlgMpI43OjwGwkgmNL5N4NDr1ZMMqXx1+QZ3x/KJrR5/pqonrbe5QM7qm4CATey2Oqnt86sOnpDslsXE+s1uZmqO37sHQttD/Ct1fLqxrIpP+XMk3iPZZbe3BxkWeT4DOPq6WI7tWJYbWXXX3Xf7BJaXH0hQUy8ylBt/vAWiEmTm6t7yiFzGTXZUDLX6smFe7vkfBz2ByyuH2b6HQWXSvOktAQcCLTcQIDAQABAoIBAHf6lAMZOX0i1oPXQO5S2Kv803q8SE9HTx9VQQwbsHiP16MoCdJ5ycCP5tzIrzN9XtANz+wNS8xsTnepr2VfV6ERqITPi88NzSrAsv+079eRPZm3vDDLPcK9TUFqpT4xU7hoDeTY3tUyfJcav1sTUfMwFQhr0AlAX8TYWiHsPlJy+fy3fZvjCvk6DhUiArpqXBAXzuN3jTYrbrYxfmmszFZNl9hVe5vQ3O+lNB1i/jvsP2aWR6AOfcrCzzrVGU+WavbuGCrHyAvsUIgHFfBiFdi6HSE/TB2HjgSyRhiarum9WD1f2cGn05IXbpJGx2b/jmjE/PqSypb4R2zWAMe2PH0CgYEA3d81eNpz6c1yfZzMVEDU+4Rbnd0Wa/0Ukufu1TOQgNiAYoz81ZrA5u99QpGONwzNtgBA2GkvkQVPPEXpBKser0eedZ1F+SG8O2KqJlhnOo/AHhQNNloJylsv9APDrI77FsGk8sBK38BB5s6c7SeCckR7bXJLdjrM+iZuWaXx1esCgYEAyOJh3MpJdQb7o0nkMZSwAAXOn0z4nm5sXT9n0Zvh+vZMbRtSK3366OY3bLK2C8YwBilgWE2z9kOiUVvcOYGes54ScYz6AVHcVfejBgn40NMCcNR6lcktll3pFwL5vfePey+yLzcWGl8RgIl6jIYba4OJnfGQ189qLmb3SvTkGRMCgYEAufx3HYS57/6Jf+Sln+bs4p4UEqQXPJTc3zzPByd/dZKHJJWdCA3+sFeHf/r15Q21j2Bs+zxJZF64CgVsjL5JLZNysJMS6gEugfV2PkiS2BNSb6RNYwdc96Uy8HELYSZGMtBGzjsFSMUoOStvfplFDzZ65McPnN8znmoCzOF/dNsCgYAYqzQ5WN4McP8V3k0XiZrTZeMpzNn7GrRT/yVQqEPn/bcE7wX4MVBOqXbE8m1IpN3g49PhBCnFZCjatN0mcrR6ej7pktZgsxzLsc1jQHY9rqvuDym+myXuATpOiR8CJRSJnCHVin48XtBXaIqUFyPm4BBWRQP0fJQdfqd/nPMl4QKBgEI705+8hkvGZU7mrCiIGSrQekY5DjeDU1Eq2kKFdm6sYOPxdvxkzmdJMEvkQ1bcHmtpdHMQPCe9Cglp+3ES0ZaSHODFOOdUbFQ6vu4Zwcf8upcjVG74ZfLe27doGP9SPORI2yfRp5WaTLbgqcrHKW8Zf5DEWOguccnr1NR1+aMW-----END RSA PRIVATE KEY-----" + "-----BEGIN RSA PRIVATE KEY-----MIIEowIBAAKCAQEArhqVpI3B8eM8nZcg4TbBnPWp31w5c7S84nbeGvOYYkS2g/I4WKxuxeRHSgU/skGM86b2GLt2im7mmZROphZIRh0Qo6g8E58j71Kr7G62N8V8i36XRM4SEhOlgMpI43OjwGwkgmNL5N4NDr1ZMMqXx1+QZ3x/KJrR5/pqonrbe5QM7qm4CATey2Oqnt86sOnpDslsXE+s1uZmqO37sHQttD/Ct1fLqxrIpP+XMk3iPZZbe3BxkWeT4DOPq6WI7tWJYbWXXX3Xf7BJaXH0hQUy8ylBt/vAWiEmTm6t7yiFzGTXZUDLX6smFe7vkfBz2ByyuH2b6HQWXSvOktAQcCLTcQIDAQABAoIBAHf6lAMZOX0i1oPXQO5S2Kv803q8SE9HTx9VQQwbsHiP16MoCdJ5ycCP5tzIrzN9XtANz+wNS8xsTnepr2VfV6ERqITPi88NzSrAsv+079eRPZm3vDDLPcK9TUFqpT4xU7hoDeTY3tUyfJcav1sTUfMwFQhr0AlAX8TYWiHsPlJy+fy3fZvjCvk6DhUiArpqXBAXzuN3jTYrbrYxfmmszFZNl9hVe5vQ3O+lNB1i/jvsP2aWR6AOfcrCzzrVGU+WavbuGCrHyAvsUIgHFfBiFdi6HSE/TB2HjgSyRhiarum9WD1f2cGn05IXbpJGx2b/jmjE/PqSypb4R2zWAMe2PH0CgYEA3d81eNpz6c1yfZzMVEDU+4Rbnd0Wa/0Ukufu1TOQgNiAYoz81ZrA5u99QpGONwzNtgBA2GkvkQVPPEXpBKser0eedZ1F+SG8O2KqJlhnOo/AHhQNNloJylsv9APDrI77FsGk8sBK38BB5s6c7SeCckR7bXJLdjrM+iZuWaXx1esCgYEAyOJh3MpJdQb7o0nkMZSwAAXOn0z4nm5sXT9n0Zvh+vZMbRtSK3366OY3bLK2C8YwBilgWE2z9kOiUVvcOYGes54ScYz6AVHcVfejBgn40NMCcNR6lcktll3pFwL5vfePey+yLzcWGl8RgIl6jIYba4OJnfGQ189qLmb3SvTkGRMCgYEAufx3HYS57/6Jf+Sln+bs4p4UEqQXPJTc3zzPByd/dZKHJJWdCA3+sFeHf/r15Q21j2Bs+zxJZF64CgVsjL5JLZNysJMS6gEugfV2PkiS2BNSb6RNYwdc96Uy8HELYSZGMtBGzjsFSMUoOStvfplFDzZ65McPnN8znmoCzOF/dNsCgYAYqzQ5WN4McP8V3k0XiZrTZeMpzNn7GrRT/yVQqEPn/bcE7wX4MVBOqXbE8m1IpN3g49PhBCnFZCjatN0mcrR6ej7pktZgsxzLsc1jQHY9rqvuDym+myXuATpOiR8CJRSJnCHVin48XtBXaIqUFyPm4BBWRQP0fJQdfqd/nPMl4QKBgEI705+8hkvGZU7mrCiIGSrQekY5DjeDU1Eq2kKFdm6sYOPxdvxkzmdJMEvkQ1bcHmtpdHMQPCe9Cglp+3ES0ZaSHODFOOdUbFQ6vu4Zwcf8upcjVG74ZfLe27doGP9SPORI2yfRp5WaTLbgqcrHKW8Zf5DEWOguccnr1NR1+aMW-----END RSA PRIVATE KEY-----" ); thing1.addOwner(newId1.ppk.toPk()); thing2.addOwner(newId1.ppk.toPk()); @@ -183,7 +183,7 @@ describe('SkyRepo Adapter', function() { const test2 = new EcCompetency(); test2.generateId(repo.selectedServer); - test2.testDataField = {obj: 'thing'}; + test2.testDataField = { obj: 'thing' }; test2.name = 'Test 2'; let result3 = await repo.multiput([test1, test2]); From f19b2f0cfdf603242c7bd0fbfc486e0cb275fad1 Mon Sep 17 00:00:00 2001 From: Fritz Ray Date: Thu, 31 Oct 2024 02:58:20 -0700 Subject: [PATCH 21/21] WIP Sonar --- coverage/lcov-report/index.html | 2 +- coverage/lcov.info | 60 ++++++++++++++++----------------- package.json | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html index 030c8a3b8..c6eaaead6 100644 --- a/coverage/lcov-report/index.html +++ b/coverage/lcov-report/index.html @@ -296,7 +296,7 @@

All files

Code coverage generated by istanbul - at 2024-10-29T22:37:05.955Z + at 2024-10-30T14:33:28.783Z