Shorten test identifiers in generated index.html for SPARQL manifests.

Author: gkellogg

index.html

@@ -200,7 +200,7 @@ <h1>RDF and SPARQL Test Suites</h1>
   </li>
 	<li><a href="sparql">SPARQL tests</a>
     <ul>
-      <li>SPARQL 1.2</li>
+      <li><a href="sparql/sparql12">SPARQL 1.2 tests</a></li>
       <li><a href="sparql/sparql11">SPARQL 1.1 tests</a>
         (<a href="sparql/reports/">SPARQL 1.1 implementation report</a>)
       </li>

sparql/sparql10/algebra/index.html

@@ -77,11 +77,12 @@ <h2>
         Test Descriptions
       </h2>
       <dl class='test-description'>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1:
+        <dt id='nested-opt-1'>
+          <a class='testlink' href='#nested-opt-1'>
+            nested-opt-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1' property='mf:name'>Nested Optionals - 1</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1' property='mf:name'>Nested Optionals - 1</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -103,11 +104,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2:
+        <dt id='nested-opt-2'>
+          <a class='testlink' href='#nested-opt-2'>
+            nested-opt-2:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2' property='mf:name'>Nested Optionals - 2</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2' property='mf:name'>Nested Optionals - 2</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -129,11 +131,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1:
+        <dt id='opt-filter-1'>
+          <a class='testlink' href='#opt-filter-1'>
+            opt-filter-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1' property='mf:name'>Optional-filter - 1</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1' property='mf:name'>Optional-filter - 1</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -155,11 +158,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2:
+        <dt id='opt-filter-2'>
+          <a class='testlink' href='#opt-filter-2'>
+            opt-filter-2:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2' property='mf:name'>Optional-filter - 2 filters</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2' property='mf:name'>Optional-filter - 2 filters</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -181,11 +185,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3:
+        <dt id='opt-filter-3'>
+          <a class='testlink' href='#opt-filter-3'>
+            opt-filter-3:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3' property='mf:name'>Optional-filter - scope of variable</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3' property='mf:name'>Optional-filter - scope of variable</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -207,11 +212,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1:
+        <dt id='filter-place-1'>
+          <a class='testlink' href='#filter-place-1'>
+            filter-place-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1' property='mf:name'>Filter-placement - 1</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1' property='mf:name'>Filter-placement - 1</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -233,11 +239,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2:
+        <dt id='filter-place-2'>
+          <a class='testlink' href='#filter-place-2'>
+            filter-place-2:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2' property='mf:name'>Filter-placement - 2</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2' property='mf:name'>Filter-placement - 2</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -259,11 +266,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3:
+        <dt id='filter-place-3'>
+          <a class='testlink' href='#filter-place-3'>
+            filter-place-3:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3' property='mf:name'>Filter-placement - 3</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3' property='mf:name'>Filter-placement - 3</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -285,11 +293,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1:
+        <dt id='filter-nested-1'>
+          <a class='testlink' href='#filter-nested-1'>
+            filter-nested-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1' property='mf:name'>Filter-nested - 1</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1' property='mf:name'>Filter-nested - 1</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -311,11 +320,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2:
+        <dt id='filter-nested-2'>
+          <a class='testlink' href='#filter-nested-2'>
+            filter-nested-2:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2' property='mf:name'>Filter-nested - 2</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2' property='mf:name'>Filter-nested - 2</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -337,11 +347,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1:
+        <dt id='filter-scope-1'>
+          <a class='testlink' href='#filter-scope-1'>
+            filter-scope-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1' property='mf:name'>Filter-scope - 1</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1' property='mf:name'>Filter-scope - 1</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -363,11 +374,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1:
+        <dt id='join-scope-1'>
+          <a class='testlink' href='#join-scope-1'>
+            join-scope-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1' property='mf:name'>Join scope - 1</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1' property='mf:name'>Join scope - 1</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -389,11 +401,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1:
+        <dt id='join-combo-1'>
+          <a class='testlink' href='#join-combo-1'>
+            join-combo-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1' property='mf:name'>Join operator with OPTs, BGPs, and UNIONs</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1' property='mf:name'>Join operator with OPTs, BGPs, and UNIONs</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -415,11 +428,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2:
+        <dt id='join-combo-2'>
+          <a class='testlink' href='#join-combo-2'>
+            join-combo-2:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2' property='mf:name'>Join operator with Graph and Union</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2' property='mf:name'>Join operator with Graph and Union</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>

sparql/sparql10/ask/index.html

@@ -77,11 +77,12 @@ <h2>
         Test Descriptions
       </h2>
       <dl class='test-description'>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1:
+        <dt id='ask-1'>
+          <a class='testlink' href='#ask-1'>
+            ask-1:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1' property='mf:name'>ASK-1 (SPARQL XML results)</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1' property='mf:name'>ASK-1 (SPARQL XML results)</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -102,11 +103,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4:
+        <dt id='ask-4'>
+          <a class='testlink' href='#ask-4'>
+            ask-4:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4' property='mf:name'>ASK-4 (SPARQL XML results)</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4' property='mf:name'>ASK-4 (SPARQL XML results)</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -127,11 +129,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7:
+        <dt id='ask-7'>
+          <a class='testlink' href='#ask-7'>
+            ask-7:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7' property='mf:name'>ASK-7 (SPARQL XML results)</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7' property='mf:name'>ASK-7 (SPARQL XML results)</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>
@@ -152,11 +155,12 @@ <h2>
             </dd>
           </dl>
         </dd>
-        <dt id='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8'>
-          <a class='testlink' href='#http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8'>
-            http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8:
+        <dt id='ask-8'>
+          <a class='testlink' href='#ask-8'>
+            ask-8:
           </a>
           <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8' property='mf:name'>ASK-8 (SPARQL XML results)</span>
+          <span about='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8' property='mf:name'>ASK-8 (SPARQL XML results)</span>
         </dt>
         <dd inlist='true' property='mf:entry' resource='http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8' typeof='mf:QueryEvaluationTest'>
           <div property='rdfs:comment'>