--- a/model/ProvenanceModel.html Fri Sep 16 09:57:36 2011 +0100
+++ b/model/ProvenanceModel.html Fri Sep 16 10:25:24 2011 +0100
@@ -1618,7 +1618,7 @@
<h4>Annotation Association</h4>
-<p>An <dfn id="dfn-annotationAssociation">annotation association expression</dfn> establishes a link between a PROV-DM expression with an identifier and an annotation expression referred to by its identifier. Multiple annotation expressions can be associated with a given PROV-DM expression; symmetrically, multiple PROV-DM expressions can be associated with a given annotation expression. Since annotation expressions have identifiers, they can also be annotated. The annotation mechanism (with annotation expression and the annotation association expression) forms a key aspect of the extensibility mechanism of PROV-DM (see <a href="#extensibility-section">extensibility section</a>).</p>
+<p>An <dfn id="dfn-annotationAssociation">annotation association expression</dfn> establishes a link between an identifiable PROV-DM expression and an annotation expression referred to by its identifier. Multiple annotation expressions can be associated with a given PROV-DM expression; symmetrically, multiple PROV-DM expressions can be associated with a given annotation expression. Since annotation expressions have identifiers, they can also be annotated. The annotation mechanism (with annotation expression and the annotation association expression) forms a key aspect of the extensibility mechanism of PROV-DM (see <a href="#extensibility-section">extensibility section</a>).</p>
<p>In PROV-ASN, an annotation expression's text matches the <span class="nonterminal">annotationExpression</span> production of the grammar defined in this specification document.
</p>
@@ -1630,7 +1630,15 @@
<span class="nonterminal">identifier</span>
<span class="name">,</span>
<span class="nonterminal">identifier</span>
+<span class="name">)</span> |
+<span class="name">hasAnnotation</span>
+<span class="name">(</span>
+<span class="nonterminal">relationIdentification</span>
+<span class="name">,</span>
+<span class="nonterminal">identifier</span>
<span class="name">)</span><br/>
+<span class="nonterminal">relationIdentification</span> :=
+<span class="nonterminal">identifier</span> <span class="nonterminal">identifier</span> <span class="nonterminal">qualifier</span>
</div>
<p>
@@ -1846,7 +1854,10 @@
<section id="expression-qualifier">
<h4>Qualifier</h4>
-<p>A <dfn id="dfn-qualifier">qualifier</dfn> is an ordered list of name-value pairs, used to qualify use expressions, generation expressions and control expressions.</p>
+<p>A <dfn id="dfn-qualifier">qualifier</dfn> is an ordered list of name-value pairs, used to qualify use expressions, generation expressions and control expressions. </p>
+
+<p>In PROV-ASN, a qualifier's text matches the <span class="nonterminal">qualifier</span> production of the grammar defined in this specification document.</p>
+
<div class='grammar'>
<span class="nonterminal">useQualifier</span> :=
@@ -1869,12 +1880,22 @@
<span class="nonterminal">Literal</span></div>
-<p>Use, generation, and control expressions MUST contain a qualifier,
-though a qualifier MAY contain no name-value pair. </p>
+<p>Use, generation, and control expressions MUST contain a qualifier. A qualifier's sequence of name-value pairs MAY be empty. </p>
<div class='note'>LUC TO ADAPT to QUALIFIER</div>
+
+
+
<p>
+A use (resp. generation, control) expression does not contain an identifier.
+If one wants to annotate a use (resp. generation, control) expression, this expression MUST be identifiable from its constituents, i.e. its source's identifier, its destination's identifier, and its qualifier.</p>
+
+<p> To be able to annotate, use (resp. generation, control) expressions that refer to a given process execution identifier,
+ any qualifier occuring in use expressions (resp. generation, control) with this identifier and a given entity expression identifier MUST be unique.</p>
+
+
+
If one wants to annotate a use (resp. generation) edge expression or if one wants express a pe-linked-derivationExpression referring to this entity and process execution expressions, the qualifier occuring in this use assertion must be unique among the qualifiers qualifiying use expressions for this process execution.