merge
authorTim L <lebot@rpi.edu>
Tue, 29 May 2012 18:22:33 -0400
changeset 3064 0311fca487f2
parent 3063 c38c811940c7 (current diff)
parent 3062 139b05943321 (diff)
child 3066 26037be44eff
merge
--- a/model/prov-dm.html	Tue May 29 18:22:17 2012 -0400
+++ b/model/prov-dm.html	Tue May 29 18:22:33 2012 -0400
@@ -1611,10 +1611,10 @@
 A <dfn title="wasInformedBy">communication</dfn><span class="withPn">, written as 
 <span class="pnExpression">wasInformedBy(id; a2, a1, attrs)</span> in PROV-N,</span> has: 
 <ul>
-<li><span class='attribute' id="wasInformedBy.id">id</span>:  an OPTIONAL identifier  identifying the relation;</li> 
-<li><span class='attribute' id="wasInformedBy.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
-<li><span class='attribute' id="wasInformedBy.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
-<li><span class='attribute' id="wasInformedBy.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
+<li><span class='attribute' id="communication.id">id</span>:  an OPTIONAL identifier  identifying the relation;</li> 
+<li><span class='attribute' id="communication.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
+<li><span class='attribute' id="communication.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
+<li><span class='attribute' id="communication.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
 </ul>
 </div>
 
--- a/model/prov-n.html	Tue May 29 18:22:17 2012 -0400
+++ b/model/prov-n.html	Tue May 29 18:22:33 2012 -0400
@@ -804,9 +804,11 @@
 
 </table>
 
+<p>The following table summarizes how each constituent of a PROV-DM Generation maps to a non-terminal.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>PROV-DM Attributes</b></td><td><b>PROV-N Non Terminal</b></td></tr>
+<tr><td><b>Generation Constituent</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class='attribute' id="generation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.entity"><span class='attribute' id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.activity"><span class='attribute' id="generation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
@@ -872,6 +874,20 @@
 </div>
 -->
 
+<p>The following table summarizes how each constituent of a PROV-DM Usage maps to a non-terminal.</p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b>Usage Constituent</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class='attribute' id="usage.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.activity"><span class='attribute' id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class='attribute' id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class='attribute' id="usage.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class='attribute' id="usage.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+</table>
+</div>
 
 <div class="anexample">
   
@@ -923,6 +939,20 @@
 </table>
 
 
+<p>The following table summarizes how each constituent of a PROV-DM Communication maps to a non-terminal.</p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b>Communication Constituent</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.id"><span class='attribute' id="communication.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informed"><span class='attribute' id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informant"><span class='attribute' id="communication.informant">informant</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.attributes"><span class='attribute' id="communication.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+</table>
+</div>
+
+
+
 <div class="anexample">
 <pre class="codeexample">
 wasInformedBy(ex:inf1; ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])