--- a/model/ProvenanceModel.html Tue Dec 13 20:35:26 2011 +0000
+++ b/model/ProvenanceModel.html Tue Dec 13 20:38:41 2011 +0000
@@ -992,7 +992,7 @@
<p>
Examples of activities include assembling a data set based on a set of measurements, performing a statistical analysis over a data set, sorting news items according to some criteria, running a sparql query over a triple store, editing a file, and publishing a web page. </p>
-<p> An activity record, written <span class="name">activity(id, rl, st, et, [ attr1=val1, ...])</span> in PROV-ASN, contains:</p>
+<p> An activity record, written <span class="name">activity(id, st, et, [ attr1=val1, ...])</span> in PROV-ASN, contains:</p>
<ul>
<li><em>id</em>: an identifier <span class="name">id</span> identifying an activity; the identifier of the activity record is defined to be the same as the identifier of the activity;</li>
<!--<li><em>recipeLink</em>: an OPTIONAL <a href="#record-RecipeLink">recipe link</a> <span class="name">rl</span>, which consists of a domain specific specification of the activity;</li>-->
@@ -1026,7 +1026,7 @@
<p>
The following activity assertion</p>
<pre class="codeexample">
-activity(a1,add-crime-in-london,2011-11-16T16:05:00,2011-11-16T16:06:00,[ex:host="server.example.org",prov:type="ex:edit" %% xsd:QName])
+activity(a1,2011-11-16T16:05:00,2011-11-16T16:06:00,[ex:host="server.example.org",prov:type="ex:edit" %% xsd:QName])
</pre>
<p>identified by identifier <span class="name">a1</span>, states the existence of an activity with recipe link <span class="name">add-crime-in-london</span>, start time <span class="name">2011-11-16T16:05:00</span>, and end time <span class="name">2011-11-16T16:06:00</span>, running on host <span class="name">server.example.org</span>, and of type <span class="name">edit</span> (declared in some namespace with prefix <span class="name">ex</span>). The attribute <span class="name">host</span> is application specific, but MUST hold for the duration of activity. The attribute <span class="name">type</span> is a reserved attribute of PROV-DM, allowing for subtyping to be expressed.</p>
</div>
@@ -2189,7 +2189,7 @@
<pre class="codexample">
entity(e1,[prov:type="document"])
entity(e2,[prov:type="document"])
-activity(a,transform,t1,t2,[])
+activity(a,t1,t2)
used(u1,a,e1,[ex:file="stdin"])
wasGeneratedBy(e2, a, [ex:file="stdout"])
@@ -2268,9 +2268,9 @@
...
wasDerivedFrom(e2,e1)
...
- activity(a0,create-file,t)
+ activity(a0,t,,[prov:type="createFile"])
...
- wasGeneratedBy(e0,a0,[])
+ wasGeneratedBy(e0,a0)
...
wasAssociatedWith(a4, ag5, [prov:role="communicator"]) )
</pre>
@@ -2323,7 +2323,7 @@
http://example.org/asserter2,
entity(e0, [ prov:type="File", ex:path="/shared/crime.txt", ex:creator="Alice" ])
...
- activity(a1,create-file,t1)
+ activity(a1,t1,,[prov:type="createFile"])
...
wasGeneratedBy(e0,a1,[ex:fct="create"])
... )
@@ -2340,12 +2340,12 @@
account(ex:acc3,
http://example.org/asserter1,
entity(e0, [ prov:type="File", ex:path="/shared/crime.txt", ex:creator="Alice" ])
- activity(a0,create-file,t)
+ activity(a0,t,,[prov:type="createFile"])
wasGeneratedBy(e0,a0,[])
account(ex:acc4,
http://example.org/asserter2,
entity(e1, [ prov:type="File", ex:path="/shared/crime.txt", ex:creator="Alice", ex:content="" ])
- activity(a0,copy-file,t)
+ activity(a0,t,,[prov:type="copyFile"])
wasGeneratedBy(e1,a0,[ex:fct="create"])
wasComplementOf(e1,e0)))
</pre>
@@ -2969,8 +2969,8 @@
<p>
In the following assertions, we find two activity records, identified by <span class="name">a1</span> and <span class="name">a2</span>, representing two activities, which took place on two separate hosts. The third record indicates that the latter activity was started by the former.</p>
<pre class="codeexample">
-activity(a1,workflow,t1,t2,[ex:host="server1.example.org"])
-activity(a2,sub-workflow,t3,t4,[ex:host="server2.example.org"])
+activity(a1,t1,t2,[ex:host="server1.example.org",prov:type="workflow"])
+activity(a2,t3,t4,[ex:host="server2.example.org",prov:type="subworkflow"])
wasStartedBy(a2,a1)
</pre>