Mercurial > hg > prov / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
merged
authorStian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk>
Wed, 22 Feb 2012 09:06:16 +0000
changeset 1639 2b8153c82db2
parent 1638 1521cd7b25c6 (current diff)
parent 1636 035c77d87c55 (diff)
child 1640 49d47abe200f
merged 
--- a/model/working-copy/Makefile	Tue Feb 21 15:02:37 2012 +0000
+++ b/model/working-copy/Makefile	Wed Feb 22 09:06:16 2012 +0000
@@ -28,11 +28,14 @@
 
 xsl:
 	html2xhtml -t 1.1 towards-wd4.html -o towards-wd4.xhtml
+	html2xhtml -t 1.1 prov-dm-constraints.html -o prov-dm-constraints.xhtml
 	grep -v mdash towards-wd4.xhtml | grep -v "/html" > towards-wd4-2.xhtml
-#	xsltproc transform-examples.xsl towards-wd4-2.xhtml
+	cat prov-dm-constraints.xhtml | sed -e "s/&le/le/g" | sed -e "s/&cup/cup/g" | sed -e "s/&ge/ge/g" | grep -v "/html" > prov-dm-constraints-2.xhtml
 	csplit -f out towards-wd4-2.xhtml /body/
 	echo "<html>" > all-divs.html
 	xpath out01 .//div[@class] >> all-divs.html
