@finbheara/archive-client 0.48.0 → 0.50.0

package/README.md

@@ -97,6 +97,8 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `results.attach_basis`, `majors.attach_basis` | the `attach_basis` a row of `results.query`, `majors.results`, `results.stream` and `results.entries` carries (how its `dancer_id` was answered, or why not); absent, never refused, without it | 345 |
 | `results.major`, `majors.major` | the `major` a row of `results.stream` and `results.entries` carries (1 where its competition is a main event of a T1-T3 event, exactly the rows `majors.sqlite` holds); absent without it, and the stream filter `major` is refused by name without it | 345 |
 | `results.relative_place_err`, `majors.relative_place_err` | the `relative_place_err` a row of `results.stream` and `results.entries` carries (how far below `relative_place` the true value may sit, 0 over an exact field); absent, never refused, without it | 350 |
+| `results.marks_printed`, `majors.marks_printed` | the `marks_printed` a row of `results.stream` and `results.entries` carries (the marks total a platform served, iFeis's, one string verbatim beside its `points`); absent, never refused, without it | 350 |
+| `results.round_points_printed`, `majors.round_points_printed` | the `round_points_printed` a row of `results.stream` and `results.entries` carries (the per-round points a platform served, FeisFWD's, in its slot order, a slot served nothing in null); absent, never refused, without it | 350 |
 | `dancers.records.birth_consistency`, `dancers.years.birth_consistency` | the `birth_consistency` (0-100, floored: the percent of the dancer's, or the dancer-year's, readable rows that fit the birth window) and its denominator `birth_consistency_rows` a record of `dancers.records` and a dancer-year of `dancers.years` carry; absent, never refused, without it | 345 |
 | `dancers.records.birth_deadband`, `dancers.years.birth_deadband` | the `birth_deadband_rows` a record of `dancers.records` and a dancer-year of `dancers.years` carry (the readable rows a one-year dance-up alone keeps off the birth window, outside `birth_consistency` and its denominator); absent, never refused, without it | 345 |
 | `dancers.years.printed` | the `printed_regions` a dancer-year of `dancers.years` carries (every region the year printed, where `region` picks one); absent, never refused, without it | 341 |
@@ -635,6 +637,19 @@ competition beside its own fields: `competition`, `event`, `year`, `tier`, `comp
 `(file, line)` is one row, where an `address` may carry one row per section). Rows come in the
 release's own order, a competition's rows together.
 
+THE PER-ROUND POINTS A PLATFORM SERVED, where the release carries them
+(`rel.capability("results.round_points_printed")`): `round_points_printed`, FeisFWD's
+served round points in its own slot order, each value a string as served and a slot it served
+nothing in null (`[null, null, "275"]`). No slot is mapped onto a round and nothing is summed;
+null where no slot serves a value and on every other source's row. `points_printed` stays the one
+all-round figure a page prints.
+
+THE MARKS TOTAL A PLATFORM SERVED, where the release carries it
+(`rel.capability("results.marks_printed")`): `marks_printed`, iFeis's served `marks` beside its
+`points`, one string verbatim (`"462.5"`). It names no round and no judge, so it is never split
+or summed, and the places follow the points, not the marks. Null where the row serves none and on
+every other source's row.
+
 THE COMPETITION FIELDS, where the release carries them (`rel.capability("results.stream.competition")`,
 `"majors.stream.competition"` for scope `majors`), are on every row, null meaning no value:
 
@@ -645,7 +660,7 @@ THE COMPETITION FIELDS, where the release carries them (`rel.capability("results
 | `dance` | the competition's one dance as the release reads it (`reel`), null where it reads none |
 | `recalled_only` | true where the page printed the recalled dancers only |
 | `comp_flags` | what the page printed about itself, int-packed, one bit a flag (bit 10: recalled only). The release's `DATA-DICTIONARY.md` carries the register of every bit, and a published bit never moves |
-| `competitors_basis` | what `competitors` stands on: `printed` (the page printed a competed count), `counted` (the page printed the whole field, its cards counted), `net-entered` (FeisWeb: the entered count less the withdrawn one, who danced), `awards` (FeisWeb: the fewest dancers its `Awards To Top N Finishers ( p% )` line is a share of, who danced), `entered` or `registered` (only the top was printed: the page's entered or registered count, a REGISTRATION figure holding the no-shows), `estimated` (a majors sheet with no count that does not show its whole field: the recall rule over a recall-only sheet (twice the recalled, plus or minus 1, or the recalled where fewer than 10), else the dancers it printed, a FLOOR; never a count, so leave it out where a real count is needed), null where there is no number |
+| `competitors_basis` | what `competitors` stands on: `printed` (the page printed a competed count), `counted` (the page printed the whole field, its cards counted), `net-entered` (FeisWeb: the entered count less the withdrawn one, who danced), `awards` (FeisWeb: the fewest dancers its `Awards To Top N Finishers ( p% )` line is a share of, who danced), `entered` or `registered` (only the top was printed: the page's entered or registered count, a REGISTRATION figure holding the no-shows), `estimated` (a majors sheet with no count that does not show its whole field: the recall rule over a recall-only sheet (twice the recalled, plus or minus 1, or the recalled where fewer than 10), else the dancers it printed, a FLOOR; never a count, so leave it out where a real count is needed), `placed` (the page's count fell below the last place of its placed run, so the field is that place: a dancer placed N-th proves N danced; a competed count), null where there is no number |
 
 A release without them streams every row with the six fields ABSENT, never null.
 

package/dist/chunks/{index-yv5gx1xs.js → index-4f6jpd5e.js}

@@ -582,6 +582,30 @@ var FEATURES2 = [
     since: 350,
     calls: "the same on a row of results.stream and results.entries (scope majors)"
   },
+  {
+    feature: "results.round_points_printed",
+    needs: ["results:results.round_points_printed"],
+    since: 350,
+    calls: "the `round_points_printed` a row of results.stream and results.entries carries (the per-round points a platform served, FeisFWD's, in its slot order, a slot served nothing in null): absent, never refused, on a release without it"
+  },
+  {
+    feature: "majors.round_points_printed",
+    needs: ["majors:results.round_points_printed"],
+    since: 350,
+    calls: "the same on a row of results.stream and results.entries (scope majors)"
+  },
+  {
+    feature: "results.marks_printed",
+    needs: ["results:results.marks_printed"],
+    since: 350,
+    calls: "the `marks_printed` a row of results.stream and results.entries carries (the marks total a platform served, iFeis's, one string verbatim): absent, never refused, on a release without it"
+  },
+  {
+    feature: "majors.marks_printed",
+    needs: ["majors:results.marks_printed"],
+    since: 350,
+    calls: "the same on a row of results.stream and results.entries (scope majors)"
+  },
   {
     feature: "majors.attach_basis",
     needs: ["majors:results.attach_basis"],
@@ -1528,7 +1552,7 @@ function streamSql(q, shape = {}) {
   if (q.major !== undefined)
     where.push(q.major ? "r.major = 1" : "r.major = 0");
   return {
-    sql: `SELECT ${COLUMNS}${shape.competition === true ? COMPETITION_COLUMNS : ""}${shape.competitorsPrinted === true ? ", c.competitors_printed AS competitors_printed" : ""}${shape.attachBasis === true ? ", r.attach_basis AS attach_basis" : ""}${shape.major === true ? ", r.major AS major" : ""}${shape.relativePlaceErr === true ? ", r.relative_place_err AS relative_place_err" : ""} FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line${where.length === 0 ? "" : ` WHERE ${where.join(" AND ")}`} ORDER BY r.file, r.line`,
+    sql: `SELECT ${COLUMNS}${shape.competition === true ? COMPETITION_COLUMNS : ""}${shape.competitorsPrinted === true ? ", c.competitors_printed AS competitors_printed" : ""}${shape.attachBasis === true ? ", r.attach_basis AS attach_basis" : ""}${shape.major === true ? ", r.major AS major" : ""}${shape.relativePlaceErr === true ? ", r.relative_place_err AS relative_place_err" : ""}${shape.roundPoints === true ? ", r.round_points_printed AS round_points_printed" : ""}${shape.marks === true ? ", r.marks_printed AS marks_printed" : ""} FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line${where.length === 0 ? "" : ` WHERE ${where.join(" AND ")}`} ORDER BY r.file, r.line`,
     args
   };
 }
@@ -1540,7 +1564,7 @@ function feisDates(db) {
 }
 var text = (v) => v === null || v === "" ? null : v;
 function rowOf(r, dates) {
-  const { atts, withdrawn, recalled_only, ...rest } = r;
+  const { atts, withdrawn, recalled_only, round_points_printed, ...rest } = r;
   const d = dates.get(r.event);
   return {
     ...rest,
@@ -1554,6 +1578,9 @@ function rowOf(r, dates) {
     feis_date_lo: d?.lo ?? null,
     feis_date_hi: d?.hi ?? null,
     atts: atts === "" ? [] : atts.split(","),
+    ...round_points_printed === undefined ? {} : {
+      round_points_printed: round_points_printed === null ? null : JSON.parse(round_points_printed)
+    },
     withdrawn: text(withdrawn),
     qualifier: text(rest.qualifier),
     primary_source: text(rest.primary_source),
@@ -1677,9 +1704,19 @@ class ResultFinder2 {
       await this.rel.require(`${db}.major`);
     const major = (await this.rel.capability(`${db}.major`)).state === "full";
     const relativePlaceErr = (await this.rel.capability(`${db}.relative_place_err`)).state === "full";
+    const roundPoints = (await this.rel.capability(`${db}.round_points_printed`)).state === "full";
+    const marks = (await this.rel.capability(`${db}.marks_printed`)).state === "full";
     return {
       db: this.rel.db(db),
-      shape: { competition, competitorsPrinted, attachBasis, major, relativePlaceErr }
+      shape: {
+        competition,
+        competitorsPrinted,
+        attachBasis,
+        major,
+        relativePlaceErr,
+        roundPoints,
+        marks
+      }
     };
   }
   async* stream(q) {

package/dist/cli.js

@@ -23,7 +23,7 @@ import {
   staleWarning2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-yv5gx1xs.js";
+} from "./chunks/index-4f6jpd5e.js";
 import"./chunks/index-hghdy980.js";
 
 var USAGE_HEADER = "usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json] [--live] [--progress tty|plain|none]";

package/dist/index.js

@@ -85,7 +85,7 @@ import {
   PROGRESS_MODES2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-yv5gx1xs.js";
+} from "./chunks/index-4f6jpd5e.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/stream.d.ts

@@ -64,6 +64,8 @@ export interface StreamRow extends Partial<StreamCompetition> {
     yob: number | null;
     yob_printed: string | null;
     points_printed: string | null;
+    round_points_printed?: (string | null)[] | null;
+    marks_printed?: string | null;
     platform_dancer_id: string | null;
     primary_source: string | null;
     file: string;
@@ -79,6 +81,8 @@ export interface StreamShape {
     attachBasis?: boolean;
     major?: boolean;
     relativePlaceErr?: boolean;
+    roundPoints?: boolean;
+    marks?: boolean;
 }
 export declare const scopeDb: (s: StreamScope) => "majors" | "results";
 export declare function streamSql(q: StreamQuery, shape?: StreamShape): {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.48.0",
+	"version": "0.50.0",
 	"description": "Open a versioned release of an Irish dance results archive: download, verify, decompress and cache it by tag, keep the cache, and resolve feises and schools against it",
 	"keywords": ["irish-dance", "results", "release", "cache", "sqlite"],
 	"license": "MIT",