[Mulgara-svn] r1846 - in branches/distinct_queries/jxdata/iTQL: . vargraph
pag at mulgara.org
pag at mulgara.org
Thu Nov 19 11:55:03 UTC 2009
Author: pag
Date: 2009-11-19 03:55:02 -0800 (Thu, 19 Nov 2009)
New Revision: 1846
Added:
branches/distinct_queries/jxdata/iTQL/unique.rdf
branches/distinct_queries/jxdata/iTQL/unique2.rdf
Modified:
branches/distinct_queries/jxdata/iTQL/vargraph/queryResult1.txt
branches/distinct_queries/jxdata/iTQL/vargraph/queryResult2.txt
branches/distinct_queries/jxdata/iTQL/vargraph/result1.txt
branches/distinct_queries/jxdata/iTQL/vargraph/result2.txt
branches/distinct_queries/jxdata/iTQL/vargraph/result3.txt
branches/distinct_queries/jxdata/iTQL/vargraph/test.jxu
Log:
Changed graph names and contents to be relatively unique, due to the nature of the tests and the undesirability of conflicting with data from other tests
Added: branches/distinct_queries/jxdata/iTQL/unique.rdf
===================================================================
--- branches/distinct_queries/jxdata/iTQL/unique.rdf (rev 0)
+++ branches/distinct_queries/jxdata/iTQL/unique.rdf 2009-11-19 11:55:02 UTC (rev 1846)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cndb="cn:">
+
+<rdf:Description rdf:about = "cn:SP" >
+ <cndb:metal rdf:resource="cn:silver"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:Wazoo" >
+ <cndb:shape rdf:resource="cn:round"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:GP" >
+ <cndb:metal rdf:resource="cn:gold"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:Boing" >
+ <cndb:shape rdf:resource="cn:square"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:Wazoo/Silver" >
+ <cndb:metal rdf:resource="cn:silver"/>
+ <cndb:shape rdf:resource="cn:round"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:Boing/Silver" >
+ <cndb:metal rdf:resource="cn:silver"/>
+ <cndb:shape rdf:resource="cn:square"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:Wazoo/Gold" >
+ <cndb:metal rdf:resource="cn:gold"/>
+ <cndb:shape rdf:resource="cn:round"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:Boing/Gold" >
+ <cndb:metal rdf:resource="cn:gold"/>
+ <cndb:shape rdf:resource="cn:square"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:gold" >
+ <cndb:value rdf:resource="cn:high"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:silver" >
+ <cndb:value rdf:resource="cn:medium"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:round" >
+ <cndb:surface rdf:resource="cn:smooth"/>
+</rdf:Description>
+<rdf:Description rdf:about = "cn:square" >
+ <cndb:surface rdf:resource="cn:rough"/>
+</rdf:Description>
+
+</rdf:RDF>
Added: branches/distinct_queries/jxdata/iTQL/unique2.rdf
===================================================================
--- branches/distinct_queries/jxdata/iTQL/unique2.rdf (rev 0)
+++ branches/distinct_queries/jxdata/iTQL/unique2.rdf 2009-11-19 11:55:02 UTC (rev 1846)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:vCard = "http://www.w3.org/2001/vcard-rdf/3.0#">
+
+<rdf:Description rdf:about = "http://qqq.com/staff/groo" >
+ <vCard:FN>Groo The Wanderer</vCard:FN>
+ <vCard:N rdf:parseType="Resource">
+ <vCard:Family>Wanderer</vCard:Family>
+ <vCard:Given>Groo</vCard:Given>
+ </vCard:N>
+ <vCard:ROLE>Wanderer</vCard:ROLE>
+ <vCard:TEL rdf:parseType="Resource">
+ <rdf:value>+1 773 5281639</rdf:value>
+ <rdf:type rdf:resource ="http://imc.org/vCard/3.0#mobile" />
+ </vCard:TEL>
+ <vCard:EMAIL>
+ <vCard:internet rdf:value="groo at qqq.com"/>
+ </vCard:EMAIL>
+</rdf:Description>
+
+</rdf:RDF>
Modified: branches/distinct_queries/jxdata/iTQL/vargraph/queryResult1.txt
===================================================================
--- branches/distinct_queries/jxdata/iTQL/vargraph/queryResult1.txt 2009-11-19 11:53:50 UTC (rev 1845)
+++ branches/distinct_queries/jxdata/iTQL/vargraph/queryResult1.txt 2009-11-19 11:55:02 UTC (rev 1846)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><graph/></variables><solution><graph resource="@server@#graph3"/></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><graph/></variables><solution><graph resource="@server@#unique3"/></solution></query></answer>
Modified: branches/distinct_queries/jxdata/iTQL/vargraph/queryResult2.txt
===================================================================
--- branches/distinct_queries/jxdata/iTQL/vargraph/queryResult2.txt 2009-11-19 11:53:50 UTC (rev 1845)
+++ branches/distinct_queries/jxdata/iTQL/vargraph/queryResult2.txt 2009-11-19 11:55:02 UTC (rev 1846)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><graph/></variables><solution><graph resource="@server@#graph1"/></solution><solution><graph resource="@server@#graph2"/></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><graph/></variables><solution><graph resource="@server@#unique1"/></solution><solution><graph resource="@server@#unique2"/></solution></query></answer>
Modified: branches/distinct_queries/jxdata/iTQL/vargraph/result1.txt
===================================================================
--- branches/distinct_queries/jxdata/iTQL/vargraph/result1.txt 2009-11-19 11:53:50 UTC (rev 1845)
+++ branches/distinct_queries/jxdata/iTQL/vargraph/result1.txt 2009-11-19 11:55:02 UTC (rev 1846)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 16 statements from @baseuri@/jxdata/iTQL/coins.rdf into @server@#graph1</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 16 statements from @baseuri@/jxdata/iTQL/unique.rdf into @server@#unique1</message></query></answer>
Modified: branches/distinct_queries/jxdata/iTQL/vargraph/result2.txt
===================================================================
--- branches/distinct_queries/jxdata/iTQL/vargraph/result2.txt 2009-11-19 11:53:50 UTC (rev 1845)
+++ branches/distinct_queries/jxdata/iTQL/vargraph/result2.txt 2009-11-19 11:55:02 UTC (rev 1846)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 16 statements from @baseuri@/jxdata/iTQL/coins.rdf into @server@#graph2</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 16 statements from @baseuri@/jxdata/iTQL/unique.rdf into @server@#unique2</message></query></answer>
Modified: branches/distinct_queries/jxdata/iTQL/vargraph/result3.txt
===================================================================
--- branches/distinct_queries/jxdata/iTQL/vargraph/result3.txt 2009-11-19 11:53:50 UTC (rev 1845)
+++ branches/distinct_queries/jxdata/iTQL/vargraph/result3.txt 2009-11-19 11:55:02 UTC (rev 1846)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 79 statements from @baseuri@/jxdata/iTQL/vcards.rdf into @server@#graph3</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 11 statements from @baseuri@/jxdata/iTQL/unique2.rdf into @server@#unique3</message></query></answer>
Modified: branches/distinct_queries/jxdata/iTQL/vargraph/test.jxu
===================================================================
--- branches/distinct_queries/jxdata/iTQL/vargraph/test.jxu 2009-11-19 11:53:50 UTC (rev 1845)
+++ branches/distinct_queries/jxdata/iTQL/vargraph/test.jxu 2009-11-19 11:55:02 UTC (rev 1846)
@@ -1,8 +1,8 @@
<jxu>
<set name="debug" value="false" />
- <set name="modelName" value="@server@#graph1" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/coins.rdf> into <@server@#graph1> ;" />
+ <set name="modelName" value="@server@#unique1" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/unique.rdf> into <@server@#unique1> ;" />
<eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
<ifEqual converse="true" file="result1.txt" name="loadResult">
@@ -10,8 +10,8 @@
<fail>Output failed. Check badLoadResult.xml for output.</fail>
</ifEqual>
- <set name="modelName" value="@server@#graph2" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/coins.rdf> into <@server@#graph2> ;" />
+ <set name="modelName" value="@server@#unique2" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/unique.rdf> into <@server@#unique2> ;" />
<eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
<ifEqual converse="true" file="result2.txt" name="loadResult">
@@ -19,8 +19,8 @@
<fail>Output failed. Check badLoadResult2.xml for output.</fail>
</ifEqual>
- <set name="modelName" value="@server@#graph3" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/vcards.rdf> into <@server@#graph3> ;" />
+ <set name="modelName" value="@server@#unique3" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/unique2.rdf> into <@server@#unique3> ;" />
<eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
<ifEqual converse="true" file="result3.txt" name="loadResult">
@@ -30,7 +30,7 @@
<!-- now query the graphs -->
- <set name="query" value="select $graph from <@server@#graph1> where <http://qqq.com/staff/corky> <http://www.w3.org/2001/vcard-rdf/3.0#FN> 'Corky Crystal' in $graph order by $graph;"/>
+ <set name="query" value="select $graph from <@server@#unique1> where <http://qqq.com/staff/groo> <http://www.w3.org/2001/vcard-rdf/3.0#FN> 'Groo The Wanderer' in $graph order by $graph;"/>
<eval stepClass="org.mulgara.store.jxunit.QueryJX" />
<ifEqual converse="true" file="queryResult1.txt" name="queryResult">
@@ -39,7 +39,7 @@
</ifEqual>
- <set name="query" value="select $graph from <@server@#graph1> where <coin:SP> <coin:metal> <coin:silver> in $graph order by $graph;"/>
+ <set name="query" value="select $graph from <@server@#unique1> where <cn:SP> <cn:metal> <cn:silver> in $graph order by $graph;"/>
<eval stepClass="org.mulgara.store.jxunit.QueryJX" />
<ifEqual converse="true" file="queryResult2.txt" name="queryResult">
@@ -47,7 +47,7 @@
<fail>Output failed. Check badQuery2Result.xml for output.</fail>
</ifEqual>
- <set name="query" value="select $graph from <@server@#graph1> where <foo:bar> <foo:baz> <foo:bop> in $graph order by $graph;"/>
+ <set name="query" value="select $graph from <unique1> where <foo:bar> <foo:baz> <foo:bop> in $graph order by $graph;"/>
<eval stepClass="org.mulgara.store.jxunit.QueryJX" />
<ifEqual converse="true" file="queryResult3.txt" name="queryResult">
@@ -55,5 +55,15 @@
<fail>Output failed. Check badQuery3Result.xml for output.</fail>
</ifEqual>
+ <!-- now drop the graphs -->
+ <set name="query" value="drop <@server@#unique1>;"/>
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+
+ <set name="query" value="drop <@server@#unique2>;"/>
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+
+ <set name="query" value="drop <@server@#unique3>;"/>
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+
</jxu>
More information about the Mulgara-svn
mailing list