--- a/data-cube/Overview.html Mon Mar 11 17:00:19 2013 +0000
+++ b/data-cube/Overview.html Mon Mar 11 18:28:49 2013 +0000
@@ -359,13 +359,12 @@
<a href="#ref_qb_DataSet">qb:DataSet</a>
<a href="#ref_qb_DataStructureDefinition">qb:DataStructureDefinition</a>
<a href="#ref_qb_DimensionProperty">qb:DimensionProperty</a>
+ <a href="#ref_qb_HierarchicalCodeList">qb:HierarchicalCodeList</a>
<a href="#ref_qb_MeasureProperty">qb:MeasureProperty</a>
<a href="#ref_qb_Observation">qb:Observation</a>
<a href="#ref_qb_Slice">qb:Slice</a>
<a href="#ref_qb_ObservationGroup">qb:ObservationGroup</a>
<a href="#ref_qb_SliceKey">qb:SliceKey</a>
- <a href="#ref_qb_Hierarchy">qb:HierarchicalCodeList</a>
- <a href="#ref_qb_AggregatableHierarchy">qb:AggregatableHierarchy</a>
</p>
<p><b>Properties:</b>
<a href="#ref_qb_attribute">qb:attribute</a>
@@ -377,18 +376,18 @@
<a href="#ref_qb_concept">qb:concept</a>
<a href="#ref_qb_dataSet_LC">qb:dataSet</a>
<a href="#ref_qb_dimension">qb:dimension</a>
+ <a href="#ref_qb_hierarchyRoot">qb:hierarchyRoot</a>
<a href="#ref_qb_measure">qb:measure</a>
<a href="#ref_qb_measureDimension">qb:measureDimension</a>
<a href="#ref_qb_measureType">qb:measureType</a>
<a href="#ref_qb_observation_LC">qb:observation</a>
+ <a href="#ref_qb_observationGroup">qb:observationGroup</a>
<a href="#ref_qb_order">qb:order</a>
+ <a href="#ref_qb_parentChildProperty">qb:parentChildProperty</a>
<a href="#ref_qb_slice_LC">qb:slice</a>
<a href="#ref_qb_sliceKey_LC">qb:sliceKey</a>
<a href="#ref_qb_sliceStructure">qb:sliceStructure</a>
<a href="#ref_qb_structure">qb:structure</a>
- <a href="#ref_qb_observationGroup">qb:observationGroup</a>
- <a href="#ref_qb_hierarchyRoot">qb:hierarchyRoot</a>
- <a href="#ref_qb_narrowingProperty">qb:parentChildProperty</a>
</p>
</section>
@@ -1617,12 +1616,6 @@
of <code><a href="#dfn-qb-hierarchicalcodelist" class="internalDFN">qb:HierarchicalCodeList</a></code>, for example to
declare hierarchies in which each parent is a disjoint union of its children.</p>
-<!--
-<p>A sub class of <code><a>qb:HierarchicalCodeList</a></code>, <code><a>qb:AggregatableHierarchy</a></code>, is provided to declare
-hierarchies where for each parent concept the set of child concepts form a disjoint cover (i.e. a
-mutually-exclusive and exhaustive decomposition) of the parent.</p>
--->
-
</section>
<section id="schemes-aggregation">
@@ -2321,20 +2314,21 @@
definition of the code list as well as the Data Cube to be checked. In the case
of a <code>skos:ConceptScheme</code> then each concept must be linked to the scheme using
<code>skos:inScheme</code>. In the case of a <code>skos:Collection</code> then the
-collection must link to each concept or nested collection using <code>skos:member</code> (i.e. if the
+collection must link to each concept (or to nested collections) using <code>skos:member</code>. If the
collection uses <code>skos:memberList</code> then the entailment of <code>skos:member</code>
values defined by <a href="http://www.w3.org/TR/2009/REC-skos-reference-20090818/#S36">S36</a>
-in [<cite><a class="bibref" href="#bib-SKOS-REFERENCE">SKOS-REFERENCE</a></cite>] must be materialized). </p>
+in [<cite><a class="bibref" href="#bib-SKOS-REFERENCE">SKOS-REFERENCE</a></cite>] must be materialized before this check is applied. </p>
<table class="bordered-table">
<tbody>
- <tr><td><pre>ASK {
+ <tr><td><pre>
+ASK {
?obs qb:dataSet/qb:structure/qb:component/qb:componentProperty ?dim .
?dim a qb:DimensionProperty ;
qb:codeList ?list .
?list a skos:ConceptScheme .
?obs ?dim ?v .
- FILTER NOT EXISTS { ?v skos:inScheme ?list }
+ FILTER NOT EXISTS { ?v a skos:Concept ; skos:inScheme ?list }
}
ASK {
@@ -2343,7 +2337,7 @@
qb:codeList ?list .
?list a skos:Collection .
?obs ?dim ?v .
- FILTER NOT EXISTS { ?list skos:member+ ?v }
+ FILTER NOT EXISTS { ?v a skos:Concept . ?list skos:member+ ?v }
}
</pre></td></tr>
</tbody>
@@ -2824,7 +2818,7 @@
<dl class="vocab_reference">
- <dt id="ref_qb_Hierarchy">
+ <dt id="ref_qb_HierarchicalCodeList">
<em>Class:</em> <code><dfn id="dfn-qb-hierarchicalcodelist">qb:HierarchicalCodeList</dfn></code>
</dt>
<dd>Represents a generalized hierarchy of concepts which can be used for coding. The hierarchy is defined by one or more roots together with a property which relates concepts in the hierarchy to their child concept . The same concepts may be members of multiple hierarchies provided that different qb:parentChildProperty values are used for each hierarchy.</dd>
--- a/data-cube/index.html Mon Mar 11 17:00:19 2013 +0000
+++ b/data-cube/index.html Mon Mar 11 18:28:49 2013 +0000
@@ -70,13 +70,12 @@
<a href='#ref_qb_DataSet'>qb:DataSet</a>
<a href='#ref_qb_DataStructureDefinition'>qb:DataStructureDefinition</a>
<a href='#ref_qb_DimensionProperty'>qb:DimensionProperty</a>
+ <a href='#ref_qb_HierarchicalCodeList'>qb:HierarchicalCodeList</a>
<a href='#ref_qb_MeasureProperty'>qb:MeasureProperty</a>
<a href='#ref_qb_Observation'>qb:Observation</a>
<a href='#ref_qb_Slice'>qb:Slice</a>
<a href='#ref_qb_ObservationGroup'>qb:ObservationGroup</a>
<a href='#ref_qb_SliceKey'>qb:SliceKey</a>
- <a href='#ref_qb_Hierarchy'>qb:HierarchicalCodeList</a>
- <a href='#ref_qb_AggregatableHierarchy'>qb:AggregatableHierarchy</a>
</p>
<p><b>Properties:</b>
<a href='#ref_qb_attribute'>qb:attribute</a>
@@ -88,18 +87,18 @@
<a href='#ref_qb_concept'>qb:concept</a>
<a href='#ref_qb_dataSet_LC'>qb:dataSet</a>
<a href='#ref_qb_dimension'>qb:dimension</a>
+ <a href='#ref_qb_hierarchyRoot'>qb:hierarchyRoot</a>
<a href='#ref_qb_measure'>qb:measure</a>
<a href='#ref_qb_measureDimension'>qb:measureDimension</a>
<a href='#ref_qb_measureType'>qb:measureType</a>
<a href='#ref_qb_observation_LC'>qb:observation</a>
+ <a href='#ref_qb_observationGroup'>qb:observationGroup</a>
<a href='#ref_qb_order'>qb:order</a>
+ <a href='#ref_qb_parentChildProperty'>qb:parentChildProperty</a>
<a href='#ref_qb_slice_LC'>qb:slice</a>
<a href='#ref_qb_sliceKey_LC'>qb:sliceKey</a>
<a href='#ref_qb_sliceStructure'>qb:sliceStructure</a>
<a href='#ref_qb_structure'>qb:structure</a>
- <a href='#ref_qb_observationGroup'>qb:observationGroup</a>
- <a href='#ref_qb_hierarchyRoot'>qb:hierarchyRoot</a>
- <a href='#ref_qb_narrowingProperty'>qb:parentChildProperty</a>
</p>
</section>
@@ -1358,12 +1357,6 @@
of <code><a>qb:HierarchicalCodeList</a></code>, for example to
declare hierarchies in which each parent is a disjoint union of its children.</p>
-<!--
-<p>A sub class of <code><a>qb:HierarchicalCodeList</a></code>, <code><a>qb:AggregatableHierarchy</a></code>, is provided to declare
-hierarchies where for each parent concept the set of child concepts form a disjoint cover (i.e. a
-mutually-exclusive and exhaustive decomposition) of the parent.</p>
--->
-
</section>
<section id="schemes-aggregation">
@@ -2087,10 +2080,10 @@
definition of the code list as well as the Data Cube to be checked. In the case
of a <code>skos:ConceptScheme</code> then each concept must be linked to the scheme using
<code>skos:inScheme</code>. In the case of a <code>skos:Collection</code> then the
-collection must link to each concept or nested collection using <code>skos:member</code> (i.e. if the
+collection must link to each concept (or to nested collections) using <code>skos:member</code>. If the
collection uses <code>skos:memberList</code> then the entailment of <code>skos:member</code>
values defined by <a href="http://www.w3.org/TR/2009/REC-skos-reference-20090818/#S36">S36</a>
-in [[!SKOS-REFERENCE]] must be materialized). </p>
+in [[!SKOS-REFERENCE]] must be materialized before this check is applied. </p>
<table class="bordered-table">
<tbody>
@@ -2101,7 +2094,7 @@
qb:codeList ?list .
?list a skos:ConceptScheme .
?obs ?dim ?v .
- FILTER NOT EXISTS { ?v skos:inScheme ?list }
+ FILTER NOT EXISTS { ?v a skos:Concept ; skos:inScheme ?list }
}
ASK {
@@ -2110,7 +2103,7 @@
qb:codeList ?list .
?list a skos:Collection .
?obs ?dim ?v .
- FILTER NOT EXISTS { ?list skos:member+ ?v }
+ FILTER NOT EXISTS { ?v a skos:Concept . ?list skos:member+ ?v }
}
</td></pre></tr>
</tbody>
@@ -2595,7 +2588,7 @@
<dl class='vocab_reference'>
- <dt id="ref_qb_Hierarchy">
+ <dt id="ref_qb_HierarchicalCodeList">
<em>Class:</em> <code><dfn>qb:HierarchicalCodeList</dfn></code>
</dt>
<dd>Represents a generalized hierarchy of concepts which can be used for coding. The hierarchy is defined by one or more roots together with a property which relates concepts in the hierarchy to their child concept . The same concepts may be members of multiple hierarchies provided that different qb:parentChildProperty values are used for each hierarchy.</dd>
@@ -2617,13 +2610,6 @@
</dt>
<dd>Specifies a property which relates a parent concept in the hierarchy to a child concept. Note that a child may have more than one parent.</dd>
-<!--
- <dt id="ref_qb_AggregatableHierarchy">
- <em>Class:</em> <code><dfn>qb:AggregatableHierarchy</dfn></code>
- </dt>
- <dd>Indicates a hierarchy in which each parent concept is a disjoint union of its child concepts. So that measures such as simple counts may be aggregated up the hierarchy.</dd>
--->
-
</dl>
</section>