--- a/model/prov-dm.html Thu May 24 20:19:38 2012 +0100
+++ b/model/prov-dm.html Thu May 24 21:21:37 2012 +0100
@@ -2417,32 +2417,24 @@
<p><div class="glossary-ref" data-ref="glossary-provenance-locator"></div>
-
+<p>
<div class="attributes" id="attributes-hasProvenanceIn">
A <dfn title="hasProvenanceIn">provenance locator</dfn>,
written
-<span class="pnExpression">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span>, has:
+<span class="pnExpression">hasProvenanceIn(id, subject, bundle, target, attrs)</span>, has:
<ul>
<li><span class='attribute' id="prov.locator.id">id</span>: an identifier for a provenance locator; </li>
<li><span class='attribute' id="prov.locator.subject">subject</span>: an identifier denoting something (entity, activity, agent, or relation instance);</li>
<li><span class='attribute' id="prov.locator.bundle">bundle</span>: an OPTIONAL identifier (<span class="name">bundle</span>) for a bundle;
<li><span class='attribute' id="prov.locator.target">target</span>: an OPTIONAL identifier (<span class="name">target</span>) denoting something described in another set of descriptions (referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-target-uri">Target-URI</a> in [[PROV-AQ]]);
-<li><span class='attribute' id="prov.locator.service">service-uri</span>: an OPTIONAL URI (<span class="name">service</span>) denoting a <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-service">provenance service</a> from which provenance can be retrieved (referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-service-uri">Service-URI</a> in [[PROV-AQ]]);
-<li><span class='attribute' id="prov.locator.provenance">provenance-uri</span>: an OPTIONAL URI (<span class="name">prov</span>), which when dereferenced, allows access to provenance descriptions (referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-uri">Provenance-URI</a> in [[PROV-AQ]]);
-<li><span class='attribute' id="prov.locator.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this locator.</li>
+<li><span class='attribute' id="prov.locator.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this locator; it optionally includes
+<a href="#term-attribute-service-uri"><span class="name">prov:service-uri</span></a>
+or
+<a href="#term-attribute-provenance-uri"><span class="name">prov:provenance-uri</span></a>.</li>
</ul>
-<p>In <span class="pnExpression">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span>, <span class="name">service</span> and <span class="name">prov</span> are both optional and mutually exclusive: if specified, either <span class="name">service</span> or <span class="name">prov</span> is provided.</p>
-</div>
-
-<p>A provenance locator specifies a context, referred to
-as <em>located context</em> in which further descriptions can be found
-about something.</p>
-
-<div class="note">
-It is suggested that prov:service-uri and prov:provenance-uri should be made optional reserved attributes.
-In the target is not specified, it is assumed that the target is the same identifier as subject.
+<p>If the target is not specified, it is assumed that target is the same identifier as subject.
</div>
<p>When the subject and optional target denote entities,
@@ -2451,15 +2443,11 @@
<div class="anexample" id="anexample-provenance-locator">
<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle1</span>.</p>
<pre class="codeexample">
-hasProvenanceIn(ex:report1, bob:bundle1, -, -, -)
+hasProvenanceIn(ex:report1, bob:bundle1, -)
</pre>
<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle1</span>, which is available from the provenance service identified by the provided URI.</p>
<pre class="codeexample">
-hasProvenanceIn(ex:report1, bob:bundle1, -, "http://example.com/service"^xsd:anyURI, -)
-</pre>
-<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in resource identified by the provided URI.</p>
-<pre class="codeexample">
-hasProvenanceIn(ex:report1, -, -, -, "http://example.com/some-provenance.pn"^xsd:anyURI)
+hasProvenanceIn(ex:report1, bob:bundle1, -, [ prov:service-uri="http://example.com/service"^xsd:anyURI ])
</pre>
</div>
@@ -2479,7 +2467,7 @@
<pre class="codeexample">
bundle alice:bundle5
entity(ex:report1)
- hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)
+ hasProvenanceIn(ex:report1, bob:bundle4, -)
entity(ex:report2, [ prov:type="report", ex:version=2 ])
wasGeneratedBy(ex:report2, -, 2012-05-25T11:00:01)
wasDerivedFrom(ex:report2, ex:report1)
@@ -2497,7 +2485,7 @@
<pre class="codeexample">
bundle alice:bundle6
entity(alice:report1)
- hasProvenanceIn(alice:report1, bob:bundle4, ex:report1, -, -)
+ hasProvenanceIn(alice:report1, bob:bundle4, ex:report1)
entity(ex:report2, [ prov:type="report", ex:version=2 ])
wasGeneratedBy(ex:report2, -, 2012-05-25T11:00:01)
wasDerivedFrom(ex:report2, alice:report1)
@@ -2528,13 +2516,13 @@
wasAttributedTo(tool:bundle8, viz:Visualizer)
entity(ex:report1, [viz:color="orange"])
- hasProvenanceIn(ex:report1, obs:bundle7, -, -, -)
+ hasProvenanceIn(ex:report1, obs:bundle7, -)
entity(ex:report2, [viz:color="blue"])
- hasProvenanceIn(ex:report2, obs:bundle7, -, -, -)
+ hasProvenanceIn(ex:report2, obs:bundle7, -)
wasDerivedBy(ex:d; ex:report2, ex:report1, [viz:style="dotted"])
- hasProvenanceIn(ex:d, obs:bundle7, -, -, -)
+ hasProvenanceIn(ex:d, obs:bundle7, -)
endBundle
</pre>
@@ -2905,12 +2893,16 @@
<div id="attributes-at-a-glance-div" style="text-align: left;">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<caption id="attributes-at-a-glance">Table 5: PROV-DM Attributes At a Glance</caption>
-<tr><td><b>Attribute</b></td><td><b>value</b></td><td><b>Section</b></td></tr>
-<tr><td>prov:label</td><td>xsd:string</td><td>Section <a href="#term-attribute-label">5.7.4.1</a> </td></tr>
-<tr><td>prov:location</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-location">5.7.4.2</a> </td></tr>
-<tr><td>prov:role</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-role">5.7.4.3</a> </td></tr>
-<tr><td>prov:type</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-type">5.7.4.4</a> </td></tr>
-<tr><td>prov:value</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-value">5.7.4.5</a> </td></tr>
+<tr><td><b>Attribute</b></td><td><b>Allowed In</b></td><td><b>value</b></td><td><b>Section</b></td></tr>
+<tr><td style="border-width: 0px; "></tr>
+<tr><td>prov:label</td><td><em>any construct</em></td><td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td><td>Section <a href="#term-attribute-label">5.7.4.1</a> </td></tr>
+<tr><td>prov:location</td><td><a>Entity</a>, <a>Activity</a>, <br> <a>Usage</a>, and <a>Generation</a>.</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-location">5.7.4.2</a> </td></tr>
+<tr><td>prov:role</td><td><a>Usage</a>, <a>Generation</a>, <br> <a>Association</a>, <a>Start</a>, and <a>End</a></td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-role">5.7.4.3</a> </td></tr>
+<tr><td>prov:type</td><td><em>any construct</em></td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-type">5.7.4.4</a> </td></tr>
+<tr><td>prov:value</td><td><a>Entity</a></td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-value">5.7.4.5</a> </td></tr>
+
+<tr><td>prov:provenance-uri</td><td><a>Provenance Locator</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td><td>Section <a href="#term-attribute-provenance-uri">5.7.4.6</a> </td></tr>
+<tr><td>prov:service-uri</td><td><a>Provenance Locator</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td><td>Section <a href="#term-attribute-service-uri">5.7.4.7</a> </td></tr>
</table>
</div>
@@ -2954,6 +2946,7 @@
</section>
+
<section id="term-attribute-role">
<h4>prov:role</h4>
@@ -3030,9 +3023,51 @@
</section>
-
-
-
+<section id="term-attribute-provenance-uri">
+<h4>prov:provenance-uri</h4>
+
+
+<p> The attribute <dfn title="dfn-provenance-uri"><span class="name">prov:provenance-uri</span></dfn> provides
+ an OPTIONAL IRI in the context of a <a>Provenance Locator<a>; when this IRI is dereferenced, it allows access to provenance descriptions. It is referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-uri">Provenance-URI</a> in [[PROV-AQ]]. </p>
+
+
+<p>The attributes <a href="#term-attribute-service-uri"><span class="name">prov:service-uri</span></a>
+and
+<a href="#term-attribute-provenance-uri"><span class="name">prov:provenance-uri</span></a> are mutually exclusive.</p>
+
+
+<div class="anexample" id="anexample-provenance-uri">
+<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle1</span>, which is available from the provenance service identified by the provided URI.</p>
+<pre class="codeexample">
+hasProvenanceIn(ex:report1, bob:bundle1, -, [ prov:provenance-uri="http://example.com/service"^xsd:anyURI ])
+</pre>
+</div>
+
+
+
+</section>
+
+
+<section id="term-attribute-service-uri">
+<h4>prov:service-uri</h4>
+
+<p> The attribute <dfn title="dfn-service-uri"><span class="name">prov:service-uri</span></dfn> provides
+ an OPTIONAL IRI in the context of a <a>Provenance Locator</a>; this IRI denotes a <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-service">provenance service</a> from which provenance can be retrieved. It is referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-service-uri">Service-URI</a> in [[PROV-AQ]].</p>
+
+
+<p>The attributes <a href="#term-attribute-service-uri"><span class="name">prov:service-uri</span></a>
+and
+<a href="#term-attribute-provenance-uri"><span class="name">prov:provenance-uri</span></a> are mutually exclusive.</p>
+
+
+<div class="anexample" id="anexample-service-uri">
+<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in the resource identified by the provided URI.</p>
+<pre class="codeexample">
+hasProvenanceIn(ex:report1, [ prov:service=uri="http://example.com/some-provenance.pn"^xsd:anyURI ])
+</pre>
+</div>
+
+</section>