--- a/src/layout/ViewConfig.ts	Fri May 05 21:23:44 2023 -0700
+++ b/src/layout/ViewConfig.ts	Fri May 05 21:26:36 2023 -0700
@@ -1,8 +1,8 @@
-// Load requested view (rdf data) and provide access to it
-import { DataFactory, NamedNode, Store } from "n3";
-import { fetchAndParse, n3Graph } from "./fetchAndParse";
-import { EX, RDF } from "./namespaces";
-import { labelOrTail, uriValue } from "./rdf_value";
+import Immutable from "immutable"; // mostly using this for the builtin equals() testing, since NamedNode(x)!=NamedNode(x)
+import { DataFactory, NamedNode, Quad_Predicate, Term } from "n3";
+import { MultiStore } from "../MultiStore";
+import { EX } from "./namespaces";
+import { uriValue } from "./rdf_value";
 const Uri = DataFactory.namedNode;
 
 function firstElem<E>(seq: Iterable<E>): E {
@@ -24,63 +24,75 @@
   links: Link[];
 }
 
+// High-level guide to how to draw the page, independent of the graph data.
+// Layout.ts turns this plus the actual graph data into a structure that's
+// close to the final render.
 export class ViewConfig {
-  graph: Store;
-  viewRoot!: NamedNode;
-  url?: string;
-  tables: TableDesc[] = [];
+  viewRoot: NamedNode; // this structure...
+  graph: MultiStore; // in this graph...
+  tables: TableDesc[] = []; // populates all the rest of these fields for use by Layout
+  freeStatementsHidePred: Immutable.Set<Quad_Predicate> = Immutable.Set();
 
-  constructor() {
-    this.graph = new Store();
+  constructor(graph: MultiStore, viewUri: NamedNode) {
+    this.graph = graph;
+    this.viewRoot = viewUri;
+    // todo
+    const here = "https://bigasterisk.com/lanscape/";
+    if (this.viewRoot.value.startsWith(here)) {
+      this.viewRoot = new NamedNode(this.viewRoot.value.slice(here.length));
+    }
+    // todo: might need to reread if graph changes
+    this.read();
   }
 
-  async readFromUrl(url: string | "") {
-    if (!url) {
-      return;
+  private read() {
+    for (let table of this.graph.getObjects(this.viewRoot, EX("table"), null)) {
+      const t = this.readTable(table);
+      this.tables.push(t);
     }
-    this.url = url;
-    await fetchAndParse(url, this.graph);
+    this.tables.sort();
 
-    this._read();
-  }
-
-  async readFromGraph(n3: string) {
-    this.graph = await n3Graph(n3);
-    this._read();
+    this.readHides();
   }
 
-  _read() {
-    this.viewRoot = firstElem(
-      this.graph.getSubjects(RDF("type"), EX("View"), null)
-    ) as NamedNode;
-    for (let table of this.graph.getObjects(this.viewRoot, EX("table"), null)) {
-      const tableType = uriValue(this.graph, table, EX("primaryType"));
-      const joins: NamedNode[] = [];
-      for (let joinType of this.graph.getObjects(table, EX("joinType"), null)) {
-        joins.push(joinType as NamedNode);
+  private readHides() {
+    for (let hideInstruction of this.graph.getObjects(
+      this.viewRoot,
+      EX("freeStatementsHide"),
+      null
+    )) {
+      for (let pred of this.graph.getObjects(
+        hideInstruction,
+        EX("predicate"),
+        null
+      )) {
+        this.freeStatementsHidePred = this.freeStatementsHidePred.add(
+          pred as Quad_Predicate
+        );
       }
-      joins.sort();
+    }
+  }
 
-      const links: Link[] = [];
-      for (let linkDesc of this.graph.getObjects(table, EX("link"), null)) {
-        links.push({
-          pred: uriValue(this.graph, linkDesc, EX("predicate")),
-        });
-      }
+  private readTable(table: Term): TableDesc {
+    const tableType = uriValue(this.graph, table, EX("primaryType"));
+    const joins: NamedNode[] = [];
+    for (let joinType of this.graph.getObjects(table, EX("joinType"), null)) {
+      joins.push(joinType as NamedNode);
+    }
+    joins.sort();
 
-      this.tables.push({
-        uri: table as NamedNode,
-        primary: tableType,
-        joins: joins,
-        links: links,
+    const links: Link[] = [];
+    for (let linkDesc of this.graph.getObjects(table, EX("link"), null)) {
+      links.push({
+        pred: uriValue(this.graph, linkDesc, EX("predicate")),
       });
     }
-    this.tables.sort();
-  }
 
-  label(): string {
-    return this.url !== undefined
-      ? labelOrTail(this.graph, Uri(this.url))
-      : "unnamed";
+    return {
+      uri: table as NamedNode,
+      primary: tableType,
+      joins: joins,
+      links: links,
+    };
   }
 }