schema validate

Author: glorieux-f

schema/alix.rng

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar
   xmlns="http://relaxng.org/ns/structure/1.0" 
-  ns="https://oeuvres.github.io/alix" 
+  ns="https://github.com/oeuvres/alix/ns" 
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
   xml:lang="en"
   xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" 
@@ -240,6 +240,7 @@ According to Lucene model, there are 3 levels of objects inside Alix.
   <define name="chapter">
     <element name="chapter">
       <a:documentation>A set of <a:el>field</a:el>s, like a <a:el>document</a:el>, except it has to be inside a <a:el>book</a:el>.</a:documentation>
+      <ref name="docid"/>
       <oneOrMore>
         <ref name="field"/>
       </oneOrMore>
@@ -286,7 +287,16 @@ If you need only lightweight token search (for example bibliographic strings), p
       <attribute name="type">
         <value>text</value>
       </attribute>
-      <ref name="xml"/>
+      <optional>
+        <choice>
+          <attribute name="include"/>
+          <attribute name="exclude"/>
+        </choice>
+      </optional>
+      <choice>
+        <attribute name="copy"/>
+        <ref name="xml"/>
+      </choice>
     </element>
   </define>
   <define name="field-meta">
@@ -299,10 +309,7 @@ Typical use: bibliographic citations, identifiers embedded in text strings, name
       <attribute name="type">
         <value>meta</value>
       </attribute>
-      <choice>
-        <attribute name="value"/>
-        <ref name="xml"/>
-      </choice>
+      <ref name="xml"/>
     </element>
   </define>
   <define name="field-store">

test/src/test/test-data/ingest-alix-test.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="https://raw.githubusercontent.com/oeuvres/alix/master/schema/alix.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <alix:book
-    xmlns:alix="https://oeuvres.github.io/alix"
+    xmlns:alix="https://github.com/oeuvres/alix/ns"
     xmlns="http://www.w3.org/1999/xhtml"
     xml:id="demo-book">
 
   <!-- Book-level metadata -->
   <alix:field name="doc_kind" type="category" value="book"/>
-  <alix:field name="title" type="meta" value="Demo Book for Alix SAX Ingest"/>
+  <alix:field name="title" type="meta">Demo Book for Alix SAX Ingest</alix:field>
   <alix:field name="year" type="int" value="1959"/>
   <alix:field name="author" type="facet" value="Jean Piaget"/>
   <alix:field name="author" type="facet" value="Bärbel Inhelder"/>
@@ -24,21 +25,21 @@
 
     <alix:field name="doc_kind" type="category" value="chapter"/>
     <alix:field name="bookid" type="category" value="demo-book"/>
-    <alix:field name="title" type="meta" value="Chapter I. Demo chapter"/>
+    <alix:field name="title" type="meta">Chapter I. Demo chapter</alix:field>
     <alix:field name="year" type="int" value="1959"/>
     <alix:field name="author" type="facet" value="Jean Piaget"/>
 
     <!-- Stored display/result string -->
     <alix:field name="resultline" type="store" value="Piaget (1959), Chapter I, p. 1-12."/>
 
     <!-- Main source text (XHTML payload) -->
-    <alix:field name="text" type="text">
+    <alix:field name="text" type="text" exclude="nav">
       <article id="ch1">
         <h1>Chapter I. Demo chapter</h1>
 
         <p>This is author text before a quotation.</p>
 
-        <blockquote data-tei-type="quote">
+        <blockquote other-type="quote">
           <p>This quoted passage should be indexable separately.</p>
         </blockquote>
 
@@ -49,18 +50,19 @@
         </div>
 
         <p>Final paragraph of author text.</p>
+        
+        <nav>
+          <a href="intro" class="prev">Introduction</a>
+          <a href="ch2" class="next">Chapter II</a>
+        </nav>
       </article>
     </alix:field>
 
     <!-- Derived field: only observation zones -->
-    <alix:field name="observations" type="text" source="text">
-      <alix:include attribute="data-tei-type" value="observation"/>
-    </alix:field>
+    <alix:field name="observations" type="text" copy="text" include="@data-tei-type='observation'"/>
 
     <!-- Derived field: exclude quoted zones -->
-    <alix:field name="text_noquotes" type="text" source="text">
-      <alix:exclude attribute="data-tei-type" value="quote"/>
-    </alix:field>
+    <alix:field name="text_noquotes" type="text" copy="text" exclude="@other-type='observation'"/>
 
   </alix:chapter>
 </alix:book>