+	csplit -f out prov-dm-constraints-2.xhtml /body/
+	xpath out01 .//div[@class] >> all-divs.html
 	echo "</html>" >> all-divs.html
 	cat all-divs.html | sed -e "s/\'/\\\'/g" > all-divs2.html
 	$(MAKE) make.all-divs.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/working-copy/examples/w3c-publication1.svg	Wed Feb 22 09:06:16 2012 +0000
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.26.3 (20100126.1600)
+ -->
+<!-- Title: OPMGraph Pages: 1 -->
+<svg width="702pt" height="332pt"
+ viewBox="0.00 0.00 702.00 332.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 328)">
+<title>OPMGraph</title>
+<polygon fill="white" stroke="white" points="-4,5 -4,-328 699,-328 699,5 -4,5"/>
+<!-- pub1 -->
+<g id="node1" class="node"><title>pub1</title>
+<polygon fill="none" stroke="black" points="472,-252 418,-252 418,-216 472,-216 472,-252"/>
+<text text-anchor="middle" x="445" y="-228.9" font-family="Times,serif" font-size="14.00">pub1</text>
+</g>
+<!-- rec_advance -->
+<g id="node13" class="node"><title>rec_advance</title>
+<ellipse fill="none" stroke="black" cx="369" cy="-306" rx="55.895" ry="18"/>
+<text text-anchor="middle" x="369" y="-300.9" font-family="Times,serif" font-size="14.00">rec&#45;advance</text>
+</g>
+<!-- pub1&#45;&gt;rec_advance -->
+<g id="edge34" class="edge"><title>pub1&#45;&gt;rec_advance</title>
+<path fill="none" stroke="black" d="M425.822,-252.169C416.361,-261.132 404.817,-272.068 394.612,-281.736"/>
+<polygon fill="black" stroke="black" points="391.978,-279.41 387.125,-288.829 396.792,-284.492 391.978,-279.41"/>
+</g>
+<!-- 0004 -->
+<g id="node16" class="node"><title>0004</title>
+<ellipse fill="none" stroke="black" cx="509" cy="-306" rx="30.0465" ry="18"/>
+<text text-anchor="middle" x="509" y="-300.9" font-family="Times,serif" font-size="14.00">0004</text>
+</g>
+<!-- pub1&#45;&gt;0004 -->
+<g id="edge26" class="edge"><title>pub1&#45;&gt;0004</title>
+<path fill="none" stroke="black" d="M461.15,-252.169C469.331,-261.373 479.362,-272.657 488.122,-282.513"/>
+<polygon fill="black" stroke="black" points="485.557,-284.894 494.816,-290.043 490.788,-280.244 485.557,-284.894"/>
+</g>
+<!-- 0141 -->
+<g id="node19" class="node"><title>0141</title>
+<ellipse fill="none" stroke="black" cx="621" cy="-306" rx="29.8973" ry="18"/>
+<text text-anchor="middle" x="621" y="-300.9" font-family="Times,serif" font-size="14.00">0141</text>
+</g>
+<!-- pub1&#45;&gt;0141 -->
+<g id="edge28" class="edge"><title>pub1&#45;&gt;0141</title>
+<path fill="none" stroke="black" d="M472.389,-248.032C475.278,-249.411 478.187,-250.758 481,-252 515.96,-267.44 556.827,-282.917 585.35,-293.319"/>
+<polygon fill="black" stroke="black" points="584.301,-296.661 594.895,-296.778 586.686,-290.08 584.301,-296.661"/>
+</g>
+<!-- Consortium -->
+<g id="node25" class="node"><title>Consortium</title>
+<polygon fill="none" stroke="black" points="295.093,-298.544 295.093,-313.456 260.477,-324 211.523,-324 176.907,-313.456 176.907,-298.544 211.523,-288 260.477,-288 295.093,-298.544"/>
+<text text-anchor="middle" x="236" y="-300.9" font-family="Times,serif" font-size="14.00">Consortium</text>
+</g>
+<!-- pub1&#45;&gt;Consortium -->
+<g id="edge32" class="edge"><title>pub1&#45;&gt;Consortium</title>
+<path fill="none" stroke="black" d="M417.692,-248.223C414.787,-249.565 411.852,-250.851 409,-252 370.221,-267.629 325.087,-281.582 290.645,-291.388"/>
+<polygon fill="black" stroke="black" points="289.451,-288.089 280.774,-294.169 291.349,-294.826 289.451,-288.089"/>
+</g>
+<!-- ann0 -->
+<g id="node2" class="node"><title>ann0</title>
+<polygon fill="none" stroke="gray" points="540,-180 454,-180 454,-144 546,-144 546,-174 540,-180"/>
+<polyline fill="none" stroke="gray" points="540,-180 540,-174 "/>
+<polyline fill="none" stroke="gray" points="546,-174 540,-174 "/>
+<text text-anchor="start" x="464" y="-158.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="495" y="-158.233" font-family="Times,serif" font-size="14.00">publish</text>
+</g>
+<!-- ann0&#45;&gt;pub1 -->
+<g id="edge2" class="edge"><title>ann0&#45;&gt;pub1</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M486.121,-180.169C477.847,-191 467.372,-204.712 459.066,-215.587"/>
+</g>
+<!-- pub2 -->
+<g id="node4" class="node"><title>pub2</title>
+<polygon fill="none" stroke="black" points="162,-252 108,-252 108,-216 162,-216 162,-252"/>
+<text text-anchor="middle" x="135" y="-228.9" font-family="Times,serif" font-size="14.00">pub2</text>
+</g>
+<!-- pub2&#45;&gt;rec_advance -->
+<g id="edge38" class="edge"><title>pub2&#45;&gt;rec_advance</title>
+<path fill="none" stroke="black" d="M162.264,-248.336C165.178,-249.655 168.127,-250.905 171,-252 228.226,-273.801 244.936,-271.828 304,-288 308.066,-289.113 312.273,-290.269 316.503,-291.434"/>
+<polygon fill="black" stroke="black" points="315.783,-294.866 326.354,-294.152 317.645,-288.118 315.783,-294.866"/>
+</g>
+<!-- 0111 -->
+<g id="node22" class="node"><title>0111</title>
+<ellipse fill="none" stroke="black" cx="92" cy="-306" rx="28.0958" ry="18"/>
+<text text-anchor="middle" x="92" y="-300.9" font-family="Times,serif" font-size="14.00">0111</text>
+</g>
+<!-- pub2&#45;&gt;0111 -->
+<g id="edge30" class="edge"><title>pub2&#45;&gt;0111</title>
+<path fill="none" stroke="black" d="M124.149,-252.169C119.074,-260.667 112.939,-270.939 107.395,-280.222"/>
+<polygon fill="black" stroke="black" points="104.231,-278.694 102.109,-289.074 110.241,-282.283 104.231,-278.694"/>
+</g>
+<!-- pub2&#45;&gt;Consortium -->
+<g id="edge36" class="edge"><title>pub2&#45;&gt;Consortium</title>
+<path fill="none" stroke="black" d="M160.487,-252.169C173.263,-261.276 188.896,-272.421 202.618,-282.203"/>
+<polygon fill="black" stroke="black" points="200.697,-285.132 210.871,-288.087 204.76,-279.432 200.697,-285.132"/>
+</g>
+<!-- ann1 -->
+<g id="node5" class="node"><title>ann1</title>
+<polygon fill="none" stroke="gray" points="212,-180 126,-180 126,-144 218,-144 218,-174 212,-180"/>
+<polyline fill="none" stroke="gray" points="212,-180 212,-174 "/>
+<polyline fill="none" stroke="gray" points="218,-174 212,-174 "/>
+<text text-anchor="start" x="136" y="-158.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="167" y="-158.233" font-family="Times,serif" font-size="14.00">publish</text>
+</g>
+<!-- ann1&#45;&gt;pub2 -->
+<g id="edge4" class="edge"><title>ann1&#45;&gt;pub2</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M162.663,-180.169C157.097,-191 150.051,-204.712 144.462,-215.587"/>
+</g>
+<!-- WD_prov_dm_20111018 -->
+<g id="node7" class="node"><title>WD_prov_dm_20111018</title>
+<ellipse fill="none" stroke="black" cx="336" cy="-162" rx="100.24" ry="18"/>
+<text text-anchor="middle" x="336" y="-156.9" font-family="Times,serif" font-size="14.00">WD&#45;prov&#45;dm&#45;20111018</text>
+</g>
+<!-- WD_prov_dm_20111018&#45;&gt;pub1 -->
+<g id="edge22" class="edge"><title>WD_prov_dm_20111018&#45;&gt;pub1</title>
+<path fill="none" stroke="black" d="M362.386,-179.429C376.396,-188.683 393.819,-200.192 409.048,-210.252"/>
+<polygon fill="black" stroke="black" points="407.446,-213.388 417.719,-215.979 411.304,-207.547 407.446,-213.388"/>
+</g>
+<!-- ann2 -->
+<g id="node8" class="node"><title>ann2</title>
+<polygon fill="none" stroke="gray" points="381,-108 285,-108 285,-72 387,-72 387,-102 381,-108"/>
+<polyline fill="none" stroke="gray" points="381,-108 381,-102 "/>
+<polyline fill="none" stroke="gray" points="387,-102 381,-102 "/>
+<text text-anchor="start" x="295" y="-86.2333" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="326" y="-86.2333" font-family="Times,serif" font-size="14.00">RecsWD</text>
+</g>
+<!-- ann2&#45;&gt;WD_prov_dm_20111018 -->
+<g id="edge6" class="edge"><title>ann2&#45;&gt;WD_prov_dm_20111018</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M336,-108.169C336,-119 336,-132.712 336,-143.587"/>
+</g>
+<!-- WD_prov_dm_20111215 -->
+<g id="node10" class="node"><title>WD_prov_dm_20111215</title>
+<ellipse fill="none" stroke="black" cx="133" cy="-90" rx="100.24" ry="18"/>
+<text text-anchor="middle" x="133" y="-84.9" font-family="Times,serif" font-size="14.00">WD&#45;prov&#45;dm&#45;20111215</text>
+</g>
+<!-- WD_prov_dm_20111215&#45;&gt;pub2 -->
+<g id="edge24" class="edge"><title>WD_prov_dm_20111215&#45;&gt;pub2</title>
+<path fill="none" stroke="black" d="M126.181,-108.2C122.672,-118.536 118.768,-131.807 117,-144 114.704,-159.834 114.437,-164.207 117,-180 118.418,-188.738 121.048,-197.973 123.867,-206.286"/>
+<polygon fill="black" stroke="black" points="120.642,-207.66 127.332,-215.876 127.225,-205.281 120.642,-207.66"/>
+</g>
+<!-- WD_prov_dm_20111215&#45;&gt;WD_prov_dm_20111018 -->
+<g id="edge20" class="edge"><title>WD_prov_dm_20111215&#45;&gt;WD_prov_dm_20111018</title>
+<path fill="none" stroke="black" d="M178.304,-106.069C208.591,-116.811 248.626,-131.01 280.778,-142.414"/>
+<polygon fill="black" stroke="black" points="279.889,-145.812 290.483,-145.856 282.229,-139.215 279.889,-145.812"/>
+</g>
+<!-- ann3 -->
+<g id="node11" class="node"><title>ann3</title>
+<polygon fill="none" stroke="gray" points="178,-36 82,-36 82,-1.77636e-14 184,-3.55271e-15 184,-30 178,-36"/>
+<polyline fill="none" stroke="gray" points="178,-36 178,-30 "/>
+<polyline fill="none" stroke="gray" points="184,-30 178,-30 "/>
+<text text-anchor="start" x="92" y="-14.2333" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="123" y="-14.2333" font-family="Times,serif" font-size="14.00">RecsWD</text>
+</g>
+<!-- ann3&#45;&gt;WD_prov_dm_20111215 -->
+<g id="edge8" class="edge"><title>ann3&#45;&gt;WD_prov_dm_20111215</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M133,-36.1686C133,-47 133,-60.7124 133,-71.5867"/>
+</g>
+<!-- ann4 -->
+<g id="node14" class="node"><title>ann4</title>
+<polygon fill="none" stroke="gray" points="394,-252 324,-252 324,-216 400,-216 400,-246 394,-252"/>
+<polyline fill="none" stroke="gray" points="394,-252 394,-246 "/>
+<polyline fill="none" stroke="gray" points="400,-246 394,-246 "/>
+<text text-anchor="start" x="334" y="-230.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="365" y="-230.233" font-family="Times,serif" font-size="14.00">Plan</text>
+</g>
+<!-- ann4&#45;&gt;rec_advance -->
+<g id="edge10" class="edge"><title>ann4&#45;&gt;rec_advance</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M363.766,-252.169C364.819,-263 366.153,-276.712 367.21,-287.587"/>
+</g>
+<!-- ann5 -->
+<g id="node17" class="node"><title>ann5</title>
+<polygon fill="none" stroke="gray" points="580,-252 490,-252 490,-216 586,-216 586,-246 580,-252"/>
+<polyline fill="none" stroke="gray" points="580,-252 580,-246 "/>
+<polyline fill="none" stroke="gray" points="586,-246 580,-246 "/>
+<text text-anchor="start" x="500" y="-230.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="531" y="-230.233" font-family="Times,serif" font-size="14.00">transreq</text>
+</g>
+<!-- ann5&#45;&gt;0004 -->
+<g id="edge12" class="edge"><title>ann5&#45;&gt;0004</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M530.682,-252.169C526.252,-263.167 520.626,-277.135 516.215,-288.087"/>
+</g>
+<!-- ann6 -->
+<g id="node20" class="node"><title>ann6</title>
+<polygon fill="none" stroke="gray" points="688,-252 604,-252 604,-216 694,-216 694,-246 688,-252"/>
+<polyline fill="none" stroke="gray" points="688,-252 688,-246 "/>
+<polyline fill="none" stroke="gray" points="694,-246 688,-246 "/>
+<text text-anchor="start" x="614" y="-230.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="645" y="-230.233" font-family="Times,serif" font-size="14.00">pubreq</text>
+</g>
+<!-- ann6&#45;&gt;0141 -->
+<g id="edge14" class="edge"><title>ann6&#45;&gt;0141</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M641.934,-252.169C637.657,-263.167 632.225,-277.135 627.966,-288.087"/>
+</g>
+<!-- ann7 -->
+<g id="node23" class="node"><title>ann7</title>
+<polygon fill="none" stroke="gray" points="84,-252 3.55271e-14,-252 0,-216 90,-216 90,-246 84,-252"/>
+<polyline fill="none" stroke="gray" points="84,-252 84,-246 "/>
+<polyline fill="none" stroke="gray" points="90,-246 84,-246 "/>
+<text text-anchor="start" x="10" y="-230.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="41" y="-230.233" font-family="Times,serif" font-size="14.00">pubreq</text>
+</g>
+<!-- ann7&#45;&gt;0111 -->
+<g id="edge16" class="edge"><title>ann7&#45;&gt;0111</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M56.8601,-252.169C64.2569,-263.5 73.712,-277.984 80.9509,-289.074"/>
+</g>
+<!-- ann8 -->
+<g id="node26" class="node"><title>ann8</title>
+<polygon fill="none" stroke="gray" points="300,-252 180,-252 180,-216 306,-216 306,-246 300,-252"/>
+<polyline fill="none" stroke="gray" points="300,-252 300,-246 "/>
+<polyline fill="none" stroke="gray" points="306,-246 300,-246 "/>
+<text text-anchor="start" x="190" y="-230.233" font-family="Times,serif" font-size="14.00">type:</text>
+<text text-anchor="start" x="221" y="-230.233" font-family="Times,serif" font-size="14.00">Organization</text>
+</g>
+<!-- ann8&#45;&gt;Consortium -->
+<g id="edge18" class="edge"><title>ann8&#45;&gt;Consortium</title>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M241.234,-252.169C240.181,-263 238.847,-276.712 237.79,-287.587"/>
+</g>
+</g>
+</svg>
--- a/model/working-copy/towards-wd4.html	Tue Feb 21 15:02:37 2012 +0000
+++ b/model/working-copy/towards-wd4.html	Wed Feb 22 09:06:16 2012 +0000
@@ -567,6 +567,10 @@
 
 <p> The following diagram summarizes the elements and relations just described</p>
 
+<div class="note">
+   TODO: short text required to explain the overview diagram
+</div>
+
 
 <div style="text-align: center; ">
   <figure>
prov

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org