rdfapi-php-svn Mailing List for RAP - RDF API for PHP (Page 2)

Brought to you by: bizer, cax, cweiske, cyganiak, and 2 others

rdfapi-php-svn — rap subversion commit mails

You can subscribe to this list here.

2007	_Jan	_Feb	_Mar	_Apr	_May	_Jun (19)	_Jul (6)	_Aug (65)	_Sep (4)	_Oct (5)	_Nov (8)	_Dec (2)
2008	_Jan (1)	_Feb (9)	_Mar (1)	_Apr	_May (8)	_Jun (1)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 .. 6 > >> (Page 2 of 6)

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [550] trunk/rdfapi-php/api/sparql/SparqlEngineDb/ ResultRenderer/JSON.php

From: <fu...@us...> - 2007-11-15 13:45:26

Revision: 550
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=550&view=rev
Author:   fusel2k
Date:     2007-11-15 05:45:22 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
[fix] Removed trailing ?- or $-SPARQL variable indentifiers from Output to follow http://www.w3.org/TR/rdf-sparql-json-res/

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php

Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php	2007-11-15 13:29:04 UTC (rev 549)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php	2007-11-15 13:45:22 UTC (rev 550)
@@ -25,11 +25,15 @@
         $this->query = $query;
         $this->sg    = $engine->getSqlGenerator();
         $strResultForm = $query->getResultForm();
+        
+        foreach ($this->getResultVars() as $var)
+        	$ResultVarsTemp[] = substr($var,1);
+        
         switch ($strResultForm) {
             case 'select':
             case 'select distinct':
                 $results = $this->createFromRecords($arRecordSets, $strResultForm);
-				$strCode = json_encode(array('head' => array('vars'=>$this->getResultVars()),'results'=>array('bindings'=>$results)));
+				$strCode = json_encode(array('head' => array('vars'=>$ResultVarsTemp),'results'=>array('bindings'=>$results)));
 				//$strCode = str_replace(',{',','.PHP_EOL.'{',$strCode);
                 break;
 			case 'construct':
@@ -87,7 +91,7 @@
 			foreach ($arResultVars as $ResultVar) {
 				$nodeType = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_is']];
 				if ($type == 'r' || $type === null ) {
-					$node[$ResultVar] = array('type'=> 'uri','value'=>$value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_value']]);
+					$node[substr($ResultVar,1)] = array('type'=> 'uri','value'=>$value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_value']]);
 					
 				}
 				
@@ -95,7 +99,7 @@
 					$literalType = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_type']];
 					$literalLang = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_lang']];
 					$literalValue = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_value']];
-					$node[$ResultVar] = $this->getLiteral($literalValue,$literalLang,$literalType);
+					$node[substr($ResultVar,1)] = $this->getLiteral($literalValue,$literalLang,$literalType);
 				}
 			}
 			$results[]=$node;
@@ -144,6 +148,11 @@
 		$arResultVars = $this->query->getResultVars();
 		if (in_array('*', $arResultVars)) {
 			$arResultVars   = array_keys($this->sg->arVarAssignments);
+		} else {
+			$arResultVars = array();
+			foreach ($this->query->getResultVars() as $Var) {
+				$arResultVars[] = (string) $Var;
+			}
 		}
 		
 		return $arResultVars;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [549] trunk/rdfapi-php/api/sparql/SparqlEngineDb/ ResultRenderer/XML.php

From: <fu...@us...> - 2007-11-15 13:29:06

Revision: 549
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=549&view=rev
Author:   fusel2k
Date:     2007-11-15 05:29:04 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
[fix] removed leading char ? or $ from Variable Identifier in Ouput to meet the W3 Standard http://www.w3.org/TR/rdf-sparql-XMLres/
[fix] changed ouput of empty results (the same as if there were results except <results> <results/> is empty now, only containing an short comment.

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/XML.php

Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/XML.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/XML.php	2007-11-15 10:20:18 UTC (rev 548)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/XML.php	2007-11-15 13:29:04 UTC (rev 549)
@@ -126,22 +126,28 @@
         if (in_array('*', $arResultVars)) {
             $arResultVars   = array_keys($this->sg->arVarAssignments);
         }
+		
+        foreach ($arResultVars as $var) {
+        	$strVarXML = "    <variable name=\"" . substr((string)$var,1) . "\"/>\n";
+        }
+        
+        $strHeadXml = $this->getHead($strVarXML);
 
-        $strHeadXml = $this->getHead(
-            "    <variable name=\""
-            . implode(
-                "\"/>\n    <variable name=\"",
-                $arResultVars
-            )
-            . "\"/>\n"
-        );
-
         $arResult = array();
         foreach ($arRecordSets as $dbRecordSet) {
             //work around bug in adodb:
             // ADORecordSet_empty does not implement php5 iterators
             if ($dbRecordSet->RowCount() <= 0) {
-                return array();
+                
+            	return 
+            		$strHeadXml
+            		. '  <results ordered="'
+                	. self::getSpokenBoolean($arSM['order by'] !== null)
+					. '" distinct="'
+                	. self::getSpokenBoolean($strResultForm == 'select distinct')
+                	. '">' . "\n"
+            		. '    <!-- empty result -->' . PHP_EOL 
+            		. "  </results>\n";
             }
 
             foreach ($dbRecordSet as $row) {
@@ -184,7 +190,7 @@
             $strCode .= "    <result>\n";
             foreach ($arSet as $strVarName => $strValue) {
                 if ($strValue !== null) {
-                    $strCode .= '      <binding name="' . $strVarName . '">'
+                    $strCode .= '      <binding name="' . substr($strVarName,1) . '">'
                         . $strValue
                         . "</binding>\n";
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [548] trunk/rdfapi-php/api/sparql/Query.php

From: <fu...@us...> - 2007-11-15 10:20:22

Revision: 548
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=548&view=rev
Author:   fusel2k
Date:     2007-11-15 02:20:18 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
[fix] parse() now stores multiple 'FROM'-Parts in an array not only multiple 'FROM NAMED'-Parts

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/Query.php

Modified: trunk/rdfapi-php/api/sparql/Query.php
===================================================================
--- trunk/rdfapi-php/api/sparql/Query.php	2007-11-14 09:45:39 UTC (rev 547)
+++ trunk/rdfapi-php/api/sparql/Query.php	2007-11-15 10:20:18 UTC (rev 548)
@@ -5,8 +5,8 @@
 * The Class Query represents a SPARQL query.
 *
 *
-* @author   Tobias Gauss <tob...@we...>
-* @version     $Id$
+* @author  Tobias Gauss <tob...@we...>
+* @version $Id$
 * @license http://www.gnu.org/licenses/lgpl.html LGPL
 *
 * @package sparql
@@ -184,6 +184,7 @@
     public function getPrefixes(){
         return $this->prefixes;
     }
+    
     /**
     * Returns a list containing the result vars.
     *
@@ -351,7 +352,7 @@
     * @return void
     */
     public function addFrom($graphURI){
-        $this->fromPart = $graphURI;
+        $this->fromPart[] = $graphURI;
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [547] trunk/rdfapi-php

From: <p_f...@us...> - 2007-11-14 09:45:43

Revision: 547
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=547&view=rev
Author:   p_frischmuth
Date:     2007-11-14 01:45:39 -0800 (Wed, 14 Nov 2007)

Log Message:
-----------
[added] initial version of a json parser
[added] loadFromString method in Model class, in order to easily load statements from strings (yet only json is supported)
[added] test class for new json parser and initial test routine
[modified] added constant PACKAGE_SYNTAX_JSON to constants.php
[added] SyntaxJSON package in order to load json parser dynamically
[propset] added svn:keywords for new file (Id)

Modified Paths:
--------------
    trunk/rdfapi-php/api/constants.php
    trunk/rdfapi-php/api/model/Model.php

Added Paths:
-----------
    trunk/rdfapi-php/api/syntax/JsonParser.php
    trunk/rdfapi-php/api/syntax/SyntaxJSON.php
    trunk/rdfapi-php/test/unit/Syntax/jsonParser_test.php

Modified: trunk/rdfapi-php/api/constants.php
===================================================================
--- trunk/rdfapi-php/api/constants.php	2007-11-06 14:26:06 UTC (rev 546)
+++ trunk/rdfapi-php/api/constants.php	2007-11-14 09:45:39 UTC (rev 547)
@@ -31,6 +31,7 @@
 define('PACKAGE_DBASE','model/DBase.php');
 define('PACKAGE_SYNTAX_RDF','syntax/SyntaxRDF.php');
 define('PACKAGE_SYNTAX_N3','syntax/SyntaxN3.php');
+define('PACKAGE_SYNTAX_JSON','syntax/SyntaxJSON.php');
 define('PACKAGE_SYNTAX_GRDDL','syntax/SyntaxGRDDL.php');
 define('PACKAGE_VOCABULARY','vocabulary/Vocabulary.php');
 define('PACKAGE_RDQL','rdql/RDQL.php');

Modified: trunk/rdfapi-php/api/model/Model.php
===================================================================
--- trunk/rdfapi-php/api/model/Model.php	2007-11-06 14:26:06 UTC (rev 546)
+++ trunk/rdfapi-php/api/model/Model.php	2007-11-14 09:45:39 UTC (rev 547)
@@ -133,8 +133,27 @@
             $this->setBaseURI($temp->getBaseURI());
     }
 
+	/**
+	 * This method takes a string conatining data and adds the parsed data to this model.
+	 *
+	 * @param string $str The string containing the data to be parsed and loaded.
+	 * @param type $type The type of the string, currently only 'json' is supported.
+	 */
+	function loadFromString($str, $type) {
+		
+		switch ($type) {
+			case 'json':
+				include_once(RDFAPI_INCLUDE_DIR.PACKAGE_SYNTAX_JSON);
+				$parser = new JsonParser();
+				break;
+			default:
+				trigger_error('(class: Model; method: loadFromString): type ' . $type . 'is currently not supported',
+			 			E_USER_ERROR);
+		}
+		
+		$parser->generateModelFromString($str, $this);
+	} 
 
-
     /**
     * Adds a statement from another model to this model.
     * If the statement to be added contains a blankNode with an identifier

Added: trunk/rdfapi-php/api/syntax/JsonParser.php
===================================================================
--- trunk/rdfapi-php/api/syntax/JsonParser.php	                        (rev 0)
+++ trunk/rdfapi-php/api/syntax/JsonParser.php	2007-11-14 09:45:39 UTC (rev 547)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * This class provides capabilities to parse json encoded rdf models.
+ *
+ * @package syntax
+ * @author Philipp Frischmuth <ph...@fr...>
+ * @version $Id$
+ */
+class JsonParser extends Object {
+	
+	/**
+	 * This method takes a json encoded rdf-model and a reference to aa (usually empty) MemModel, parses the json
+	 * string and adds the statements to the given MemModel.
+	 *
+	 * @param string $jsonString The string that contains the rdf model, encoded as a json-string.
+	 * @param MemModel $model A reference to the model, where to add the statements, usually an empty MemModel.
+	 */
+	public function generateModelFromString($jsonString, $model) {
+		
+		$jsonModel = array();
+		$jsonModel = json_decode($jsonString, true);
+
+		// throws an excpetion if json model was corrupt
+		if (!is_array($jsonModel)) {
+			throw new Exception('error in json string');
+		}
+		
+		foreach ($jsonModel as $subject=>$remain) {
+			foreach ($remain as $predicate=>$object) {
+				$s = (strpos($subject, '_') === 0) ? new BlankNode(substr($subject, 2)) : new Resource($subject);
+				$p = new Resource($predicate);
+				
+				foreach ($object as $obj) {
+					if ($obj['type'] === 'uri') {
+						$o = new Resource($obj['value']);
+					} else if ($obj['type'] === 'bnode') {
+						$o = new BlankNode(substr($obj['value'], 2));
+					} else {
+						$dtype = (isset($obj['datatype'])) ? $obj['datatype'] : '';
+						$lang = (isset($obj['lang'])) ? $obj['lang'] : '';
+
+						$o = new Literal($obj['value'], $lang);
+						$o->setDatatype($dtype);
+					}
+					
+					$model->add(new Statement($s, $p, $o));
+				}
+			}
+		}
+	}
+}
+?>


Property changes on: trunk/rdfapi-php/api/syntax/JsonParser.php
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/rdfapi-php/api/syntax/SyntaxJSON.php
===================================================================
--- trunk/rdfapi-php/api/syntax/SyntaxJSON.php	                        (rev 0)
+++ trunk/rdfapi-php/api/syntax/SyntaxJSON.php	2007-11-14 09:45:39 UTC (rev 547)
@@ -0,0 +1,5 @@
+<?php
+// Include Syntax classes
+// $Id$
+require_once( RDFAPI_INCLUDE_DIR . 'syntax/JsonParser.php' );
+?>
\ No newline at end of file


Property changes on: trunk/rdfapi-php/api/syntax/SyntaxJSON.php
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/rdfapi-php/test/unit/Syntax/jsonParser_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Syntax/jsonParser_test.php	                        (rev 0)
+++ trunk/rdfapi-php/test/unit/Syntax/jsonParser_test.php	2007-11-14 09:45:39 UTC (rev 547)
@@ -0,0 +1,119 @@
+<?php
+require_once RDFAPI_INCLUDE_DIR.PACKAGE_SYNTAX_JSON;
+/**
+ * Tests the JsonParser
+ *
+ * @version  $Id $
+ * @author Philipp Frischmuth <ph...@fr...>
+ *
+ * @package unittests
+ * @access	public
+ */
+
+class testJsonParser extends UnitTestCase
+{
+	var $modelString;
+	
+	function testJsonParser() {
+		$this->UnitTestCase();
+		
+		GLOBAL $short_datatype;
+		
+		$this->modelString = '{ "http://example.org/about" : { 
+								"http://purl.org/dc/elements/1.1/creator" : [ 
+								 	{ 
+									"value" : "Anna Wilder", 
+									"type" : "literal" 
+								 	}
+							 	],
+			    				"http://purl.org/dc/elements/1.1/title" : [ 
+									{ 
+									"value" : "Annas Homepage", 
+									"type" : "literal", 
+									"lang" : "en" 
+									} 
+								],
+			    				"http://xmlns.com/foaf/0.1/maker" : [
+			 						{ 
+									"value" : "_:person", 
+									"type" : "bnode" 
+									} 
+								],
+								"http://purl.org/dc/elements/1.1/title2" : [
+									{
+									"value" : "Anns HP",
+									"type" : "literal",
+									"lang" : "en",
+									"datatype" : "' . $short_datatype['STRING'] . '"
+									}
+								]
+			  				},
+			  				"_:person" : {
+			    				"http://xmlns.com/foaf/0.1/homepage" : [ 
+									{ 
+									"value" : "http://example.org/about",
+									"type" : "uri" 
+									} 
+								]
+			  				}}';
+	}
+
+	function testGenerateModelFromString() {
+		
+		$parser = new JsonParser();
+		$model = new MemModel('http://example.com/');
+		
+		try {
+			$parser->generateModelFromString($this->modelString, $model);
+		} catch (Exception $e) {
+			$this->fail($e->getMessage());
+		}
+		
+		GLOBAL $short_datatype;
+		$model2 = new MemModel('http://example.com/');
+
+        // Ceate new statements and add them to the model
+        $statement1 = new Statement(new Resource('http://example.org/about'),
+                                    new Resource('http://purl.org/dc/elements/1.1/creator'),
+                                    new Literal('Anna Wilder'));
+
+        $statement2 = new Statement(new Resource('http://example.org/about'),
+                                    new Resource("http://purl.org/dc/elements/1.1/title"),
+                                    new Literal('Annas Homepage', 'en'));
+
+        $statement3 = new Statement(new Resource('http://example.org/about'),
+                                    new Resource('http://xmlns.com/foaf/0.1/maker'),
+                                    new BlankNode('person'));
+
+        $statement4 = new Statement(new BlankNode('person'),
+                                    new Resource("http://xmlns.com/foaf/0.1/homepage"),
+                                    new Resource('http://example.org/about'));
+
+		$statement5 = new Statement(new Resource('http://example.org/about'),
+		                            new Resource("http://purl.org/dc/elements/1.1/title2"),
+		                            new Literal('Anns HP', 'en', $short_datatype['STRING']));
+		
+		$statement6 = new Statement(new Resource('http://example.org/about'),
+		              				new Resource("http://purl.org/dc/elements/1.1/title2"),
+		              				new Literal('Anns HP', 'en', $short_datatype['INTEGER']));
+
+
+        $model2->add($statement1);
+        $model2->add($statement2);
+        $model2->add($statement3);
+        $model2->add($statement4);
+		$model2->add($statement5);
+		
+		$this->assertTrue($model->containsAll($model2));
+		
+		$model2->remove($statement5);
+		$model2->add($statement6);
+		
+		$this->assertFalse($model->containsAll($model2));
+
+#echo "<pre>";
+#print_r($model2);
+#echo "</pre>";
+	}
+}
+?>


Property changes on: trunk/rdfapi-php/test/unit/Syntax/jsonParser_test.php
___________________________________________________________________
Name: svn:keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [546] trunk/rdfapi-php/api/sparql/SparqlEngineDb/ ResultRenderer/JSON.php

From: <fu...@us...> - 2007-11-06 14:26:14

Revision: 546
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=546&view=rev
Author:   fusel2k
Date:     2007-11-06 06:26:06 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
[create] JSON result renderer roughly following http://www.w3.org/2001/sw/DataAccess/json-sparql/

Added Paths:
-----------
    trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php

Added: trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php	                        (rev 0)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultRenderer/JSON.php	2007-11-06 14:26:06 UTC (rev 546)
@@ -0,0 +1,154 @@
+<?php
+require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngineDb/ResultRenderer.php';
+
+/**
+*   Sparql DB JSON Renderer. Roughly follows http://www.w3.org/2001/sw/DataAccess/json-sparql/;
+*
+*   @author Christoph Rie\xDF
+*   @license http://www.gnu.org/licenses/lgpl.html LGPL
+*
+*   @package sparql
+*/
+class SparqlEngineDb_ResultRenderer_JSON implements SparqlEngineDb_ResultRenderer
+{
+
+    /**
+    *   Converts the database results into JSON Format
+    *
+    *   @param array $arRecordSets  Array of (possibly several) SQL query results.
+    *   @param Query $query     SPARQL query object
+    *   @param SparqlEngineDb $engine   Sparql Engine to query the database
+    *   @return mixed   HTML code
+    */
+    public function convertFromDbResults($arRecordSets, Query $query, SparqlEngineDb $engine) {
+    	
+        $this->query = $query;
+        $this->sg    = $engine->getSqlGenerator();
+        $strResultForm = $query->getResultForm();
+        switch ($strResultForm) {
+            case 'select':
+            case 'select distinct':
+                $results = $this->createFromRecords($arRecordSets, $strResultForm);
+				$strCode = json_encode(array('head' => array('vars'=>$this->getResultVars()),'results'=>array('bindings'=>$results)));
+				//$strCode = str_replace(',{',','.PHP_EOL.'{',$strCode);
+                break;
+			case 'construct':
+            case 'describe':
+                throw new Exception(
+                    'Construct and describe are not supported by the'
+                    . ' JSON renderer'
+                );
+
+            case 'count':
+            case 'ask':
+                if (count($arRecordSets) > 1) {
+                    throw new Exception(
+                        'More than one result set for a '
+                        . $strResultForm . ' query not supported by JSON Renderer'
+                    );
+                }
+
+                $nCount = 0;
+                $dbRecordSet = reset($arRecordSets);
+                foreach ($dbRecordSet as $row) {
+                    $nCount += intval($row['count']);
+                    break;
+                }
+
+                if ($strResultForm == 'ask') {
+                    $strcode = json_encode(array('boolean' => ($nCount > 0)));
+                } else {
+                    $strcode = json_encode(array('int' => $nCount ));
+                }
+                break;
+            default:
+            	throw new Exception('Error');
+        }
+        
+        return $strCode;
+        
+
+    }
+    /**
+     * Method to create from record with specific resultform (not used yet)
+     *
+     * @param array $arRecordSets  Array of (possibly several) SQL query results.
+     * @param unknown_type $strResultForm
+     * @return array ready for json conversion
+     */
+	protected function createFromRecords($arRecordSets, $strResultForm) {
+		
+		$arVarAssignments = $this->sg->arVarAssignments;
+		$code = '';
+		$arResultVars = $this ->getResultVars();
+		$results = array();
+		foreach ($arRecordSets[0] as $value) {
+			$node = array();
+			foreach ($arResultVars as $ResultVar) {
+				$nodeType = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_is']];
+				if ($type == 'r' || $type === null ) {
+					$node[$ResultVar] = array('type'=> 'uri','value'=>$value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_value']]);
+					
+				}
+				
+				if ($value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_is']] == 'l') {
+					$literalType = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_type']];
+					$literalLang = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_lang']];
+					$literalValue = $value[$arVarAssignments[$ResultVar][0].'.'.$arVarAssignments[$ResultVar]['sql_value']];
+					$node[$ResultVar] = $this->getLiteral($literalValue,$literalLang,$literalType);
+				}
+			}
+			$results[]=$node;
+			
+			
+		}
+		return $results;
+
+	}
+	
+	/**
+	 * COnverting Literals to array ready for json
+	 *
+	 * @param unknown_type $value
+	 * @param unknown_type $lang
+	 * @param unknown_type $type
+	 * @return unknown
+	 */
+	private function getLiteral($value, $lang , $type) {
+		
+		$ret = array();
+		
+		$type = 'literal';
+		
+		if ($value != 'literal') {
+			$ret['value'] = $value;
+		}
+		
+		if ($lang != '') {
+			$ret['lang'] = $lang;
+		}
+		
+		if ($type != '') {
+			$ret['type'] = $type; 
+		}
+		
+		return $ret;
+	}
+	
+	/**
+	 * Giving array of used Vars also resolves the all-quantifier *
+	 *
+	 * @return array of vars as strings
+	 */
+	protected function getResultVars() {
+		$arResultVars = $this->query->getResultVars();
+		if (in_array('*', $arResultVars)) {
+			$arResultVars   = array_keys($this->sg->arVarAssignments);
+		}
+		
+		return $arResultVars;
+	}
+
+}
+
+?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [545] trunk/rdfapi-php

From: <cw...@us...> - 2007-10-10 17:41:16

Revision: 545
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=545&view=rev
Author:   cweiske
Date:     2007-10-10 10:41:15 -0700 (Wed, 10 Oct 2007)

Log Message:
-----------
- Support MySQLi (link to MySQL methods)
- Fix wrong cAsE in database drivers

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbStore.php
    trunk/rdfapi-php/test/setup.php

Modified: trunk/rdfapi-php/api/model/DbStore.php
===================================================================
--- trunk/rdfapi-php/api/model/DbStore.php	2007-10-09 16:24:08 UTC (rev 544)
+++ trunk/rdfapi-php/api/model/DbStore.php	2007-10-10 17:41:15 UTC (rev 545)
@@ -35,6 +35,7 @@
     */
     public static $arSupportedDbTypes = array(
         "MySQL",
+        "MySQLi",
         "MSSQL",
         'MsAccess'
     );
@@ -453,6 +454,16 @@
 
 
     /**
+    * Creates tables on a MySQLi database
+    */
+    function _createTables_MySQLi()
+    {
+        return $this->_createTables_MySQL();
+    }//function _createTables_MySQLi()
+
+
+
+    /**
     * Create tables and indexes for MSSQL database
     *
     * @return boolean true If all is ok
@@ -481,7 +492,7 @@
                                     ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]");
 
 
-            $this->dbConn->execute("CREATE TABLE [dbo].[namespaces] (
+        $this->dbConn->execute("CREATE TABLE [dbo].[namespaces] (
                                     [modelID] [int] NOT NULL ,
                                     [namespace] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
                                     [prefix] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
@@ -532,9 +543,11 @@
     * You can pass NULL or omit the parameter to
     *  use the parameter from the dbstore constructor
     *
-    * @return string Database driver string
+    * @param string $databaseType Database driver name (e.g. MySQL)
+    *
+    * @return string Database driver string (e.g. MySQL)
     */
-    protected function getDriver($databaseType = null)
+    public function getDriver($databaseType = null)
     {
         if ($databaseType === null) {
             if ($this->driver === null) {
@@ -544,12 +557,32 @@
                 $databaseType = $this->driver;
             }
         }
+        if (!self::isDriverSupported($databaseType)) {
+            //check if it is a known driver in wrong case
+            $arLowercases = array_map('strtolower', self::$arSupportedDbTypes);
+            $arMapping    = array_combine($arLowercases, self::$arSupportedDbTypes);
+            if (isset($arMapping[strtolower($databaseType)])) {
+                $databaseType = $arMapping[strtolower($databaseType)];
+            }
+        }
         return $databaseType;
-    }//protected function getDriver($databaseType = null)
+    }//public function getDriver($databaseType = null)
 
 
 
     /**
+    * Returns if the given driver is supported
+    *
+    * @return boolean True if it supported, false if not
+    */
+    public static function isDriverSupported($databaseType)
+    {
+        return in_array($databaseType, self::$arSupportedDbTypes);
+    }//public static function isDriverSupported($databaseType)
+
+
+
+    /**
     * Checks if the given driver is supported and throws an
     * Exception if not.
     *
@@ -561,7 +594,7 @@
     */
     public static function assertDriverSupported($databaseType)
     {
-        if (!in_array($databaseType, self::$arSupportedDbTypes)) {
+        if (!self::isDriverSupported($databaseType)) {
             throw new Exception(
                 'Unsupported database type, only supported: '
                 . implode(', ', self::$arSupportedDbTypes)
@@ -572,69 +605,99 @@
 
 
 
- /**
-  * Checks if tables are setup for RAP (MySql)
-  *
-  * @throws SqlError
-  * @access private
-  **/
- function _isSetup_MySql() {
-   $recordSet =& $this->dbConn->execute("SHOW TABLES");
-   if (!$recordSet)
-     echo $this->dbConn->errorMsg();
-   else {
-     $tables = array();
-     while (!$recordSet->EOF) {
+    /**
+    * Checks if tables are setup for RAP (MySql)
+    *
+    * @throws SqlError
+    * @access private
+    **/
+    function _isSetup_MySQL()
+    {
+        $recordSet =& $this->dbConn->execute("SHOW TABLES");
+        if (!$recordSet) {
+            throw new Exception($this->dbConn->errorMsg());
+        } else {
+            $tables = array();
+            while (!$recordSet->EOF) {
+                $tables[]= $recordSet->fields[0];
+                if (isset($i)) {
+                    ++$i;
+                }
+                $recordSet->moveNext();
+            }
+            if (in_array("models",$tables) && in_array("statements",$tables)
+             && in_array("namespaces",$tables)) {
+                return true;
+            }
+        }
+        return false;
+    }//function _isSetup_MySQL()
 
-       $tables[]= $recordSet->fields[0];
 
-       if(isset($i)){++$i;}
-       $recordSet->moveNext();
-     }
-     if (in_array("models",$tables) && in_array("statements",$tables)&& in_array("namespaces",$tables)) return true;
-   }
-   return false;
 
- }
+    /**
+    * Checks if tables are setup for RAP (MySQLi)
+    *
+    * @see _isSetup_MySQL()
+    */
+    function _isSetup_MySQLi()
+    {
+        return $this->_isSetup_MySQL();
+    }//function _isSetup_MySQLi()
 
 
-  /**
-  * Checks if tables are setup for RAP (MsAccess)
-  *
-  * @throws SqlError
-  * @access private
-  **/
- function _isSetup_MsAccess() {
-   	$tables =& $this->dbConn->MetaTables();
-   	if (!$tables)
-     echo $this->dbConn->errorMsg();
-   if (count($tables)==0){
-     return false;}
-   else {
-   		if (in_array("models",$tables) && in_array("statements",$tables) && in_array("namespaces",$tables)){ return true;
-   		}else{return false;}
-   }
- }
 
-  /**
-  * Checks if tables are setup for RAP (MSSQL)
-  *
-  * @throws SqlError
-  * @access private
-  **/
- function _isSetup_MSSQL() {
-   	$tables =& $this->dbConn->MetaTables();
-   	if (!$tables)
-     echo $this->dbConn->errorMsg();
-   if (count($tables)==0){
-     return false;}
-   else {
-   		if (in_array("models",$tables) && in_array("statements",$tables) && in_array("namespaces",$tables)){ return true;
-   		}else{return false;}
-   }
- }
+    /**
+    * Checks if tables are setup for RAP (MsAccess)
+    *
+    * @throws SqlError
+    * @access private
+    **/
+    function _isSetup_MsAccess()
+    {
+        $tables =& $this->dbConn->MetaTables();
+        if (!$tables) {
+            throw new Exception($this->dbConn->errorMsg());
+        }
+        if (count($tables) == 0) {
+            return false;
+        } else {
+            if (in_array("models",$tables) && in_array("statements",$tables)
+             && in_array("namespaces",$tables)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }//function _isSetup_MsAccess()
 
 
+
+    /**
+    * Checks if tables are setup for RAP (MSSQL)
+    *
+    * @throws SqlError
+    * @access private
+    **/
+    function _isSetup_MSSQL()
+    {
+        $tables =& $this->dbConn->MetaTables();
+        if (!$tables) {
+            throw new Exception($this->dbConn->errorMsg());
+        }
+        if (count($tables) == 0) {
+            return false;
+        } else {
+            if (in_array("models",$tables) && in_array("statements",$tables)
+             && in_array("namespaces",$tables)){
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }//function _isSetup_MSSQL()
+
+
  /**
  * Create a new instance of DatasetDb with the given $datasetName
  * and insert the DatasetDb variables into the database.

Modified: trunk/rdfapi-php/test/setup.php
===================================================================
--- trunk/rdfapi-php/test/setup.php	2007-10-09 16:24:08 UTC (rev 544)
+++ trunk/rdfapi-php/test/setup.php	2007-10-10 17:41:15 UTC (rev 545)
@@ -13,7 +13,8 @@
 require_once RDFAPI_INCLUDE_DIR . '/model/ModelFactory.php';
 
 try {
-    DbStore::assertDriverSupported($GLOBALS['dbConf']['type']);
+    $type = DbStore::getDriver($GLOBALS['dbConf']['type']);
+    DbStore::assertDriverSupported($type);
 } catch (Exception $e) {
     echo "Error: " . $e->getMessage() . "\n";
     echo "Be sure to write the driver type in the same cAsE\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [544] trunk/rdfapi-php/test/unit

From: <cw...@us...> - 2007-10-09 16:24:13

Revision: 544
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=544&view=rev
Author:   cweiske
Date:     2007-10-09 09:24:08 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
Update readme, don't be verbose on testing when debugging is not enabled

Modified Paths:
--------------
    trunk/rdfapi-php/test/unit/README.txt
    trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
    trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php
    trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php
    trunk/rdfapi-php/test/unit/runAnyTest.php

Modified: trunk/rdfapi-php/test/unit/README.txt
===================================================================
--- trunk/rdfapi-php/test/unit/README.txt	2007-10-09 16:01:43 UTC (rev 543)
+++ trunk/rdfapi-php/test/unit/README.txt	2007-10-09 16:24:08 UTC (rev 544)
@@ -7,19 +7,32 @@
 The test use the "Simple Test" testing framework, which is
 similar to JUnit.
 
-For running the tests you have to 
+For running the tests you have to
 
 1. Install the "Simple Test" testing framework
-   into the document root of your web server. 
+   into the document root of your web server.
    Simple test can be downloaded from:
-   http://sourceforge.net/projects/simpletest/ 
+   http://sourceforge.net/projects/simpletest/
 
-2. Now copy the "unit" folder to /rdfapi/test/
- 
-3. Make sure that "simple Test" and RAP is included correctly in 
+2. Copy the simpletest folder to the right location so that
+    your directory layout is the following:
+   /some/root/path/
+                   rdfapi-php/
+                              api/
+                              doc/
+                              netapi/
+                              test/
+                              tools/
+                   simpletest/
+                              simpletest.php
+
+3. Make sure that "simple Test" and RAP is included correctly in
    allTest.php and in
-   showPasses.php 
+   showPasses.php
 
 4. To run the tests execute allTest.php
-   
-In allTest.php you can also comment out all tests that you do not want to execute. 
+
+In allTest.php you can also comment out all tests that you do not want to execute.
+
+To run single test files, use runAnyTest.php:
+ php runAnyTest.php Syntax/n3Parser_test.php

Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php	2007-10-09 16:01:43 UTC (rev 543)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php	2007-10-09 16:24:08 UTC (rev 544)
@@ -149,7 +149,7 @@
                     //normal query failed to be parsed
                     $this->assertTrue(false, 'Query failed to be parsed');
                     if (!isset($GLOBALS['debugTests'])) {
-                        echo '  ' . $title . "\n";
+                        //echo '  ' . $title . "\n";
                     } else {
                         echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
                         if (isset($e)) {
@@ -182,7 +182,7 @@
 
                 if (!$bOk) {
                     if (!isset($GLOBALS['debugTests'])) {
-                        echo '  ' . $title . "\n";
+                        //echo '  ' . $title . "\n";
                     } else {
                         echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
                         if ($e != null) {

Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php	2007-10-09 16:01:43 UTC (rev 543)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php	2007-10-09 16:24:08 UTC (rev 544)
@@ -157,7 +157,9 @@
         $parser = new SparqlParser();
 
         foreach ($_SESSION['sparql_dawg2_tests'] as $test) {
-echo $test['title'] . "\n";
+            if (isset($GLOBALS['debugTests']) && $GLOBALS['debugTests']) {
+                echo $test['title'] . "\n";
+            }
             //use syntax tests only
             if (!isset($test['type']) ||
                 ($test['type'] != 'syntax-positive' &&
@@ -190,7 +192,6 @@
     */
     protected function runQueryParseTest($strQuery, $parser, $strType, $title)
     {
-//echo $title . "\n";
         $bException = false;
         try {
             $parser->parse($strQuery);
@@ -207,9 +208,7 @@
         }
 
         if (!$bOk) {
-            if (!isset($GLOBALS['debugTests'])) {
-                echo '  ' . $title . "\n";
-            } else {
+            if (isset($GLOBALS['debugTests']) && $GLOBALS['debugTests']) {
                 echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
                 if (isset($e)) {
                     echo $e->getMessage() . "\n";

Modified: trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php	2007-10-09 16:01:43 UTC (rev 543)
+++ trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php	2007-10-09 16:24:08 UTC (rev 544)
@@ -1,209 +1,225 @@
 <?php
 /**
-* automatically created by create-dawg2.php on 2007-08-13 16:53
+* automatically created by create-dawg2.php on 2007-10-09 18:11
 */
 $_SESSION['sparql_dawg2_tests'] = array (
   0 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#spoo-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#bgp-no-match',
+    'title' => 'Non-matching triple pattern',
+    'data' => 'w3c-dawg2/data-r2/basic/data-7.ttl',
+    'query' => 'w3c-dawg2/data-r2/basic/bgp-no-match.rq',
+    'result' => 'w3c-dawg2/data-r2/basic/bgp-no-match.srx',
+  ),
+  1 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#prefix-name-1',
+    'title' => 'Prefix name 1',
+    'data' => 'w3c-dawg2/data-r2/basic/data-6.ttl',
+    'query' => 'w3c-dawg2/data-r2/basic/prefix-name-1.rq',
+    'result' => 'w3c-dawg2/data-r2/basic/prefix-name-1.srx',
+  ),
+  2 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#spoo-1',
     'title' => 'Basic graph pattern - spoo',
     'data' => 'w3c-dawg2/data-r2/basic/data-6.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/spoo-1.rq',
     'result' => 'w3c-dawg2/data-r2/basic/spoo-1.srx',
   ),
-  1 => 
+  3 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#base-prefix-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#base-prefix-1',
     'title' => 'Basic - Prefix/Base 1',
     'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/base-prefix-1.rq',
     'result' => 'w3c-dawg2/data-r2/basic/base-prefix-1.srx',
   ),
-  2 => 
+  4 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#base-prefix-2',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#base-prefix-2',
     'title' => 'Basic - Prefix/Base 2',
     'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/base-prefix-2.rq',
     'result' => 'w3c-dawg2/data-r2/basic/base-prefix-2.srx',
   ),
-  3 => 
+  5 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#base-prefix-3',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#base-prefix-3',
     'title' => 'Basic - Prefix/Base 3',
     'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/base-prefix-3.rq',
     'result' => 'w3c-dawg2/data-r2/basic/base-prefix-3.srx',
   ),
-  4 => 
+  6 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#base-prefix-4',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#base-prefix-4',
     'title' => 'Basic - Prefix/Base 4',
     'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/base-prefix-4.rq',
     'result' => 'w3c-dawg2/data-r2/basic/base-prefix-4.srx',
   ),
-  5 => 
+  7 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#base-prefix-5',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#base-prefix-5',
     'title' => 'Basic - Prefix/Base 5',
     'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/base-prefix-5.rq',
     'result' => 'w3c-dawg2/data-r2/basic/base-prefix-5.srx',
   ),
-  6 => 
+  8 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#list-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#list-1',
     'title' => 'Basic - List 1',
     'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/list-1.rq',
     'result' => 'w3c-dawg2/data-r2/basic/list-1.srx',
   ),
-  7 => 
+  9 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#list-2',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#list-2',
     'title' => 'Basic - List 2',
     'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/list-2.rq',
     'result' => 'w3c-dawg2/data-r2/basic/list-2.srx',
   ),
-  8 => 
+  10 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#list-3',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#list-3',
     'title' => 'Basic - List 3',
     'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/list-3.rq',
     'result' => 'w3c-dawg2/data-r2/basic/list-3.srx',
   ),
-  9 => 
+  11 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#list-4',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#list-4',
     'title' => 'Basic - List 4',
     'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/list-4.rq',
     'result' => 'w3c-dawg2/data-r2/basic/list-4.srx',
   ),
-  10 => 
+  12 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#quotes-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#quotes-1',
     'title' => 'Basic - Quotes 1',
     'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/quotes-1.rq',
     'result' => 'w3c-dawg2/data-r2/basic/quotes-1.srx',
   ),
-  11 => 
+  13 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#quotes-2',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#quotes-2',
     'title' => 'Basic - Quotes 2',
     'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/quotes-2.rq',
     'result' => 'w3c-dawg2/data-r2/basic/quotes-2.srx',
   ),
-  12 => 
+  14 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#quotes-3',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#quotes-3',
     'title' => 'Basic - Quotes 3',
     'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/quotes-3.rq',
     'result' => 'w3c-dawg2/data-r2/basic/quotes-3.srx',
   ),
-  13 => 
+  15 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#quotes-4',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#quotes-4',
     'title' => 'Basic - Quotes 4',
     'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/quotes-4.rq',
     'result' => 'w3c-dawg2/data-r2/basic/quotes-4.srx',
   ),
-  14 => 
+  16 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-1',
     'title' => 'Basic - Term 1',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-1.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-1.srx',
   ),
-  15 => 
+  17 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-2',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-2',
     'title' => 'Basic - Term 2',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-2.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-2.srx',
   ),
-  16 => 
+  18 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-3',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-3',
     'title' => 'Basic - Term 3',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-3.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-3.srx',
   ),
-  17 => 
+  19 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-4',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-4',
     'title' => 'Basic - Term 4',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-4.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-4.srx',
   ),
-  18 => 
+  20 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-5',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-5',
     'title' => 'Basic - Term 5',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-5.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-5.srx',
   ),
-  19 => 
+  21 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-6',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-6',
     'title' => 'Basic - Term 6',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-6.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-6.srx',
   ),
-  20 => 
+  22 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-7',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-7',
     'title' => 'Basic - Term 7',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-7.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-7.srx',
   ),
-  21 => 
+  23 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-8',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-8',
     'title' => 'Basic - Term 8',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-8.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-8.srx',
   ),
-  22 => 
+  24 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#term-9',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-9',
     'title' => 'Basic - Term 9',
     'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/term-9.rq',
     'result' => 'w3c-dawg2/data-r2/basic/term-9.srx',
   ),
-  23 => 
+  25 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#var-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#var-1',
     'title' => 'Basic - Var 1',
     'data' => 'w3c-dawg2/data-r2/basic/data-5.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/var-1.rq',
     'result' => 'w3c-dawg2/data-r2/basic/var-1.srx',
   ),
-  24 => 
+  26 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest.ttl#var-2',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#var-2',
     'title' => 'Basic - Var 2',
     'data' => 'w3c-dawg2/data-r2/basic/data-5.ttl',
     'query' => 'w3c-dawg2/data-r2/basic/var-2.rq',
     'result' => 'w3c-dawg2/data-r2/basic/var-2.srx',
   ),
-  25 => 
+  27 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/triple-match/manifest#dawg-triple-pattern-001',
     'title' => 'dawg-triple-pattern-001',
@@ -211,7 +227,7 @@
     'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-01.rq',
     'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-01.ttl',
   ),
-  26 => 
+  28 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/triple-match/manifest#dawg-triple-pattern-002',
     'title' => 'dawg-triple-pattern-002',
@@ -219,7 +235,7 @@
     'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-02.rq',
     'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-02.ttl',
   ),
-  27 => 
+  29 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/triple-match/manifest#dawg-triple-pattern-003',
     'title' => 'dawg-triple-pattern-003',
@@ -227,7 +243,7 @@
     'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-03.rq',
     'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-03.ttl',
   ),
-  28 => 
+  30 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/triple-match/manifest#dawg-triple-pattern-004',
     'title' => 'dawg-triple-pattern-004',
@@ -235,7 +251,7 @@
     'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-04.rq',
     'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-04.ttl',
   ),
-  29 => 
+  31 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-01',
     'title' => 'open-eq-01',
@@ -243,7 +259,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-01.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-01-result.srx',
   ),
-  30 => 
+  32 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-02',
     'title' => 'open-eq-02',
@@ -251,7 +267,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-02.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-02-result.srx',
   ),
-  31 => 
+  33 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-03',
     'title' => 'open-eq-03',
@@ -259,7 +275,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-03.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-03-result.srx',
   ),
-  32 => 
+  34 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-04',
     'title' => 'open-eq-04',
@@ -267,7 +283,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-04.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-04-result.srx',
   ),
-  33 => 
+  35 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-05',
     'title' => 'open-eq-05',
@@ -275,7 +291,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-05.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-05-result.srx',
   ),
-  34 => 
+  36 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-06',
     'title' => 'open-eq-06',
@@ -283,7 +299,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-06.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-06-result.srx',
   ),
-  35 => 
+  37 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-07',
     'title' => 'open-eq-07',
@@ -291,7 +307,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-07.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-07-result.srx',
   ),
-  36 => 
+  38 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-08',
     'title' => 'open-eq-08',
@@ -299,7 +315,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-08.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-08-result.srx',
   ),
-  37 => 
+  39 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-09',
     'title' => 'open-eq-09',
@@ -307,7 +323,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-09.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-09-result.srx',
   ),
-  38 => 
+  40 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-10',
     'title' => 'open-eq-10',
@@ -315,7 +331,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-10.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-10-result.srx',
   ),
-  39 => 
+  41 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-11',
     'title' => 'open-eq-11',
@@ -323,7 +339,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-11.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-11-result.srx',
   ),
-  40 => 
+  42 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-eq-12',
     'title' => 'open-eq-12',
@@ -331,23 +347,15 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-eq-12.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-eq-12-result.srx',
   ),
-  41 => 
+  43 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-1',
-    'title' => 'date-1',
-    'data' => 'w3c-dawg2/data-r2/open-world/data-3.ttl',
-    'query' => 'w3c-dawg2/data-r2/open-world/date-1.rq',
-    'result' => 'w3c-dawg2/data-r2/open-world/date-1-result.srx',
-  ),
-  42 => 
-  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-2',
     'title' => 'date-2',
     'data' => 'w3c-dawg2/data-r2/open-world/data-3.ttl',
     'query' => 'w3c-dawg2/data-r2/open-world/date-2.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/date-2-result.srx',
   ),
-  43 => 
+  44 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-3',
     'title' => 'date-3',
@@ -355,7 +363,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/date-3.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/date-3-result.srx',
   ),
-  44 => 
+  45 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-4',
     'title' => 'date-4',
@@ -363,7 +371,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/date-4.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/date-4-result.srx',
   ),
-  45 => 
+  46 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-cmp-01',
     'title' => 'open-cmp-01',
@@ -371,7 +379,7 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-cmp-01.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-cmp-01-result.srx',
   ),
-  46 => 
+  47 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#open-cmp-02',
     'title' => 'open-cmp-02',
@@ -379,15 +387,31 @@
     'query' => 'w3c-dawg2/data-r2/open-world/open-cmp-02.rq',
     'result' => 'w3c-dawg2/data-r2/open-world/open-cmp-02-result.srx',
   ),
-  47 => 
+  48 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-1',
+    'title' => 'Join operator with OPTs, BGPs, and UNIONs',
+    'data' => 'w3c-dawg2/data-r2/algebra/join-combo-graph-2.ttl',
+    'query' => 'w3c-dawg2/data-r2/algebra/join-combo-1.rq',
+    'result' => 'w3c-dawg2/data-r2/algebra/join-combo-1.srx',
+  ),
+  49 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-combo-2',
+    'title' => 'Join operator with Graph and Union',
+    'data' => 'w3c-dawg2/data-r2/algebra/join-combo-graph-2.ttl',
+    'query' => 'w3c-dawg2/data-r2/algebra/join-combo-2.rq',
+    'result' => 'w3c-dawg2/data-r2/algebra/join-combo-2.srx',
+  ),
+  50 => 
+  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-1',
     'title' => 'Nested Optionals - 1',
     'data' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.ttl',
     'query' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.srx',
   ),
-  48 => 
+  51 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#nested-opt-2',
     'title' => 'Nested Optionals - 2',
@@ -395,7 +419,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/two-nested-opt-alt.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/two-nested-opt-alt.srx',
   ),
-  49 => 
+  52 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-1',
     'title' => 'Optional-filter - 1',
@@ -403,7 +427,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/opt-filter-1.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/opt-filter-1.srx',
   ),
-  50 => 
+  53 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-2',
     'title' => 'Optional-filter - 2 filters',
@@ -411,7 +435,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/opt-filter-2.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/opt-filter-2.srx',
   ),
-  51 => 
+  54 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#opt-filter-3',
     'title' => 'Optional-filter - scope of variable',
@@ -419,7 +443,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/opt-filter-3.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/opt-filter-3.srx',
   ),
-  52 => 
+  55 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-1',
     'title' => 'Filter-placement - 1',
@@ -427,7 +451,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/filter-placement-1.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/filter-placement-1.srx',
   ),
-  53 => 
+  56 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-2',
     'title' => 'Filter-placement - 2',
@@ -435,7 +459,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/filter-placement-2.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/filter-placement-2.srx',
   ),
-  54 => 
+  57 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-place-3',
     'title' => 'Filter-placement - 3',
@@ -443,7 +467,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/filter-placement-3.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/filter-placement-3.srx',
   ),
-  55 => 
+  58 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-1',
     'title' => 'Filter-nested - 1',
@@ -451,7 +475,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/filter-nested-1.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/filter-nested-1.srx',
   ),
-  56 => 
+  59 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-nested-2',
     'title' => 'Filter-nested - 2',
@@ -459,7 +483,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/filter-nested-2.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/filter-nested-2.srx',
   ),
-  57 => 
+  60 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#filter-scope-1',
     'title' => 'Filter-scope - 1',
@@ -467,7 +491,7 @@
     'query' => 'w3c-dawg2/data-r2/algebra/filter-scope-1.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/filter-scope-1.srx',
   ),
-  58 => 
+  61 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/algebra/manifest#join-scope-1',
     'title' => 'Join scope - 1',
@@ -475,23 +499,55 @@
     'query' => 'w3c-dawg2/data-r2/algebra/var-scope-join-1.rq',
     'result' => 'w3c-dawg2/data-r2/algebra/var-scope-join-1.srx',
   ),
-  59 => 
+  62 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/bnode-coreference/manifest.ttl#dawg-bnode-coref-001',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/bnode-coreference/manifest#dawg-bnode-coref-001',
     'title' => 'dawg-bnode-coreference',
     'data' => 'w3c-dawg2/data-r2/bnode-coreference/data.ttl',
     'query' => 'w3c-dawg2/data-r2/bnode-coreference/query.rq',
     'result' => 'w3c-dawg2/data-r2/bnode-coreference/result.ttl',
   ),
-  60 => 
+  63 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-optional-complex-1',
+    'title' => 'Complex optional semantics: 1',
+    'data' => 'w3c-dawg2/data-r2/optional/complex-data-1.ttl',
+    'query' => 'w3c-dawg2/data-r2/optional/q-opt-complex-1.rq',
+    'result' => 'w3c-dawg2/data-r2/optional/result-opt-complex-1.ttl',
+  ),
+  64 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-optional-complex-2',
+    'title' => 'Complex optional semantics: 2',
+    'data' => 'w3c-dawg2/data-r2/optional/complex-data-2.ttl',
+    'query' => 'w3c-dawg2/data-r2/optional/q-opt-complex-2.rq',
+    'result' => 'w3c-dawg2/data-r2/optional/result-opt-complex-2.ttl',
+  ),
+  65 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-optional-complex-3',
+    'title' => 'Complex optional semantics: 3',
+    'data' => 'w3c-dawg2/data-r2/optional/complex-data-2.ttl',
+    'query' => 'w3c-dawg2/data-r2/optional/q-opt-complex-3.rq',
+    'result' => 'w3c-dawg2/data-r2/optional/result-opt-complex-3.ttl',
+  ),
+  66 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-optional-complex-4',
+    'title' => 'Complex optional semantics: 4',
+    'data' => 'w3c-dawg2/data-r2/optional/complex-data-2.ttl',
+    'query' => 'w3c-dawg2/data-r2/optional/q-opt-complex-4.rq',
+    'result' => 'w3c-dawg2/data-r2/optional/result-opt-complex-4.ttl',
+  ),
+  67 => 
+  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-optional-001',
     'title' => 'One optional clause',
     'data' => 'w3c-dawg2/data-r2/optional/data.ttl',
     'query' => 'w3c-dawg2/data-r2/optional/q-opt-1.rq',
     'result' => 'w3c-dawg2/data-r2/optional/result-opt-1.ttl',
   ),
-  61 => 
+  68 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-optional-002',
     'title' => 'Two optional clauses',
@@ -499,7 +555,7 @@
     'query' => 'w3c-dawg2/data-r2/optional/q-opt-2.rq',
     'result' => 'w3c-dawg2/data-r2/optional/result-opt-2.ttl',
   ),
-  62 => 
+  69 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional/manifest#dawg-union-001',
     'title' => 'Union is not optional',
@@ -507,7 +563,7 @@
     'query' => 'w3c-dawg2/data-r2/optional/q-opt-3.rq',
     'result' => 'w3c-dawg2/data-r2/optional/result-opt-3.ttl',
   ),
-  63 => 
+  70 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-001',
     'title' => 'OPTIONAL-FILTER',
@@ -515,7 +571,7 @@
     'query' => 'w3c-dawg2/data-r2/optional-filter/expr-1.rq',
     'result' => 'w3c-dawg2/data-r2/optional-filter/expr-1-result.ttl',
   ),
-  64 => 
+  71 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-002',
     'title' => 'OPTIONAL - Outer FILTER',
@@ -523,7 +579,7 @@
     'query' => 'w3c-dawg2/data-r2/optional-filter/expr-2.rq',
     'result' => 'w3c-dawg2/data-r2/optional-filter/expr-2-result.ttl',
   ),
-  65 => 
+  72 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-003',
     'title' => 'OPTIONAL - Outer FILTER with BOUND',
@@ -531,7 +587,7 @@
     'query' => 'w3c-dawg2/data-r2/optional-filter/expr-3.rq',
     'result' => 'w3c-dawg2/data-r2/optional-filter/expr-3-result.ttl',
   ),
-  66 => 
+  73 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-01',
     'title' => 'graph-01',
@@ -539,7 +595,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-01.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-01.ttl',
   ),
-  67 => 
+  74 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-04',
     'title' => 'graph-04',
@@ -547,7 +603,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-04.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-04.ttl',
   ),
-  68 => 
+  75 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-05',
     'title' => 'graph-05',
@@ -555,7 +611,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-05.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-05.ttl',
   ),
-  69 => 
+  76 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-06',
     'title' => 'graph-06',
@@ -563,7 +619,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-06.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-06.ttl',
   ),
-  70 => 
+  77 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-07',
     'title' => 'graph-07',
@@ -571,7 +627,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-07.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-07.ttl',
   ),
-  71 => 
+  78 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-08',
     'title' => 'graph-08',
@@ -579,7 +635,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-08.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-08.ttl',
   ),
-  72 => 
+  79 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-09',
     'title' => 'graph-09',
@@ -587,7 +643,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-09.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-09.ttl',
   ),
-  73 => 
+  80 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-10',
     'title' => 'graph-10',
@@ -595,7 +651,7 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-10.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-10.ttl',
   ),
-  74 => 
+  81 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/graph/manifest#dawg-graph-11',
     'title' => 'graph-11',
@@ -603,71 +659,143 @@
     'query' => 'w3c-dawg2/data-r2/graph/graph-11.rq',
     'result' => 'w3c-dawg2/data-r2/graph/graph-11.ttl',
   ),
-  75 => 
+  82 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest.ttl#dawg-bev-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-str',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-str.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-str.srx',
+  ),
+  83 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-flt',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-flt.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-flt.srx',
+  ),
+  84 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-dbl',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-dbl.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-dbl.srx',
+  ),
+  85 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-dec',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-dec.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-dec.srx',
+  ),
+  86 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-int',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-int.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-int.srx',
+  ),
+  87 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-dT',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-dT.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-dT.srx',
+  ),
+  88 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/cast/manifest#cast-bool',
+    'title' => 'Cast to xsd:string',
+    'data' => 'w3c-dawg2/data-r2/cast/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/cast/cast-bool.rq',
+    'result' => 'w3c-dawg2/data-r2/cast/cast-bool.srx',
+  ),
+  89 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-boolean-literal',
+    'title' => 'Test literal \'true\'',
+    'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
+    'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-boolean-literal.rq',
+    'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-boolean-literal.ttl',
+  ),
+  90 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-bev-1',
     'title' => 'Test \'boolean effective value\' - true',
     'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-1.rq',
     'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-1.ttl',
   ),
-  76 => 
+  91 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest.ttl#dawg-bev-2',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-bev-2',
     'title' => 'Test \'boolean effective value\' - false',
     'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-2.rq',
     'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-2.ttl',
   ),
-  77 => 
+  92 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest.ttl#dawg-bev-3',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-bev-3',
     'title' => 'Test \'boolean effective value\' - &&',
     'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-3.rq',
     'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-3.ttl',
   ),
-  78 => 
+  93 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest.ttl#dawg-bev-4',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-bev-4',
     'title' => 'Test \'boolean effective value\' - ||',
     'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
     'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-4.rq',
     'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-4.ttl',
   ),
-  79 => 
+  94 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest.ttl#dawg-bev-5',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-bev-5',
     'title' => 'Test \'boolean effective value\' - optional',
     'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-2.ttl',
     'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-5.rq',
     'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-5.ttl',
   ),
-  80 => 
+  95 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest.ttl#dawg-bev-6',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/boolean-effective-value/manifest#dawg-bev-6',
     'title' => 'Test \'boolean effective value\' - unknown types',
     'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-2.ttl',
     'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-6.rq',
     'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-6.ttl',
   ),
-  81 => 
+  96 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/bound/manifest.ttl#dawg-bound-query-001',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/bound/manifest#dawg-bound-query-001',
     'title' => 'dawg-bound-query-001',
     'data' => 'w3c-dawg2/data-r2/bound/data.ttl',
     'query' => 'w3c-dawg2/data-r2/bound/bound1.rq',
     'result' => 'w3c-dawg2/data-r2/bound/bound1-result.ttl',
   ),
-  82 => 
+  97 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-isLiteral-1',
+    'title' => 'isLiteral',
+    'data' => 'w3c-dawg2/data-r2/expr-builtin/data-builtin-2.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-builtin/q-isliteral-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-builtin/result-isliteral-1.ttl',
+  ),
+  98 => 
+  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-str-1',
     'title' => 'str-1',
     'data' => 'w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl',
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-str-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-str-1.ttl',
   ),
-  83 => 
+  99 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-str-2',
     'title' => 'str-2',
@@ -675,7 +803,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-str-2.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-str-2.ttl',
   ),
-  84 => 
+  100 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-str-3',
     'title' => 'str-3',
@@ -683,7 +811,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-str-3.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-str-3.ttl',
   ),
-  85 => 
+  101 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-str-4',
     'title' => 'str-4',
@@ -691,7 +819,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-str-4.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-str-4.ttl',
   ),
-  86 => 
+  102 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-isBlank-1',
     'title' => 'isBlank-1',
@@ -699,7 +827,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-blank-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-blank-1.ttl',
   ),
-  87 => 
+  103 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-1',
     'title' => 'datatype-1',
@@ -707,7 +835,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-datatype-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-datatype-1.ttl',
   ),
-  88 => 
+  104 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2',
     'title' => 'datatype-2 : Literals with a datatype',
@@ -715,7 +843,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-datatype-2.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-datatype-2.srx',
   ),
-  89 => 
+  105 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-3',
     'title' => 'datatype-3 : Literals with a datatype of xsd:string',
@@ -723,7 +851,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-datatype-3.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-datatype-3.srx',
   ),
-  90 => 
+  106 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-lang-1',
     'title' => 'lang-1 : Literals with a lang tag of some kind',
@@ -731,7 +859,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-lang-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-lang-1.srx',
   ),
-  91 => 
+  107 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-lang-2',
     'title' => 'lang-2 : Literals with a lang tag of \'\'',
@@ -739,7 +867,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-lang-2.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-lang-2.srx',
   ),
-  92 => 
+  108 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-lang-3',
     'title' => 'lang-3 : Graph matching with lang tag being a different case',
@@ -747,7 +875,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-lang-3.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-lang-3.srx',
   ),
-  93 => 
+  109 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-isURI-1',
     'title' => 'isURI-1',
@@ -755,15 +883,23 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-uri-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-uri-1.ttl',
   ),
-  94 => 
+  110 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-isIRI-1',
+    'title' => 'isIRI-1',
+    'data' => 'w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-builtin/q-iri-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-builtin/result-iri-1.ttl',
+  ),
+  111 => 
+  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-langMatches-1',
     'title' => 'LangMatches-1',
     'data' => 'w3c-dawg2/data-r2/expr-builtin/data-langMatches.ttl',
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-langMatches-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-langMatches-1.ttl',
   ),
-  95 => 
+  112 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-langMatches-2',
     'title' => 'LangMatches-2',
@@ -771,7 +907,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-langMatches-2.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-langMatches-2.ttl',
   ),
-  96 => 
+  113 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-langMatches-3',
     'title' => 'LangMatches-3',
@@ -779,7 +915,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-langMatches-3.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-langMatches-3.ttl',
   ),
-  97 => 
+  114 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-langMatches-4',
     'title' => 'LangMatches-4',
@@ -787,15 +923,23 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/q-langMatches-4.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/result-langMatches-4.ttl',
   ),
-  98 => 
+  115 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-langMatches-basic',
+    'title' => 'LangMatches-basic',
+    'data' => 'w3c-dawg2/data-r2/expr-builtin/data-langMatches-de.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-builtin/q-langMatches-de-de.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-builtin/result-langMatches-de.ttl',
+  ),
+  116 => 
+  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#lang-case-insensitive-eq',
     'title' => 'lang-case-insensitive-eq',
     'data' => 'w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity.ttl',
     'query' => 'w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity-eq.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/lang-case-insensitive-eq.srx',
   ),
-  99 => 
+  117 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#lang-case-insensitive-ne',
     'title' => 'lang-case-insensitive-ne',
@@ -803,15 +947,95 @@
     'query' => 'w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity-ne.rq',
     'result' => 'w3c-dawg2/data-r2/expr-builtin/lang-case-insensitive-ne.srx',
   ),
-  100 => 
+  118 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#sameTerm-simple',
+    'title' => 'sameTerm-simple',
+    'data' => 'w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-builtin/sameTerm.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-builtin/result-sameTerm.ttl',
+  ),
+  119 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#sameTerm-eq',
+    'title' => 'sameTerm-eq',
+    'data' => 'w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-builtin/sameTerm-eq.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-builtin/result-sameTerm-eq.ttl',
+  ),
+  120 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#sameTerm-not-eq',
+    'title' => 'sameTerm-not-eq',
+    'data' => 'w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-builtin/sameTerm-not-eq.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-builtin/result-sameTerm-not-eq.ttl',
+  ),
+  121 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#unplus-1',
+    'title' => 'Unary Plusn',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-unplus-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-unplus-1.srx',
+  ),
+  122 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#unminus-1',
+    'title' => 'Unary Minus',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-unminus-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-unminus-1.srx',
+  ),
+  123 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#plus-1',
+    'title' => 'Addition',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-plus-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-plus-1.srx',
+  ),
+  124 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#minus-1',
+    'title' => 'Subtraction',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-minus-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-minus-1.srx',
+  ),
+  125 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#mul-1',
+    'title' => 'Multiplication',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-mul-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-mul-1.srx',
+  ),
+  126 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#ge-1',
+    'title' => 'Greater-than or equals',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-ge-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-ge-1.srx',
+  ),
+  127 => 
+  array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-ops/manifest#le-1',
+    'title' => 'Less-than or equals',
+    'data' => 'w3c-dawg2/data-r2/expr-ops/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/expr-ops/query-le-1.rq',
+    'result' => 'w3c-dawg2/data-r2/expr-ops/result-le-1.srx',
+  ),
+  128 => 
+  array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-1',
     'title' => 'Equality 1-1',
     'data' => 'w3c-dawg2/data-r2/expr-equals/data-eq.ttl',
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-1.ttl',
   ),
-  101 => 
+  129 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-2',
     'title' => 'Equality 1-2',
@@ -819,7 +1043,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-2.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-2.ttl',
   ),
-  102 => 
+  130 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-3',
     'title' => 'Equality 1-3',
@@ -827,7 +1051,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-3.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-3.ttl',
   ),
-  103 => 
+  131 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-4',
     'title' => 'Equality 1-4',
@@ -835,7 +1059,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-4.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-4.ttl',
   ),
-  104 => 
+  132 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-5',
     'title' => 'Equality 1-5',
@@ -843,7 +1067,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-5.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-5.ttl',
   ),
-  105 => 
+  133 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-2-1',
     'title' => 'Equality - 2 var - test equals',
@@ -851,7 +1075,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq2-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq2-1.ttl',
   ),
-  106 => 
+  134 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-2-2',
     'title' => 'Equality - 2 var - test not equals ',
@@ -859,7 +1083,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq2-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq2-1.ttl',
   ),
-  107 => 
+  135 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-graph-1',
     'title' => 'Equality 1-1 -- graph',
@@ -867,7 +1091,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-graph-1.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-graph-1.ttl',
   ),
-  108 => 
+  136 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-graph-2',
     'title' => 'Equality 1-2 -- graph',
@@ -875,7 +1099,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-graph-2.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-graph-2.ttl',
   ),
-  109 => 
+  137 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-graph-3',
     'title' => 'Equality 1-3 -- graph',
@@ -883,7 +1107,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-graph-3.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-graph-3.ttl',
   ),
-  110 => 
+  138 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-graph-4',
     'title' => 'Equality 1-4 -- graph',
@@ -891,7 +1115,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-graph-4.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-graph-4.ttl',
   ),
-  111 => 
+  139 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-equals/manifest#eq-graph-5',
     'title' => 'Equality 1-5 -- graph',
@@ -899,7 +1123,7 @@
     'query' => 'w3c-dawg2/data-r2/expr-equals/query-eq-graph-5.rq',
     'result' => 'w3c-dawg2/data-r2/expr-equals/result-eq-graph-5.ttl',
   ),
-  112 => 
+  140 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/regex/manifest#dawg-regex-001',
     'title' => 'regex-query-001',
@@ -907,7 +1131,7 @@
     'query' => 'w3c-dawg2/data-r2/regex/regex-query-001.rq',
     'result' => 'w3c-dawg2/data-r2/regex/regex-result-001.ttl',
   ),
-  113 => 
+  141 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/regex/manifest#dawg-regex-002',
     'title' => 'regex-query-002',
@@ -915,7 +1139,7 @@
     'query' => 'w3c-dawg2/data-r2/regex/regex-query-002.rq',
     'result' => 'w3c-dawg2/data-r2/regex/regex-result-002.ttl',
   ),
-  114 => 
+  142 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/regex/manifest#dawg-regex-003',
     'title' => 'regex-query-003',
@@ -923,7 +1147,7 @@
     'query' => 'w3c-dawg2/data-r2/regex/regex-query-003.rq',
     'result' => 'w3c-dawg2/data-r2/regex/regex-result-003.ttl',
   ),
-  115 => 
+  143 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/regex/manifest#dawg-regex-004',
     'title' => 'regex-query-004',
@@ -931,15 +1155,15 @@
     'query' => 'w3c-dawg2/data-r2/regex/regex-query-004.rq',
     'result' => 'w3c-dawg2/data-r2/regex/regex-result-004.ttl',
   ),
-  116 => 
+  144 => 
   array (
-    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/construct/manifest.ttl#construct-1',
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/construct/manifest#construct-1',
     'title' => 'dawg-construct-identity',
     'data' => 'w3c-dawg2/data-r2/construct/data-ident.ttl',
     'query' => 'w3c-dawg2/data-r2/construct/query-ident.rq',
     'result' => 'w3c-dawg2/data-r2/construct/result-ident.ttl',
   ),
-  117 => 
+  145 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-1',
     'title' => 'ASK-1 (SPARQL XML results)',
@@ -947,7 +1171,7 @@
     'query' => 'w3c-dawg2/data-r2/ask/ask-1.rq',
     'result' => 'w3c-dawg2/data-r2/ask/ask-1.srx',
   ),
-  118 => 
+  146 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-4',
     'title' => 'ASK-4 (SPARQL XML results)',
@@ -955,7 +1179,7 @@
     'query' => 'w3c-dawg2/data-r2/ask/ask-4.rq',
     'result' => 'w3c-dawg2/data-r2/ask/ask-4.srx',
   ),
-  119 => 
+  147 => 
   array (
     'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-7',
     'title' => 'ASK-7 (SPARQL XML results)',
@@ -963,15 +1187,23 @@
     'query' => 'w3c-dawg2/data-r2/ask/ask-7.rq',
     'result' => 'w3c-dawg2/data-r2/ask/ask-7.srx',
   ),
-  120 => 
+  148 => 
   array (
+    'earl:name' => 'http://www.w3.org/2001/sw/DataAccess/tests/data-r2/ask/manifest#ask-8',
+    'title' => 'ASK-8 (SPARQL XML results)',
+    'data' => 'w3c-dawg2/data-r2/ask/data.ttl',
+    'query' => 'w3c-dawg2/data-r2/ask/ask-8.rq',
+    'result' => 'w3c-dawg2/data-r2/ask/ask-8.srx',
+  ),
+  149 => 
+  array (
     'earl:name' => 'http://...
 
[truncated message content]

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [543] trunk/rdfapi-php/test/Readme.txt

From: <cw...@us...> - 2007-10-09 16:01:44

Revision: 543
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=543&view=rev
Author:   cweiske
Date:     2007-10-09 09:01:43 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
Wrote Readme.txt completely new since the contents were somehow outdated.

Modified Paths:
--------------
    trunk/rdfapi-php/test/Readme.txt

Modified: trunk/rdfapi-php/test/Readme.txt
===================================================================
--- trunk/rdfapi-php/test/Readme.txt	2007-10-09 15:54:27 UTC (rev 542)
+++ trunk/rdfapi-php/test/Readme.txt	2007-10-09 16:01:43 UTC (rev 543)
@@ -1,14 +1,15 @@
-------------------------------------------------
-             RAP Unit Tests
-------------------------------------------------
+Welcome to RDF API for PHP
 
-There are additional RAP tests availible using the PHP unit test framework 
-"Simple Test" (http://sourceforge.net/projects/simpletest/).
+This directory contains some demo scripts that show you how to use RAP.
 
-The additonal test can be downloaded as a seperate package from:
+Many scripts require a working config.php file, so make a copy of
+ "config.php.dist", save it as "config.php" and adjust it.
 
-http://sourceforge.net/projects/rdfapi-php
+Execute "setup.php" on the command line to create all the necessary tables
+ in the database.
 
-Chris, 8/21/2004
+"unit/" directory contains the unit tests for RAP. They ensure that nothing
+ breaks during development. See the Readme in there for more information.
 
-
+Also remember there is documentation for RAP available at
+ http://rdfapi-php.sf.net/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [542] trunk/rdfapi-php

From: <cw...@us...> - 2007-10-09 15:54:29

Revision: 542
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=542&view=rev
Author:   cweiske
Date:     2007-10-09 08:54:27 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
Tell explicitely that the driver type is wrong

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbStore.php
    trunk/rdfapi-php/test/setup.php

Modified: trunk/rdfapi-php/api/model/DbStore.php
===================================================================
--- trunk/rdfapi-php/api/model/DbStore.php	2007-10-09 15:48:01 UTC (rev 541)
+++ trunk/rdfapi-php/api/model/DbStore.php	2007-10-09 15:54:27 UTC (rev 542)
@@ -309,7 +309,7 @@
     public function createTables($databaseType = null)
     {
         $driver = $this->getDriver($databaseType);
-        $this->assertDriverSupported($driver);
+        self::assertDriverSupported($driver);
 
         $createFunc = '_createTables_' . $driver;
         return $this->$createFunc();
@@ -519,7 +519,7 @@
     public function isSetup($databaseType = null)
     {
         $driver = $this->getDriver($databaseType);
-        $this->assertDriverSupported($driver);
+        self::assertDriverSupported($driver);
 
         $issetupFunc = '_isSetup_' . $driver;
         return $this->$issetupFunc();
@@ -559,7 +559,7 @@
     *
     * @throws Exception If the driver is not supported
     */
-    protected function assertDriverSupported($databaseType)
+    public static function assertDriverSupported($databaseType)
     {
         if (!in_array($databaseType, self::$arSupportedDbTypes)) {
             throw new Exception(
@@ -568,7 +568,7 @@
             );
         }
         return true;
-    }//protected function assertDriverSupported($databaseType)
+    }//public static function assertDriverSupported($databaseType)
 
 
 

Modified: trunk/rdfapi-php/test/setup.php
===================================================================
--- trunk/rdfapi-php/test/setup.php	2007-10-09 15:48:01 UTC (rev 541)
+++ trunk/rdfapi-php/test/setup.php	2007-10-09 15:54:27 UTC (rev 542)
@@ -9,10 +9,19 @@
     die('Please copy "test/config.php.dist" to "test/config.php" and adjust it');
 }
 require_once $strConfFile;
+require_once RDFAPI_INCLUDE_DIR . '/model/DbStore.php';
 require_once RDFAPI_INCLUDE_DIR . '/model/ModelFactory.php';
 
+try {
+    DbStore::assertDriverSupported($GLOBALS['dbConf']['type']);
+} catch (Exception $e) {
+    echo "Error: " . $e->getMessage() . "\n";
+    echo "Be sure to write the driver type in the same cAsE\n";
+    exit(4);
+}
 
 
+
 try {
     $database = ModelFactory::getDbStore(
         $GLOBALS['dbConf']['type'],     $GLOBALS['dbConf']['host'],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [541] trunk/rdfapi-php

From: <cw...@us...> - 2007-10-09 15:48:07

Revision: 541
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=541&view=rev
Author:   cweiske
Date:     2007-10-09 08:48:01 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
Setup script for CLI
Make DbStore have a cleaner API

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbStore.php

Added Paths:
-----------
    trunk/rdfapi-php/test/setup.php

Modified: trunk/rdfapi-php/api/model/DbStore.php
===================================================================
--- trunk/rdfapi-php/api/model/DbStore.php	2007-09-20 07:35:41 UTC (rev 540)
+++ trunk/rdfapi-php/api/model/DbStore.php	2007-10-09 15:48:01 UTC (rev 541)
@@ -26,17 +26,35 @@
  */
 
 
-class DbStore extends Object{
+class DbStore extends Object
+{
+    /**
+    * Array with all supported database types
+    *
+    * @var array
+    */
+    public static $arSupportedDbTypes = array(
+        "MySQL",
+        "MSSQL",
+        'MsAccess'
+    );
 
-/**
- * Database connection object
- *
- * @var     object ADOConnection
- * @access	private
- */
- var $dbConn;
+    /**
+    * Database connection object
+    *
+    * @var     object ADOConnection
+    * @access	private
+    */
+    var $dbConn;
 
     /**
+    * Database driver name
+    *
+    * @var string
+    */
+    protected $driver = null;
+
+    /**
     *   SparqlParser so we can re-use it
     *   @var Parser
     */
@@ -62,6 +80,7 @@
 
    // create a new connection object
    $this->dbConn =& ADONewConnection($dbDriver);
+   $this->driver = $dbDriver;
 
    //activate the ADOdb DEBUG mode
    if (ADODB_DEBUG_MODE == '1')
@@ -79,33 +98,7 @@
  }
 
 
-/**
- * Create tables and indexes for the given database type.
- * Currently supported: MsAccess and MySQL.
- * If you want to use other databases, you will have to create tables by yourself
- * according to the abstract <a href="database_schema.html">database schema</a>
- * described in the API documentation.
- *
- * @param   string  $databaseType
- * @throws	PhpError
- * @access	public
- */
- function createTables($databaseType) {
 
-   if (!strcasecmp($databaseType, 'MsAccess'))
-   $this->_createTables_MsAccess();
-   elseif (!strcasecmp($databaseType, 'MySQL'))
-       $this->_createTables_MySql();
-   elseif (!strcasecmp($databaseType, 'MSSQL'))
-   		$this->_createTables_mssql();
-   else {
-       $errmsg = RDFAPI_ERROR . "(class: DbStore; method: createTables('$databaseType')):
-                                  Currently only MsAcces, MySQL and MSSQL supported.";
-       trigger_error($errmsg, E_USER_ERROR);
-   }
- }
-
-
 /**
  * List all DbModels stored in the database.
  *
@@ -303,206 +296,282 @@
  }
 
 
-/**
- * Create tables and indexes for MsAccess database
- *
- * @throws  SqlError
- * @access	private
- */
- function _createTables_MsAccess() {
 
-   $this->dbConn->startTrans();
+    /**
+     * Sets up tables for RAP.
+     * DOES NOT CHECK IF TABLES ALREADY EXIST
+     *
+     * @param string  $databaseType Database driver name (e.g. MySQL)
+     *
+     * @throws Exception If database type is unsupported
+     * @access public
+     **/
+    public function createTables($databaseType = null)
+    {
+        $driver = $this->getDriver($databaseType);
+        $this->assertDriverSupported($driver);
 
-   $this->dbConn->execute('CREATE TABLE models
-                           (modelID long primary key,
-                            modelURI varchar not null,
-                            baseURI varchar)');
+        $createFunc = '_createTables_' . $driver;
+        return $this->$createFunc();
+    }//public function createTables($databaseType="MySQL")
 
-   $this->dbConn->execute('CREATE UNIQUE INDEX m_modURI_idx ON models (modelURI)');
 
-   $this->dbConn->execute('CREATE TABLE statements
-                           (modelID long,
-                            subject varchar,
-                            predicate varchar,
-                            object Memo,
-                            l_language varchar,
-                            l_datatype varchar,
-                            subject_is varchar(1),
-                            object_is varchar(1),
-                            primary key (modelID, subject, predicate, object,
-                                         l_language, l_datatype))');
 
-   $this->dbConn->execute('CREATE INDEX s_mod_idx ON statements (modelID)');
-   $this->dbConn->execute('CREATE INDEX s_sub_idx ON statements (subject)');
-   $this->dbConn->execute('CREATE INDEX s_pred_idx ON statements (predicate)');
-   $this->dbConn->execute('CREATE INDEX s_obj_idx ON statements (object)');
+    /**
+    * Create tables and indexes for MsAccess database
+    *
+    * @return boolean true If all is ok
+    *
+    * @throws Exception
+    */
+    protected function _createTables_MsAccess()
+    {
+        $this->dbConn->startTrans();
 
-     $this->dbConn->execute('CREATE TABLE namespaces
-                           (modelID long,
-                            namespace varchar,
-                            prefix varchar,
-                            primary key (modelID, namespace, prefix))');
+        $this->dbConn->execute('CREATE TABLE models
+                                (modelID long primary key,
+                                    modelURI varchar not null,
+                                    baseURI varchar)');
 
-   $this->dbConn->execute('CREATE INDEX n_name_idx ON namespaces (namespace)');
-   $this->dbConn->execute('CREATE INDEX n_pref_idx ON namespaces (prefix)');
+        $this->dbConn->execute('CREATE UNIQUE INDEX m_modURI_idx ON models (modelURI)');
 
-     $this->dbConn->execute("CREATE TABLE datasets
-                           (datasetName varchar,
-  							defaultModelUri varchar,
-							primary key (datasetName))");
+        $this->dbConn->execute('CREATE TABLE statements
+                                (modelID long,
+                                    subject varchar,
+                                    predicate varchar,
+                                    object Memo,
+                                    l_language varchar,
+                                    l_datatype varchar,
+                                    subject_is varchar(1),
+                                    object_is varchar(1),
+                                    primary key (modelID, subject, predicate, object,
+                                    l_language, l_datatype))');
 
-   $this->dbConn->execute('CREATE INDEX nGS_idx1 ON datasets (datasetName)');
+        $this->dbConn->execute('CREATE INDEX s_mod_idx ON statements (modelID)');
+        $this->dbConn->execute('CREATE INDEX s_sub_idx ON statements (subject)');
+        $this->dbConn->execute('CREATE INDEX s_pred_idx ON statements (predicate)');
+        $this->dbConn->execute('CREATE INDEX s_obj_idx ON statements (object)');
 
+        $this->dbConn->execute('CREATE TABLE namespaces
+                            (modelID long,
+                                namespace varchar,
+                                prefix varchar,
+                                primary key (modelID, namespace, prefix))');
 
-   $this->dbConn->execute("CREATE TABLE `dataset_model` (
-  							datasetName varchar,
-  							modelId long,
-							graphURI varchar,
-							PRIMARY KEY  (modelId,datasetName))");
+        $this->dbConn->execute('CREATE INDEX n_name_idx ON namespaces (namespace)');
+        $this->dbConn->execute('CREATE INDEX n_pref_idx ON namespaces (prefix)');
 
+        $this->dbConn->execute("CREATE TABLE datasets
+                            (datasetName varchar,
+                                defaultModelUri varchar,
+                                primary key (datasetName))");
 
-   if (!$this->dbConn->completeTrans())
-      echo $this->dbConn->errorMsg();
- }
+        $this->dbConn->execute('CREATE INDEX nGS_idx1 ON datasets (datasetName)');
 
 
-/**
- * Create tables and indexes for MySQL database
- *
- * @throws  SqlError
- * @access	private
- */
- function _createTables_MySql() {
+        $this->dbConn->execute("CREATE TABLE `dataset_model` (
+                                    datasetName varchar,
+                                    modelId long,
+                                    graphURI varchar,
+                                    PRIMARY KEY  (modelId,datasetName))");
 
-   $this->dbConn->startTrans();
 
-   $this->dbConn->execute("CREATE TABLE models
-                           (modelID bigint NOT NULL,
-                            modelURI varchar(255) NOT NULL,
-                            baseURI varchar(255) DEFAULT '',
-                            primary key (modelID))");
+        if (!$this->dbConn->completeTrans()) {
+            throw new Exception($this->dbConn->errorMsg());
+        }
+        return true;
+    }
 
-   $this->dbConn->execute('CREATE UNIQUE INDEX m_modURI_idx ON models (modelURI)');
 
-   $this->dbConn->execute("CREATE TABLE statements
-                           (modelID bigint NOT NULL,
-                            subject varchar(255) NOT NULL,
-                            predicate varchar(255) NOT NULL,
-                            object text,
-                            l_language varchar(255) DEFAULT '',
-                            l_datatype varchar(255) DEFAULT '',
-                            subject_is varchar(1) NOT NULL,
-                            object_is varchar(1) NOT NULL)");
 
-   $this->dbConn->execute("CREATE TABLE namespaces
-                           (modelID bigint NOT NULL,
-                            namespace varchar(255) NOT NULL,
-                            prefix varchar(255) NOT NULL,
-   							primary key (modelID,namespace))");
+    /**
+    * Create tables and indexes for MySQL database
+    *
+    * @return boolean true If all is ok
+    *
+    * @throws Exception
+    */
+    function _createTables_MySQL()
+    {
 
-  $this->dbConn->execute("CREATE TABLE `dataset_model` (
-  							`datasetName` varchar(255) NOT NULL default '0',
-  							`modelId` bigint(20) NOT NULL default '0',
-							`graphURI` varchar(255) NOT NULL default '',
-							 PRIMARY KEY  (`modelId`,`datasetName`))");
+        $this->dbConn->startTrans();
 
-  $this->dbConn->execute("CREATE TABLE `datasets` (
-  							`datasetName` varchar(255) NOT NULL default '',
-						    `defaultModelUri` varchar(255) NOT NULL default '0',
-						     PRIMARY KEY  (`datasetName`),
-						     KEY `datasetName` (`datasetName`))");
+        $this->dbConn->execute("CREATE TABLE models
+                                (modelID bigint NOT NULL,
+                                    modelURI varchar(255) NOT NULL,
+                                    baseURI varchar(255) DEFAULT '',
+                                    primary key (modelID))");
 
-   $this->dbConn->execute('CREATE INDEX s_mod_idx ON statements (modelID)');
-   $this->dbConn->execute('CREATE INDEX n_mod_idx ON namespaces (modelID)');
+        $this->dbConn->execute('CREATE UNIQUE INDEX m_modURI_idx ON models (modelURI)');
 
-   $this->dbConn->execute('CREATE INDEX s_sub_pred_idx ON statements
-                          (subject(200),predicate(200))');
+        $this->dbConn->execute("CREATE TABLE statements
+                                (modelID bigint NOT NULL,
+                                    subject varchar(255) NOT NULL,
+                                    predicate varchar(255) NOT NULL,
+                                    object text,
+                                    l_language varchar(255) DEFAULT '',
+                                    l_datatype varchar(255) DEFAULT '',
+                                    subject_is varchar(1) NOT NULL,
+                                    object_is varchar(1) NOT NULL)");
 
-   $this->dbConn->execute('CREATE INDEX s_sub_idx ON statements (subject(200))');
-   $this->dbConn->execute('CREATE INDEX s_pred_idx ON statements (predicate(200))');
-   $this->dbConn->execute('CREATE INDEX s_obj_idx ON statements (object(250))');
+        $this->dbConn->execute("CREATE TABLE namespaces
+                                (modelID bigint NOT NULL,
+                                    namespace varchar(255) NOT NULL,
+                                    prefix varchar(255) NOT NULL,
+                                    primary key (modelID,namespace))");
 
-   $this->dbConn->execute('CREATE FULLTEXT INDEX s_obj_ftidx ON statements (object)');
+        $this->dbConn->execute("CREATE TABLE `dataset_model` (
+                                    `datasetName` varchar(255) NOT NULL default '0',
+                                    `modelId` bigint(20) NOT NULL default '0',
+                                    `graphURI` varchar(255) NOT NULL default '',
+                                    PRIMARY KEY  (`modelId`,`datasetName`))");
 
-   if (!$this->dbConn->completeTrans())
-      echo $this->dbConn->errorMsg();
- }
+        $this->dbConn->execute("CREATE TABLE `datasets` (
+                                    `datasetName` varchar(255) NOT NULL default '',
+                                    `defaultModelUri` varchar(255) NOT NULL default '0',
+                                    PRIMARY KEY  (`datasetName`),
+                                    KEY `datasetName` (`datasetName`))");
 
- /**
- * Create tables and indexes for MSSQL database
- *
- * @throws  SqlError
- * @access	private
- */
- function _createTables_mssql(){
+        $this->dbConn->execute('CREATE INDEX s_mod_idx ON statements (modelID)');
+        $this->dbConn->execute('CREATE INDEX n_mod_idx ON namespaces (modelID)');
 
-   $this->dbConn->startTrans();
+        $this->dbConn->execute('CREATE INDEX s_sub_pred_idx ON statements
+                                (subject(200),predicate(200))');
 
-   $this->dbConn->execute("CREATE TABLE [dbo].[models] (
-							[modelID] [int] NOT NULL ,
-							[modelURI] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[baseURI] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
-							) ON [PRIMARY]");
+        $this->dbConn->execute('CREATE INDEX s_sub_idx ON statements (subject(200))');
+        $this->dbConn->execute('CREATE INDEX s_pred_idx ON statements (predicate(200))');
+        $this->dbConn->execute('CREATE INDEX s_obj_idx ON statements (object(250))');
 
-   $this->dbConn->execute("CREATE TABLE [dbo].[statements] (
-							[modelID] [int] NOT NULL ,
-							[subject] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[predicate] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[object] [text] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[l_language] [nvarchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[l_datatype] [nvarchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[subject_is] [nchar] (1) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							[object_is] [nchar] (1) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
-							) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]");
+        $this->dbConn->execute('CREATE FULLTEXT INDEX s_obj_ftidx ON statements (object)');
 
+        if (!$this->dbConn->completeTrans()) {
+            throw new Exception($this->dbConn->errorMsg());
+        }
+        return true;
+    }
 
-    $this->dbConn->execute("CREATE TABLE [dbo].[namespaces] (
-							[modelID] [int] NOT NULL ,
-							[namespace] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-							[prefix] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-							) ON [PRIMARY]");
 
-   $this->dbConn->execute("ALTER TABLE [dbo].[models] WITH NOCHECK ADD
-							CONSTRAINT [PK_models] PRIMARY KEY  CLUSTERED
-							(
-								[modelID]
-							)  ON [PRIMARY] ");
-   $this->dbConn->execute("ALTER TABLE [dbo].[namespaces] WITH NOCHECK ADD
-							CONSTRAINT [PK_namespaces] PRIMARY KEY  CLUSTERED
-							(
-								[modelID],[namespace]
-							)  ON [PRIMARY] ");
 
-   $this->dbConn->execute("CREATE  INDEX [joint index on subject and predicate] ON [dbo].[statements]([subject], [predicate]) ON [PRIMARY]");
+    /**
+    * Create tables and indexes for MSSQL database
+    *
+    * @return boolean true If all is ok
+    *
+    * @throws Exception
+    */
+    function _createTables_MSSQL()
+    {
+        $this->dbConn->startTrans();
 
+        $this->dbConn->execute("CREATE TABLE [dbo].[models] (
+                                    [modelID] [int] NOT NULL ,
+                                    [modelURI] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [baseURI] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
+                                    ) ON [PRIMARY]");
 
-   if (!$this->dbConn->completeTrans())
-   	echo $this->dbConn->errorMsg();
+        $this->dbConn->execute("CREATE TABLE [dbo].[statements] (
+                                    [modelID] [int] NOT NULL ,
+                                    [subject] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [predicate] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [object] [text] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [l_language] [nvarchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [l_datatype] [nvarchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [subject_is] [nchar] (1) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    [object_is] [nchar] (1) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
+                                    ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]");
 
- }
 
+            $this->dbConn->execute("CREATE TABLE [dbo].[namespaces] (
+                                    [modelID] [int] NOT NULL ,
+                                    [namespace] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+                                    [prefix] [nvarchar] (200) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+                                    ) ON [PRIMARY]");
 
-  /**
-  * Checks if tables are setup for RAP
-  *
-  * @param   string  $databaseType
-  * @throws SqlError
-  * @access public
-  **/
- function isSetup($databaseType="MySQL") {
-   if ($databaseType=="MySQL")
-     return $this->_isSetup_MySql();
-    if ($databaseType=="MSSQL")
-     return $this->_isSetup_MSSQL();
-   else {
-   	if ($databaseType=='MsAccess'){
-   		return $this->_isSetup_MsAccess();
-   	}else{
-     $errmsg=RDFAPI_ERROR."(class: DbStore; method isSetup('$databaseType')):\nCurrently only MySQL, MsAccess and MSSQL are supported!";
-     trigger_error($errmsg, E_USER_ERROR);}
-   }
- }
+        $this->dbConn->execute("ALTER TABLE [dbo].[models] WITH NOCHECK ADD
+                                    CONSTRAINT [PK_models] PRIMARY KEY  CLUSTERED
+                                    (
+                                        [modelID]
+                                    )  ON [PRIMARY] ");
+        $this->dbConn->execute("ALTER TABLE [dbo].[namespaces] WITH NOCHECK ADD
+                                    CONSTRAINT [PK_namespaces] PRIMARY KEY  CLUSTERED
+                                    (
+                                        [modelID],[namespace]
+                                    )  ON [PRIMARY] ");
 
+        $this->dbConn->execute("CREATE  INDEX [joint index on subject and predicate] ON [dbo].[statements]([subject], [predicate]) ON [PRIMARY]");
+
+
+        if (!$this->dbConn->completeTrans()) {
+            throw new Exception($this->dbConn->errorMsg());
+        }
+        return true;
+    }
+
+
+
+    /**
+     * Checks if tables are setup for RAP
+     *
+     * @param   string  $databaseType
+     * @throws Exception If database type is unsupported
+     * @access public
+     **/
+    public function isSetup($databaseType = null)
+    {
+        $driver = $this->getDriver($databaseType);
+        $this->assertDriverSupported($driver);
+
+        $issetupFunc = '_isSetup_' . $driver;
+        return $this->$issetupFunc();
+    }//public function isSetup($databaseType="MySQL")
+
+
+
+    /**
+    * Returns the driver for the database type.
+    * You can pass NULL or omit the parameter to
+    *  use the parameter from the dbstore constructor
+    *
+    * @return string Database driver string
+    */
+    protected function getDriver($databaseType = null)
+    {
+        if ($databaseType === null) {
+            if ($this->driver === null) {
+                //backward compatibility
+                $databaseType = 'MySQL';
+            } else {
+                $databaseType = $this->driver;
+            }
+        }
+        return $databaseType;
+    }//protected function getDriver($databaseType = null)
+
+
+
+    /**
+    * Checks if the given driver is supported and throws an
+    * Exception if not.
+    *
+    * @param string $databaseType Database driver name (e.g. MySQL)
+    *
+    * @return true If it does not fail
+    *
+    * @throws Exception If the driver is not supported
+    */
+    protected function assertDriverSupported($databaseType)
+    {
+        if (!in_array($databaseType, self::$arSupportedDbTypes)) {
+            throw new Exception(
+                'Unsupported database type, only supported: '
+                . implode(', ', self::$arSupportedDbTypes)
+            );
+        }
+        return true;
+    }//protected function assertDriverSupported($databaseType)
+
+
+
  /**
   * Checks if tables are setup for RAP (MySql)
   *

Added: trunk/rdfapi-php/test/setup.php
===================================================================
--- trunk/rdfapi-php/test/setup.php	                        (rev 0)
+++ trunk/rdfapi-php/test/setup.php	2007-10-09 15:48:01 UTC (rev 541)
@@ -0,0 +1,54 @@
+<?php
+/**
+* Prepares your system for RAP.
+* Creates database tables if they don't exist yet
+*/
+
+$strConfFile = dirname(__FILE__) . '/config.php';
+if (!file_exists($strConfFile)) {
+    die('Please copy "test/config.php.dist" to "test/config.php" and adjust it');
+}
+require_once $strConfFile;
+require_once RDFAPI_INCLUDE_DIR . '/model/ModelFactory.php';
+
+
+
+try {
+    $database = ModelFactory::getDbStore(
+        $GLOBALS['dbConf']['type'],     $GLOBALS['dbConf']['host'],
+        $GLOBALS['dbConf']['database'], $GLOBALS['dbConf']['user'],
+        $GLOBALS['dbConf']['password']
+    );
+} catch (Exception $e) {
+    echo "Error: " . $e->getMessage() . "\n";
+    echo "Maybe the database '" . $GLOBALS['dbConf']['database'] . "' does not exist?\n";
+    exit(3);
+}
+
+if ($database->isSetup()) {
+   echo "Database is already setup.\n";
+   exit(0);
+}
+
+try {
+    $database->createTables();
+} catch (Exception $e) {
+    //mysql doesn't complete the transaction but is ok
+    if ($e->getMessage() != '') {
+        echo "Error: " . $e->getMessage() . "\n";
+        echo "Something failed when creating the tables\n";
+        exit(2);
+    }
+}
+
+
+if ($database->isSetup()) {
+    echo "Database has been setup.\n";
+    exit(0);
+} else {
+    echo "Database tables have been created, but somehow it still\n"
+        . " setup is incomplete. File a bug\n";
+    exit(1);
+}
+
+?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [540] trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2

From: <cw...@us...> - 2007-09-20 07:35:43

Revision: 540
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=540&view=rev
Author:   cweiske
Date:     2007-09-20 00:35:41 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
re-adding dawg-r2 tests updated to current version

Added Paths:
-----------
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/LICENSE
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/README
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/data-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/data-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-scope-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-scope-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/join-combo-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/join-combo-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/join-combo-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/join-combo-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/join-combo-graph-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/join-combo-graph-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt-alt.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt-alt.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/var-scope-join-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/var-scope-join-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/var-scope-join-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra-expressions.txt
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-4.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-7.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-7.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-8.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-8.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-4.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-5.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-5.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/bgp-no-match.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/bgp-no-match.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-5.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-6.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-7.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-4.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/prefix-name-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/prefix-name-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-4.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/spoo-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/spoo-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-4.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-5.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-5.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-6.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-6.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-7.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-7.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-8.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-8.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-9.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-9.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/query.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/result.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/data-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-5.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-6.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-boolean-literal.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-5.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-6.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-boolean-literal.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/bound1-result.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/bound1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-bool.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-bool.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-dT.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-dT.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-dbl.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-dbl.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-dec.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-dec.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-flt.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-flt.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-int.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-int.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-str.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/cast-str.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/cast/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/data-ident.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/data-opt.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/data-reif.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-construct-optional.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-ident.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-reif-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-reif-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-subgraph.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-construct-optional.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-ident.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-reif.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-subgraph.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-01.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-02.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-03.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-04.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-05.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-06.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-07.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-08.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-09.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-10.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-11.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-12.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-all.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-node.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-num.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-opt.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-star.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-str.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-1-results.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-all.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-node.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-num.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-opt.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-star-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-star-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-str.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-all.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-node.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-num.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-opt.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-str.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-builtin-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-langMatches-de.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-langMatches.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-insensitive-eq.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-insensitive-ne.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity-eq.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity-ne.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-blank-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-datatype-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-datatype-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-datatype-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-iri-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-isliteral-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-lang-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-lang-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-lang-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-de-de.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-uri-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-blank-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-datatype-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-datatype-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-datatype-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-iri-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-isliteral-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-lang-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-lang-2.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-lang-3.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-de.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-sameTerm-eq.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-sameTerm-not-eq.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-sameTerm.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-uri-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/sameTerm-eq.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/sameTerm-not-eq.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/sameTerm.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/data-eq.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-5.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-5.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq2-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq2-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq2-graph-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-5.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-5.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq2-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq2-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq2-graph-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-ge-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-le-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-minus-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-mul-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-plus-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-unminus-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-unplus-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-ge-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-le-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-minus-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-mul-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-plus-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-unminus-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-unplus-1.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/extended-manifest-evaluation.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/files-to-fix
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/foo
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-01.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-02.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-03.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-04.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-05.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-06.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-07.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-08.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-09.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-10.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-11.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/.htaccess
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-01-results.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-02-results.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-01-results.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-01.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-02-results.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-02.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-03-results.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-03.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/manifest-evaluation.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/manifest-syntax.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-1-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-2-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-3-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-4-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-01-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-02-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-01-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-02-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-03-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-04-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-05-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-06-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-07-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-08-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-09-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-10-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-11-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-12-result.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm-StringSimpleLiteralCmp.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm-eq-StringSimpleLiteralCmp.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm-eq.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm-manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm-not-eq-StringSimpleLiteralCmp.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm-not-eq.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm.srx
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/sameTerm.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/complex-data-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/complex-data-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-complex-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-complex-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-complex-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/q-opt-complex-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-complex-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-complex-2.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-complex-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional/result-opt-complex-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/data-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/expr-1-result.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/expr-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/expr-2-result.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/expr-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/expr-3-result.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/expr-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/optional-filter/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-data-01.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-query-001.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-query-002.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-query-003.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-query-004.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-result-001.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-result-002.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-result-003.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/regex/regex-result-004.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/slice/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/data.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-13.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-20.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-21.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-22.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-23.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-24.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-01.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-02.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-03.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-04.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-10.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-11.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-12.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-13.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-20.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-21.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-22.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-23.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/solution-seq/slice-results-24.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/.manifest.ttl.swp
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-1.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-11.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-3.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-4.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-6.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-7.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-8.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-9.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-builtin.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-function.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/data-sort-numbers.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/extended-manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-1.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-2.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-3.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-4.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-5.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-6.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-9.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-builtin.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-function.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/query-sort-numbers.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-1.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-10.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-11.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-2.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-3.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-4.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-5.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-6.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-7.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-8.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-9.rdf
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-builtin.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-function.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/sort/result-sort-numbers.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-basic-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-basic-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-basic-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-basic-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-basic-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-basic-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-bnodes-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-bnodes-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-bnodes-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-bnodes-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-bnodes-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-expr-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-expr-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-expr-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-expr-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-expr-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-forms-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-forms-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-limit-offset-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-limit-offset-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-limit-offset-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-limit-offset-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lists-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lists-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lists-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lists-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lists-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-13.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-14.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-15.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-16.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-17.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-18.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-19.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-lit-20.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-order-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-pat-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-pat-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-pat-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-pat-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-qname-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-13.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-struct-14.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-union-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql1/syntax-union-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-bnode-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-bnode-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-bnode-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-dataset-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-dataset-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-dataset-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-dataset-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-esc-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-esc-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-esc-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-esc-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-esc-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-ask-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-construct01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-construct02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-construct03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-construct04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-construct06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-describe01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-describe02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-select-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-form-select-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-function-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-function-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-function-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-function-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-13.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-general-14.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-graph-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-graph-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-graph-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-graph-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-graph-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-keywords-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-keywords-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-keywords-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-lists-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-lists-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-lists-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-lists-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql2/syntax-lists-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/manifest.ttl
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/manifest.ttl.bak
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-01.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-02.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-03.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-04.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-05.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-06.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-07.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-08.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-09.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-10.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-11.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-12.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-13.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-14.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-15.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-16.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/syntax-sparql3/syn-bad-17.rq
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-...
 
[truncated message content]

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [539] trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/ data-r2/

From: <cw...@us...> - 2007-09-20 07:25:07

Revision: 539
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=539&view=rev
Author:   cweiske
Date:     2007-09-20 00:25:04 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Remove DAWG r2 tests to replace them with a current version

Removed Paths:
-------------
    trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [538] trunk/rdfapi-php

From: <cw...@us...> - 2007-09-19 19:35:24

Revision: 538
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=538&view=rev
Author:   cweiske
Date:     2007-09-19 12:35:23 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
- Make tokenization function testable
- Add support for """ quotations

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/SparqlParser.php
    trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php

Modified: trunk/rdfapi-php/api/sparql/SparqlParser.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlParser.php	2007-09-18 17:55:11 UTC (rev 537)
+++ trunk/rdfapi-php/api/sparql/SparqlParser.php	2007-09-19 19:35:23 UTC (rev 538)
@@ -106,9 +106,9 @@
 
         if ($queryString) {
             $this->query->setQueryString($queryString);
-            $uncommentedQuery = $this->uncomment($queryString);
-            $this->tokenize($uncommentedQuery);
+            $uncommentedQuery  = $this->uncomment($queryString);
             $this->queryString = $uncommentedQuery;
+            $this->tokens      = self::tokenize($uncommentedQuery);
             $this->parseQuery();
             if (!$this->query->isComplete()) {
                 throw new SparqlParserException(
@@ -126,7 +126,7 @@
             $this->query->isEmpty = true;
         }
         return $this->query;
-    }
+    }//public function parse($queryString = false)
 
 
 
@@ -143,35 +143,66 @@
         // add the default prefixes defined in constants.php
         global $default_prefixes;
         $this->query->prefixes = $default_prefixes;
-    }
+    }//protected function prepare()
 
 
 
     /**
-    * Tokenizes the query string.
+    * Tokenizes the query string into $tokens.
+    * The query may not contain any comments.
     *
-    * @param  String $queryString
-    * @return void
+    * @param  string $queryString Query to split into tokens
+    *
+    * @return array Tokens
     */
-    protected function tokenize($queryString)
+    public static function tokenize($queryString)
     {
-        $queryString = trim($queryString);
-        $specialChars = array(" ", "\t", "\r", "\n", ",", "(", ")","{","}",'"',"'",";","[","]");
-        $len = strlen($queryString);
-        $this->tokens[0]='';
-        $n = 0;
-        for ($i=0; $i<$len; ++$i) {
+        $queryString  = trim($queryString);
+        $specialChars = array(' ', "\t", "\r", "\n", ',', '\\', '(', ')','{','}','"',"'",';','[',']');
+        $len          = strlen($queryString);
+        $tokens       = array('');
+        $n            = 0;
+
+        for ($i = 0; $i < $len; ++$i) {
             if (!in_array($queryString{$i}, $specialChars)) {
-                $this->tokens[$n] .= $queryString{$i};
+                $tokens[$n] .= $queryString{$i};
             } else {
-                if ($this->tokens[$n] != '') {
+                if ($tokens[$n] != '') {
                     ++$n;
+                    if (!isset($tokens[$n])) {
+                        $tokens[$n] = '';
+                    }
                 }
-                $this->tokens[$n] = $queryString{$i};
-                $this->tokens[++$n] = '';
+                if ($queryString{$i} == "'" && $n > 1
+                  && $tokens[$n - 2] == "'" && $tokens[$n - 1] == "'"
+                ) {
+                    //special ''' quotation
+                    $tokens[$n - 2] = "'''";
+                    $tokens[$n - 1] = '';
+                    unset($tokens[$n]);
+                    --$n;
+                    continue;
+                } else if ($queryString{$i} == '"' && $n > 1
+                  && $tokens[$n - 2] == '"' && $tokens[$n - 1] == '"'
+                ) {
+                    //special """ quotation
+                    $tokens[$n - 2] = '"""';
+                    $tokens[$n - 1] = '';
+                    unset($tokens[$n]);
+                    --$n;
+                    continue;
+                } else if ($queryString{$i} == '\\') {
+                    $tokens[$n] .= substr($queryString, $i, 2);
+                    ++$i;
+                    continue;
+                }
+                $tokens[$n] = $queryString{$i};
+                $tokens[++$n] = '';
             }
         }
-    }
+//var_dump($tokens);
+        return $tokens;
+    }//public static function tokenize($queryString)
 
 
 
@@ -184,14 +215,12 @@
     */
     protected function uncomment($queryString)
     {
-        // php appears to escape quotes, so unescape them
-          $queryString = str_replace('\"',"'",$queryString);
-          $queryString = str_replace("\'",'"',$queryString);
-
         $regex ="/((\"[^\"]*\")|(\'[^\']*\')|(\<[^\>]*\>))|(#.*)/";
         return preg_replace($regex,'\1',$queryString);
-    }
+    }//protected function uncomment($queryString)
 
+
+
     /**
     * Starts parsing the tokenized SPARQL Query.
     *
@@ -237,7 +266,7 @@
             }
         } while (next($this->tokens));
 
-    }
+    }//protected function parseQuery()
 
 
 
@@ -545,45 +574,56 @@
     }
 
 
+
     /**
     * Checks if $token is a Literal.
     *
-    * @param  String  $token The token
+    * @param string $token The token
+    *
     * @return boolean TRUE if the token is a Literal false if not
     */
-    protected function literalCheck($token){
-        $pattern="/^[\"\'].*$/";
-        if(preg_match($pattern,$token)>0)
-        return true;
+    protected function literalCheck($token)
+    {
+        $pattern = "/^[\"\'].*$/";
+        if (preg_match($pattern,$token) > 0) {
+            return true;
+        }
         return false;
-    }
+    }//protected function literalCheck($token)
 
+
+
     /**
     * FastForward until next token which is not blank.
     *
     * @return void
     */
-    protected function _fastForward(){
+    protected function _fastForward()
+    {
         next($this->tokens);
         while(current($this->tokens)==" "|current($this->tokens)==chr(10)|current($this->tokens)==chr(13)|current($this->tokens)==chr(9)){
             next($this->tokens);
         }
-        return;
-    }
+    }//protected function _fastForward()
 
+
+
     /**
     * Rewind until next token which is not blank.
     *
     * @return void
     */
-    protected function _rewind(){
+    protected function _rewind()
+    {
         prev($this->tokens);
         while(current($this->tokens)==" "|current($this->tokens)==chr(10)|current($this->tokens)==chr(13)|current($this->tokens)==chr(9)){
             prev($this->tokens);
         }
         return;
-    }
+    }//protected function _rewind()
 
+
+
     /**
     * Parses a graph pattern.
     *
@@ -1299,12 +1339,13 @@
     * Parses a String to an RDF node.
     *
     * @param  String $node
+    *
     * @return Node   The parsed RDF node
     * @throws SparqlParserException
     */
     protected function parseNode($node = false)
     {
-        $eon = false;
+        //$eon = false;
         if ($node) {
             $node = $node;
         } else {
@@ -1343,19 +1384,12 @@
             $node = new Resource($node);
             return $node;
         } else if ($this->literalCheck($node)) {
-            do {
-                switch(substr($node,0,1)){
-                    case '"':
-                        $this->parseLiteral($node,'"');
-                        $eon = true;
-                        break;
-                    case "'":
-                        $this->parseLiteral($node,"'");
-                        $eon = true;
-                        break;
-                }
-            } while(!$eon);
-
+            $ch     = substr($node, 0, 1);
+            $chLong = str_repeat($ch, 3);
+            if (substr($node, 0, 3) == $chLong) {
+                $ch = $chLong;
+            }
+            $this->parseLiteral($node, $ch);
         } else if ($this->varCheck($node)) {
             $pos = strpos($node,'.');
             if ($pos) {
@@ -1381,21 +1415,24 @@
             return $this->parseNode($node);
         } else {
             throw new SparqlParserException(
-                $node . " is neither a valid rdf- node nor a variable.",
+                '"' . $node . '" is neither a valid rdf- node nor a variable.',
                 null,
                 key($this->tokens)
             );
         }
         return $node;
-    }
+    }//protected function parseNode($node = false)
 
+
+
     /**
     * Checks if there is a datatype given and appends it to the node.
     *
-    * @param  String $node
+    * @param string $node Node to check
+    *
     * @return void
     */
-    protected function checkDtypeLang(&$node)
+    protected function checkDtypeLang(&$node, $nSubstrLength = 1)
     {
         $this->_fastForward();
         switch (substr(current($this->tokens), 0, 1)) {
@@ -1411,24 +1448,26 @@
                 break;
             case '@':
                 $node = new Literal(
-                    substr($node, 1, -1),
-                    substr(current($this->tokens), 1)
+                    substr($node, $nSubstrLength, -$nSubstrLength),
+                    substr(current($this->tokens), $nSubstrLength)
                 );
                 break;
             default:
                 prev($this->tokens);
-                $node = new Literal(substr($node, 1, -1));
+                $node = new Literal(substr($node, $nSubstrLength, -$nSubstrLength));
                 break;
 
         }
+    }//protected function checkDtypeLang(&$node, $nSubstrLength = 1)
 
-    }
 
+
     /**
     * Parses a literal.
     *
     * @param String $node
     * @param String $sep used separator " or '
+    *
     * @return void
     */
     protected function parseLiteral(&$node, $sep)
@@ -1437,13 +1476,16 @@
             next($this->tokens);
             $node = $node.current($this->tokens);
         } while (current($this->tokens) != $sep);
-        $this->checkDtypeLang($node);
-    }
+        $this->checkDtypeLang($node, strlen($sep));
+    }//protected function parseLiteral(&$node, $sep)
 
+
+
     /**
     * Checks if the Node is a typed Literal.
     *
     * @param String $node
+    *
     * @return boolean TRUE if typed FALSE if not
     */
     protected function dtypeCheck(&$node)
@@ -1476,8 +1518,10 @@
             return true;
         }
         return false;
-    }
+    }//protected function dtypeCheck(&$node)
 
+
+
     /**
     * Parses an RDF collection.
     *

Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php	2007-09-18 17:55:11 UTC (rev 537)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php	2007-09-19 19:35:23 UTC (rev 538)
@@ -67,6 +67,16 @@
 
 
 
+    function testTokenizer()
+    {
+        $this->assertEqual(
+            array('abc', "'", 'hi', "'", "'", 'def', "'''", 'rst', "\'", "'", "'", 'xyz'),
+            SparqlParser::tokenize("abc'hi''def'''rst\\'''xyz")
+        );
+    }//function testTokenizer()
+
+
+
     function testEdgeCases()
     {
         $query = <<<EOT
@@ -147,6 +157,7 @@
         $parser = new SparqlParser();
 
         foreach ($_SESSION['sparql_dawg2_tests'] as $test) {
+echo $test['title'] . "\n";
             //use syntax tests only
             if (!isset($test['type']) ||
                 ($test['type'] != 'syntax-positive' &&


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [537] trunk/rdfapi-php

From: <cw...@us...> - 2007-09-18 17:55:19

Revision: 537
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=537&view=rev
Author:   cweiske
Date:     2007-09-18 10:55:11 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
Allow SPARQL debugging

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/Query.php
    trunk/rdfapi-php/api/sparql/SparqlEngineDb.php
    trunk/rdfapi-php/api/sparql/SparqlParser.php
    trunk/rdfapi-php/test/config.php.dist
    trunk/rdfapi-php/test/sparql-test.php
    trunk/rdfapi-php/test/sparqlDb-test.php

Modified: trunk/rdfapi-php/api/sparql/Query.php
===================================================================
--- trunk/rdfapi-php/api/sparql/Query.php	2007-08-20 17:21:35 UTC (rev 536)
+++ trunk/rdfapi-php/api/sparql/Query.php	2007-09-18 17:55:11 UTC (rev 537)
@@ -20,6 +20,12 @@
     protected $base;
 
     /**
+    * Original SPARQL query string
+    * @var string
+    */
+    protected $queryString = null;
+
+    /**
     * Array that contains used prefixes and namespaces.
     * Key is the prefix, value the namespace.
     *
@@ -555,6 +561,30 @@
         return true;
     }//public function isIncomplete()
 
+
+
+    /**
+    * Sets the orignal query string
+    *
+    * @param string $queryString SPARQL query string
+    */
+    public function setQueryString($queryString)
+    {
+        $this->queryString = $queryString;
+    }//public function setQueryString($queryString)
+
+
+
+    /**
+    * Returns the orignal query string
+    *
+    * @return string SPARQL query string
+    */
+    public function getQueryString()
+    {
+        return $this->queryString;
+    }//public function getQueryString()
+
 }// end class: Query.php
 
 
@@ -648,6 +678,7 @@
     {
         return $this->getName();
     }
+
 }//class Query_ResultVariable
 
 ?>
\ No newline at end of file

Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb.php	2007-08-20 17:21:35 UTC (rev 536)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb.php	2007-09-18 17:55:11 UTC (rev 537)
@@ -115,16 +115,23 @@
     */
     public function queryModel($dataset, Query $query, $resultform = false)
     {
+        if (isset($GLOBALS['debugSparql']) && $GLOBALS['debugSparql']) {
+            echo "\n" . 'SPARQL query: ' . $query->getQueryString() . "\n";
+        }
+
         $this->query   = $query;
         $this->dataset = $dataset;
+
         $qsimp = new SparqlEngineDb_QuerySimplifier();
         $qsimp->simplify($this->query);
+
         $this->sg = new SparqlEngineDb_SqlGenerator   ($this->query, $this->dbConn, $this->arModelIds);
         $this->rc = new SparqlEngineDb_ResultConverter($this->query, $this->sg, $this);
         $this->ts = new SparqlEngineDb_TypeSorter     ($this->query, $this->dbConn);
+
         $this->setOptions();
 
-        if($this->query->isEmpty()){
+        if ($this->query->isEmpty()){
             $vartable[0]['patternResult'] = null;
             return $this->returnResult($vartable, $resultform);
         }
@@ -312,7 +319,10 @@
         // I want associative arrays.
         $oldmode = $this->dbConn->SetFetchMode(ADODB_FETCH_ASSOC);
 
-//var_dump($strSql);
+        if (isset($GLOBALS['debugSparql']) && $GLOBALS['debugSparql']) {
+            echo 'SQL query: ' . $strSql . "\n";
+        }
+
         if ($nLimit === null && $nOffset == 0) {
             $ret = $this->dbConn->execute($strSql);
         } else if ($nLimit === null) {

Modified: trunk/rdfapi-php/api/sparql/SparqlParser.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlParser.php	2007-08-20 17:21:35 UTC (rev 536)
+++ trunk/rdfapi-php/api/sparql/SparqlParser.php	2007-09-18 17:55:11 UTC (rev 537)
@@ -105,9 +105,10 @@
         $this->prepare();
 
         if ($queryString) {
+            $this->query->setQueryString($queryString);
             $uncommentedQuery = $this->uncomment($queryString);
             $this->tokenize($uncommentedQuery);
-            $this->querystring = $uncommentedQuery;
+            $this->queryString = $uncommentedQuery;
             $this->parseQuery();
             if (!$this->query->isComplete()) {
                 throw new SparqlParserException(
@@ -136,7 +137,7 @@
     protected function prepare()
     {
         $this->query          = new Query();
-        $this->querystring    = null;
+        $this->queryString    = null;
         $this->tokens         = array();
         $this->tmp            = null;
         // add the default prefixes defined in constants.php
@@ -147,7 +148,7 @@
 
 
     /**
-    * Tokenizes the querystring.
+    * Tokenizes the query string.
     *
     * @param  String $queryString
     * @return void
@@ -1481,6 +1482,7 @@
     * Parses an RDF collection.
     *
     * @param  TriplePattern $trp
+    *
     * @return Node          The first parsed label
     */
     protected function parseCollection(&$trp)
@@ -1498,7 +1500,7 @@
         }
         $trp[] = new QueryTriple($this->parseNode($tmpLabel),new Resource("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"),new Resource("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"));
         return $firstLabel;
-    }
+    }//protected function parseCollection(&$trp)
 
 }// end class: SparqlParser.php
 

Modified: trunk/rdfapi-php/test/config.php.dist
===================================================================
--- trunk/rdfapi-php/test/config.php.dist	2007-08-20 17:21:35 UTC (rev 536)
+++ trunk/rdfapi-php/test/config.php.dist	2007-09-18 17:55:11 UTC (rev 537)
@@ -21,6 +21,9 @@
 //enable this to get more information about failing unit tests
 //$GLOBALS['debugTests'] = true;
 
+//debug SPARQL engine
+//$GLOBALS['debugSparql'] = true;
+
 //used in W3C earl report serialization
 $GLOBALS['earlReport'] = array(
     'reporter' => array(

Modified: trunk/rdfapi-php/test/sparql-test.php
===================================================================
--- trunk/rdfapi-php/test/sparql-test.php	2007-08-20 17:21:35 UTC (rev 536)
+++ trunk/rdfapi-php/test/sparql-test.php	2007-09-18 17:55:11 UTC (rev 537)
@@ -9,9 +9,9 @@
 $model->load(SPARQL_TESTFILES . 'data/model9.n3');
 
 $qs     = 'SELECT * WHERE { ?s ?p ?o}';
-$result = $model->sparqlQuery($qs, 'HTML');
+$result = $model->sparqlQuery($qs);
 
-header('Content-Type: text/html');
-echo $result . "\n";
-//var_dump($result);
+//header('Content-Type: text/html');
+//echo $result . "\n";
+var_dump($result);
 ?>
\ No newline at end of file

Modified: trunk/rdfapi-php/test/sparqlDb-test.php
===================================================================
--- trunk/rdfapi-php/test/sparqlDb-test.php	2007-08-20 17:21:35 UTC (rev 536)
+++ trunk/rdfapi-php/test/sparqlDb-test.php	2007-09-18 17:55:11 UTC (rev 537)
@@ -36,6 +36,10 @@
 UNION {?value ?p ?o . FILTER (isIRI(?value)) }
       }
 EOT;
-var_dump($dbModel->sparqlQuery($qs));
+$qs = <<<EOT
+SELECT DISTINCT datatype(?o) as ?dt WHERE { ?s ?p ?o} LIMIT 3
+EOT;
+$qs= '-';
+var_dump($database->sparqlQuery($qs, null));
 //echo $dbModel->sparqlQuery($qs, 'HTML');
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [536] trunk/rdfapi-php/api/sparql/SparqlEngineDb/ TypeSorter.php

From: <cw...@us...> - 2007-08-20 17:21:36

Revision: 536
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=536&view=rev
Author:   cweiske
Date:     2007-08-20 10:21:35 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Add decimal support for sparqldb ordering

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php

Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php	2007-08-16 09:55:00 UTC (rev 535)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php	2007-08-20 17:21:35 UTC (rev 536)
@@ -28,6 +28,7 @@
     */
     public static $arCastTypes = array(
         'http://www.w3.org/2001/XMLSchema#integer'  => 'SIGNED INTEGER',
+        'http://www.w3.org/2001/XMLSchema#decimal'  => 'DECIMAL',
         //yes, this does not work with multiple time zones.
         'http://www.w3.org/2001/XMLSchema#dateTime' => 'CHAR',
         'http://www.w3.org/2001/XMLSchema#date'     => 'CHAR',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [535] trunk/rdfapi-php/test/unit

From: <cw...@us...> - 2007-08-16 09:55:03

Revision: 535
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=535&view=rev
Author:   cweiske
Date:     2007-08-16 02:55:00 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Don't rely on blanknodecounter being 0 - happens when running multiple tests

Modified Paths:
--------------
    trunk/rdfapi-php/test/unit/Syntax/n3Serializer_test.php
    trunk/rdfapi-php/test/unit/allTests.php

Modified: trunk/rdfapi-php/test/unit/Syntax/n3Serializer_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Syntax/n3Serializer_test.php	2007-08-16 09:45:20 UTC (rev 534)
+++ trunk/rdfapi-php/test/unit/Syntax/n3Serializer_test.php	2007-08-16 09:55:00 UTC (rev 535)
@@ -216,8 +216,7 @@
         $mod2 = $par->parse2model($str, false);
 
         $this->assertEqual($mod->size(), $mod2->size(), 'Original model size and loaded model size should equal');
-        $this->assertTrue($mod->containsAll($mod2), 'Original model should contain all triples of loaded model');
-        $this->assertTrue($mod2->containsAll($mod), 'Loaded model should contain all triples of original model');
+        $this->compareModelsIgnoringBlankNodes($mod, $mod2);
     }
 
 

Modified: trunk/rdfapi-php/test/unit/allTests.php
===================================================================
--- trunk/rdfapi-php/test/unit/allTests.php	2007-08-16 09:45:20 UTC (rev 534)
+++ trunk/rdfapi-php/test/unit/allTests.php	2007-08-16 09:55:00 UTC (rev 535)
@@ -110,7 +110,6 @@
 
 $test_model->run(new $runnerClass());
 
-
 // =============================================================================
 // *************************** package Syntax **********************************
 // =============================================================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [534] trunk/rdfapi-php/test/unit/allTests.php

From: <cw...@us...> - 2007-08-16 09:45:21

Revision: 534
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=534&view=rev
Author:   cweiske
Date:     2007-08-16 02:45:20 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Use TextRunner when on cli

Modified Paths:
--------------
    trunk/rdfapi-php/test/unit/allTests.php

Modified: trunk/rdfapi-php/test/unit/allTests.php
===================================================================
--- trunk/rdfapi-php/test/unit/allTests.php	2007-08-16 09:32:03 UTC (rev 533)
+++ trunk/rdfapi-php/test/unit/allTests.php	2007-08-16 09:45:20 UTC (rev 534)
@@ -86,6 +86,13 @@
     fputs($file,"\r\n".'-----'.$time.'-----'."\r\n");
 }
 
+if (TextReporter::inCli()) {
+    $runnerClass = 'TextReporter';
+} else {
+    $runnerClass = 'ShowPasses';
+}
+
+
 // =============================================================================
 // *************************** package Model ***********************************
 // =============================================================================
@@ -101,7 +108,7 @@
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/Model/getModelByRDQL_tests.php');
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/Model/modelEquals_test.php');
 
-$test_model->run(new ShowPasses());
+$test_model->run(new $runnerClass());
 
 
 // =============================================================================
@@ -114,7 +121,7 @@
 $test_syntax->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Syntax/rdf_Parser_tests.php');
 $test_syntax->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Syntax/rdf_Serializer_tests.php');
 //$test_syntax->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/rdf/rdf_test_cases.php');
-$test_syntax->run(new ShowPasses());
+$test_syntax->run(new $runnerClass());
 
 // =============================================================================
 // *************************** package Utility *********************************
@@ -123,7 +130,7 @@
 $test_util = &new GroupTest('Utility tests');
 $test_util->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/utility/ut_FindIterator_tests.php');
 $test_util->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/utility/ut_it_tests.php');
-$test_util->run(new ShowPasses());
+$test_util->run(new $runnerClass());
  // =============================================================================
 // *************************** package InfModel ********************************
 // =============================================================================
@@ -140,7 +147,7 @@
 $test_inf->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/InfModel/InfModelB_jena_rdfs_test.php');
 $test_inf->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/InfModel/InfModelF_entailment_test.php');
 //$test_inf->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/InfModel/InfModelB_entailment_test.php');
-$test_inf->run(new ShowPasses());
+$test_inf->run(new $runnerClass());
 
 // =============================================================================
 // *************************** package ResModel ********************************
@@ -149,14 +156,14 @@
 $test_res->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/ResModel/ResModel_BasicOperations_tests.php');
 $test_res->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/ResModel/ResModel_Property_tests.php');
 $test_res->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/ResModel/ResModel_search_tests.php');
-$test_res->run(new ShowPasses());
+$test_res->run(new $runnerClass());
 
 // =============================================================================
 // *************************** package OntModel ********************************
 // =============================================================================
 $test_ont= &new GroupTest('OntModel basic operations tests');
 $test_ont->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/OntModel/OntModel_BasicOperations_tests.php');
-$test_ont->run(new ShowPasses());
+$test_ont->run(new $runnerClass());
 
 
 // =============================================================================
@@ -165,7 +172,7 @@
 
 $test_voc= &new GroupTest('Vocabulary tests');
 //$test_voc->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Vocabulary/voc_tests.php');
-$test_voc->run(new ShowPasses());
+$test_voc->run(new $runnerClass());
 
 // =============================================================================
 // *************************** namespace handling ******************************
@@ -174,7 +181,7 @@
 
 $test_nms= &new GroupTest('Namespace tests');
 $test_nms->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Namespaces/Namespace_handling_tests.php');
-$test_nms->run(new ShowPasses());
+$test_nms->run(new $runnerClass());
 
 
 // =============================================================================
@@ -183,7 +190,7 @@
 
 $test_ng= &new GroupTest('Named Graphs api tests');
 $test_ng->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Namedgraphs/Namedgraphs_tests.php');
-$test_ng->run(new ShowPasses());
+$test_ng->run(new $runnerClass());
 
 // =============================================================================
 // ******************************* sparql tests ********************************
@@ -194,7 +201,7 @@
 $test_sparql->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Sparql/SparqlParserTests_test.php');
 $test_sparql->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Sparql/SparqlTests_test.php');
 $test_sparql->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Sparql/SparqlDbTests_test.php');
-$test_sparql->run(new ShowPasses());
+$test_sparql->run(new $runnerClass());
 
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [533] trunk/rdfapi-php

From: <cw...@us...> - 2007-08-16 09:32:05

Revision: 533
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=533&view=rev
Author:   cweiske
Date:     2007-08-16 02:32:03 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
If getParsedNamespaces() does not return false if there are no namespaces,
 we break a mass of tests

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php
    trunk/rdfapi-php/test/unit/Model/dBModel_test.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:19:56 UTC (rev 532)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:32:03 UTC (rev 533)
@@ -1151,15 +1151,18 @@
 	/**
 	* Returns the models namespaces.
 	*
-	* @author   Tobias Gau�<tob...@we...>
+	* @author   Tobias Gauss <tob...@we...>
+	* @return mixed Array of key-value pairs. Namespace is the key,
+	*               prefix the value. If no namespaces are found,
+	*               boolean false is returned.
+	*
 	* @access   public
-	* @return   Array
 	*/
 	function getParsedNamespaces(){
 		$sql = "SELECT * FROM namespaces
            WHERE modelID = " .$this->modelID;
-		$temp=array();
-		$res = $this->dbConn->execute($sql);
+		$temp = false;
+		$res  = $this->dbConn->execute($sql);
 		if($res){
 			while (!$res->EOF) {
 				$temp[$res->fields[1]]=$res->fields[2];
@@ -1176,9 +1179,10 @@
 	* the parser. !!!! addParsedNamespaces() not overwrites manual
 	* added namespaces in the model !!!!
 	*
-	* @author   Tobias Gau�<tob...@we...>
+	* @author Tobias Gauss <tob...@we...>
+	* @param array $newNs Array of namespace => prefix assignments
+	*
 	* @access   public
-	* @param    Array $newNs
 	*/
 	function addParsedNamespaces($newNs){
 		if($newNs)
@@ -1191,9 +1195,11 @@
 	/**
 	* Adds a namespace and prefix to the model.
 	*
-	* @author   Tobias Gau�<tob...@we...>
+	* @author   Tobias Gauss <tob...@we...>
+	* @param string $prefix Prefix
+	* @param string $nmsp   Namespace URI
+    *
 	* @access   public
-	* @param    String $prefix, String $nmsp
 	*/
 	function addNamespace($prefix,$nmsp){
 
@@ -1254,20 +1260,26 @@
 	}
 
 	/**
-	* removes a single namespace from the model
+	* Removes a single namespace from the model
 	*
-	* @author   Tobias Gau�<tob...@we...>
+	* @author Tobias Gauss <tob...@we...>
+	* @param string $nmsp Namespace URI
+	*
+	* @return mixed True if all went well, error message otherwise
+	*
 	* @access   public
-	* @param    String $nmsp
 	*/
 	function removeNamespace($nmsp){
 
-		$sql = 'DELETE FROM namespaces
+        $sql = 'DELETE FROM namespaces
            WHERE modelID=' .$this->modelID." AND namespace=". $this->dbConn->qstr($nmsp);
 
-		$rs =& $this->dbConn->execute($sql);
-		if (!$rs)
-		  return $this->dbConn->errorMsg();
+        $rs =& $this->dbConn->execute($sql);
+        if (!$rs)
+            return $this->dbConn->errorMsg();
+        else {
+            return true;
+        }
 	}
 
 

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:19:56 UTC (rev 532)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:32:03 UTC (rev 533)
@@ -119,7 +119,7 @@
         $dbmodel = $mysql_database->getModel(self::$strModelUri);
 
         //no namespaces
-        $this->assertIdentical(array(), $dbmodel->getParsedNamespaces());
+        $this->assertIdentical(false, $dbmodel->getParsedNamespaces());
 
         //one namespace
         $dbmodel->addNamespace('test', 'http://test.org');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [532] trunk/rdfapi-php/test/unit/allTests.php

From: <cw...@us...> - 2007-08-16 09:19:58

Revision: 532
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=532&view=rev
Author:   cweiske
Date:     2007-08-16 02:19:56 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
enable dbmodel tests

Modified Paths:
--------------
    trunk/rdfapi-php/test/unit/allTests.php

Modified: trunk/rdfapi-php/test/unit/allTests.php
===================================================================
--- trunk/rdfapi-php/test/unit/allTests.php	2007-08-16 09:19:14 UTC (rev 531)
+++ trunk/rdfapi-php/test/unit/allTests.php	2007-08-16 09:19:56 UTC (rev 532)
@@ -96,7 +96,7 @@
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Model/mm_index_tests.php');
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Model/literals_tests.php');
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Model/blanknode_test.php');
-//$test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Model/dBModel_test.php');
+$test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. 'test/unit/Model/dBModel_test.php');
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/Model/mm_search_tests.php');
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/Model/getModelByRDQL_tests.php');
 $test_model->addTestFile(RDFAPI_TEST_INCLUDE_DIR. '/test/unit/Model/modelEquals_test.php');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [531] trunk/rdfapi-php

From: <cw...@us...> - 2007-08-16 09:19:18

Revision: 531
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=531&view=rev
Author:   cweiske
Date:     2007-08-16 02:19:14 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Finishing namespace unit test

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php
    trunk/rdfapi-php/test/unit/Model/dBModel_test.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:12:27 UTC (rev 530)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:19:14 UTC (rev 531)
@@ -1267,7 +1267,7 @@
 
 		$rs =& $this->dbConn->execute($sql);
 		if (!$rs)
-		$this->dbConn->errorMsg();
+		  return $this->dbConn->errorMsg();
 	}
 
 

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:12:27 UTC (rev 530)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:19:14 UTC (rev 531)
@@ -117,8 +117,8 @@
         $mysql_database->putModel($this->_generateModelLiteral(),self::$strModelUri);
 
         $dbmodel = $mysql_database->getModel(self::$strModelUri);
+
         //no namespaces
-var_dump($dbmodel->getParsedNamespaces());
         $this->assertIdentical(array(), $dbmodel->getParsedNamespaces());
 
         //one namespace
@@ -128,6 +128,56 @@
             $dbmodel->getParsedNamespaces()
         );
 
+        //two namespaces
+        $dbmodel->addNamespace('test2', 'http://test2.org');
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test2.org' => 'test2',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        //adding multiple namespaces
+        $dbmodel->addParsedNamespaces(
+            array(
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            )
+        );
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test2.org' => 'test2',
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        //adding empty array
+        $dbmodel->addParsedNamespaces(array());
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test2.org' => 'test2',
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        //removing namespace
+        $dbmodel->removeNamespace('http://test2.org');
+        $this->assertEqual(
+            array(
+                'http://test.org' => 'test',
+                'http://test3.org' => 'test3',
+                'http://test4.org' => 'test4',
+            ),
+            $dbmodel->getParsedNamespaces()
+        );
+
         $dbmodel->delete();
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [530] trunk/rdfapi-php

From: <cw...@us...> - 2007-08-16 09:12:29

Revision: 530
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=530&view=rev
Author:   cweiske
Date:     2007-08-16 02:12:27 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
When deleting model, also delete namespaces

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php
    trunk/rdfapi-php/test/unit/Model/dBModel_test.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:06:06 UTC (rev 529)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:12:27 UTC (rev 530)
@@ -940,6 +940,8 @@
                                   WHERE modelID=' .$this->modelID);
 		$this->dbConn->execute('DELETE FROM statements
                                   WHERE modelID=' .$this->modelID);
+		$this->dbConn->execute('DELETE FROM namespaces
+                                  WHERE modelID=' .$this->modelID);
 
 		if (!$this->dbConn->completeTrans())
 		echo $this->dbConn->errorMsg();

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:06:06 UTC (rev 529)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:12:27 UTC (rev 530)
@@ -118,8 +118,17 @@
 
         $dbmodel = $mysql_database->getModel(self::$strModelUri);
         //no namespaces
+var_dump($dbmodel->getParsedNamespaces());
         $this->assertIdentical(array(), $dbmodel->getParsedNamespaces());
 
+        //one namespace
+        $dbmodel->addNamespace('test', 'http://test.org');
+        $this->assertEqual(
+            array('http://test.org' => 'test'),
+            $dbmodel->getParsedNamespaces()
+        );
+
+        $dbmodel->delete();
     }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [529] trunk/rdfapi-php

From: <cw...@us...> - 2007-08-16 09:06:08

Revision: 529
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=529&view=rev
Author:   cweiske
Date:     2007-08-16 02:06:06 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
getParsedNamespaces() should return empty array instead of
 boolean false if there are no namespaces

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php
    trunk/rdfapi-php/test/unit/Model/dBModel_test.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 08:57:35 UTC (rev 528)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 09:06:06 UTC (rev 529)
@@ -1156,7 +1156,7 @@
 	function getParsedNamespaces(){
 		$sql = "SELECT * FROM namespaces
            WHERE modelID = " .$this->modelID;
-		$temp=false;
+		$temp=array();
 		$res = $this->dbConn->execute($sql);
 		if($res){
 			while (!$res->EOF) {

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 08:57:35 UTC (rev 528)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 09:06:06 UTC (rev 529)
@@ -13,14 +13,16 @@
  * @access	public
  */
 
-class dBModel_test extends UnitTestCase {
+class dBModel_test extends UnitTestCase
+{
+    protected static $strModelUri = 'http://example.org/rap-unittests-dbmodel';
 
 	function testSize(){
 		$mysql_database = $this->createDatabaseConnection();
 		//$mysql_database->createTables('MySQL');
 		$_SESSION['test']='DbModel size test';
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(), self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$this->assertEqual($dbmodel->size(),1);
 	    $dbmodel->delete();
 	}
@@ -29,8 +31,8 @@
 	function testAdd(){
 		$_SESSION['test']='DbModel add test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
 		$dbmodel->add($statement);
 		$this->assertTrue($dbmodel->contains($statement));
@@ -42,8 +44,8 @@
 	function testRemove(){
 		$_SESSION['test']='DbModel remove test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
 		$dbmodel->remove($statement);
 		$mod1=$dbmodel->getMemModel();
@@ -55,8 +57,8 @@
 	function testSetBaseUri(){
 		$_SESSION['test']='DbModel setBaseURI test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$this->assertEqual($dbmodel->baseURI,'http://www.example.org#');
 		$dbmodel->delete();
 	}
@@ -65,8 +67,8 @@
 	function testContains(){
 		$_SESSION['test']='DbModel testContains test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$stat=new Statement(new Resource('http://www.example.org/subject1'),new Resource('http://www.example.org/predicate1'),new Resource('http://www.example.org/object1'));
 		$stat2=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
 		$this->assertTrue($dbmodel->contains($stat));
@@ -77,8 +79,8 @@
 	function testContainsAll(){
 		$_SESSION['test']='DbModel testContainsAll test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAll($memModel));
 		$dbmodel->delete();
@@ -87,8 +89,8 @@
 	function testContainsAny(){
 		$_SESSION['test']='DbModel testContainsAny test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModel(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAny($memModel));
 		$dbmodel->delete();
@@ -98,8 +100,8 @@
 	function testLiteral(){
 		$_SESSION['test']='DbModel testContainsAny test';
 		$mysql_database = $this->createDatabaseConnection();
-		$mysql_database->putModel($this->_generateModelLiteral(),'http://www.example.org');
-		$dbmodel=$mysql_database->getModel('http://www.example.org');
+		$mysql_database->putModel($this->_generateModelLiteral(),self::$strModelUri);
+		$dbmodel=$mysql_database->getModel(self::$strModelUri);
 		$memModel=$dbmodel->getMemModel();
 		$stat=$memModel->triples[0];
 		$obj=$stat->getObject();
@@ -108,8 +110,19 @@
 		$dbmodel->delete();
 	}
 
+    function testNamespaces()
+    {
+        $_SESSION['test']='DbModel testNamespaces test';
+        $mysql_database = $this->createDatabaseConnection();
+        $mysql_database->putModel($this->_generateModelLiteral(),self::$strModelUri);
 
+        $dbmodel = $mysql_database->getModel(self::$strModelUri);
+        //no namespaces
+        $this->assertIdentical(array(), $dbmodel->getParsedNamespaces());
 
+    }
+
+
 //===================================================================
 //                helper functions
 //===================================================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [528] trunk/rdfapi-php/api/model/DbModel.php

From: <cw...@us...> - 2007-08-16 08:57:36

Revision: 528
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=528&view=rev
Author:   cweiske
Date:     2007-08-16 01:57:35 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
fix e_notice

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 08:56:31 UTC (rev 527)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 08:57:35 UTC (rev 528)
@@ -248,7 +248,8 @@
 	function & getMemModel() {
 
 		$recordSet = $this->_getRecordSet($this);
-		return $this->_convertRecordSetToMemModel($recordSet);
+		$m = $this->_convertRecordSetToMemModel($recordSet);
+		return $m;
 	}
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [527] trunk/rdfapi-php/test/unit/Model/dBModel_test .php

From: <cw...@us...> - 2007-08-16 08:56:34

Revision: 527
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=527&view=rev
Author:   cweiske
Date:     2007-08-16 01:56:31 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Make DBModel tests use config.php db settings

Modified Paths:
--------------
    trunk/rdfapi-php/test/unit/Model/dBModel_test.php

Modified: trunk/rdfapi-php/test/unit/Model/dBModel_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 07:22:32 UTC (rev 526)
+++ trunk/rdfapi-php/test/unit/Model/dBModel_test.php	2007-08-16 08:56:31 UTC (rev 527)
@@ -7,7 +7,7 @@
  * This class tests the functions of DbModel and DbStore
  *
  * @version  $Id$
- * @author Tobias Gau\xDF	<tob...@we...>
+ * @author Tobias Gauss <tob...@we...>
  *
  * @package unittests
  * @access	public
@@ -16,19 +16,19 @@
 class dBModel_test extends UnitTestCase {
 
 	function testSize(){
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		//$mysql_database->createTables('MySQL');
 		$_SESSION['test']='DbModel size test';
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
-		$this->assertEqual($dbmodel->size(),1);	
+		$this->assertEqual($dbmodel->size(),1);
 	    $dbmodel->delete();
 	}
-	
 
+
 	function testAdd(){
 		$_SESSION['test']='DbModel add test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
@@ -37,11 +37,11 @@
 		$this->assertEqual($dbmodel->size(),2);
 		$dbmodel->delete();
 	}
-	
 
+
 	function testRemove(){
 		$_SESSION['test']='DbModel remove test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$statement=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
@@ -50,54 +50,54 @@
 		$this->assertFalse($dbmodel->contains($statement));
 		$dbmodel->delete();
 	}
-	
-	
+
+
 	function testSetBaseUri(){
 		$_SESSION['test']='DbModel setBaseURI test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
-		$this->assertEqual($dbmodel->baseURI,'http://www.example.org#');	
+		$this->assertEqual($dbmodel->baseURI,'http://www.example.org#');
 		$dbmodel->delete();
 	}
-	
-	
+
+
 	function testContains(){
 		$_SESSION['test']='DbModel testContains test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$stat=new Statement(new Resource('http://www.example.org/subject1'),new Resource('http://www.example.org/predicate1'),new Resource('http://www.example.org/object1'));
 		$stat2=new Statement(new Resource('http://www.example.org/subject2'),new Resource('http://www.example.org/predicate2'),new Resource('http://www.example.org/object2'));
-		$this->assertTrue($dbmodel->contains($stat));	
-		$this->assertFalse($dbmodel->contains($stat2));	
+		$this->assertTrue($dbmodel->contains($stat));
+		$this->assertFalse($dbmodel->contains($stat2));
 		$dbmodel->delete();
 	}
-	
+
 	function testContainsAll(){
 		$_SESSION['test']='DbModel testContainsAll test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAll($memModel));
 		$dbmodel->delete();
 	}
-	
+
 	function testContainsAny(){
 		$_SESSION['test']='DbModel testContainsAny test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModel(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$memModel=$this->_generateModel();
 		$this->assertTrue($dbmodel->containsAny($memModel));
 		$dbmodel->delete();
 	}
-	
-	
+
+
 	function testLiteral(){
 		$_SESSION['test']='DbModel testContainsAny test';
-		$mysql_database = new DbStore('MySQL', 'localhost', 'rdf_db', 'test_user', '1234');
+		$mysql_database = $this->createDatabaseConnection();
 		$mysql_database->putModel($this->_generateModelLiteral(),'http://www.example.org');
 		$dbmodel=$mysql_database->getModel('http://www.example.org');
 		$memModel=$dbmodel->getMemModel();
@@ -107,9 +107,9 @@
 		$this->assertEqual($obj->getLanguage(),'DE');
 		$dbmodel->delete();
 	}
-	
-	
- 	
+
+
+
 //===================================================================
 //                helper functions
 //===================================================================
@@ -141,6 +141,19 @@
 		return $model;
 	}
 
+
+
+    function createDatabaseConnection()
+    {
+        return new DbStore(
+            $GLOBALS['dbConf']['type'],
+            $GLOBALS['dbConf']['host'],
+            $GLOBALS['dbConf']['database'],
+            $GLOBALS['dbConf']['user'],
+            $GLOBALS['dbConf']['password']
+        );
+    }
+
 }
- 	
+
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [526] trunk/rdfapi-php/api/model/DbModel.php

From: <cw...@us...> - 2007-08-16 07:22:33

Revision: 526
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=526&view=rev
Author:   cweiske
Date:     2007-08-16 00:22:32 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Bug: Namespace was quoted twice
WE NEED UNIT TESTS

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/DbModel.php

Modified: trunk/rdfapi-php/api/model/DbModel.php
===================================================================
--- trunk/rdfapi-php/api/model/DbModel.php	2007-08-14 16:46:23 UTC (rev 525)
+++ trunk/rdfapi-php/api/model/DbModel.php	2007-08-16 07:22:32 UTC (rev 526)
@@ -1124,21 +1124,20 @@
 	*/
 	function _containsRow ($row) {
 
-		$quotedObject = $this->dbConn->qstr($row[2]);
 		$sql = "SELECT modelID FROM statements
            WHERE modelID = " .$this->modelID ."
-           AND subject ='" .$row[0] ."'
-           AND predicate ='" .$row[1] ."'
-           AND object =" .$quotedObject ."
-           AND l_language='" .$row[3] ."'
-           AND l_datatype='" .$row[4] ."'
-           AND subject_is='" .$row[5] ."'
-           AND object_is='" .$row[6] ."'";
+           AND subject ="   .$this->dbConn->qstr($row[0]) ."
+           AND predicate =" .$this->dbConn->qstr($row[1]) ."
+           AND object ="    .$this->dbConn->qstr($row[2]) ."
+           AND l_language=" .$this->dbConn->qstr($row[3]) ."
+           AND l_datatype=" .$this->dbConn->qstr($row[4]) ."
+           AND subject_is=" .$this->dbConn->qstr($row[5]) ."
+           AND object_is="  .$this->dbConn->qstr($row[6]);
 
 		$res =& $this->dbConn->getOne($sql);
 
 		if (!$res)
-		return FALSE;
+		  return FALSE;
 		return TRUE;
 	}
 
@@ -1197,15 +1196,15 @@
 
 		if($nmsp != '' && $prefix !=''){
 			if($this->_checkNamespace($nmsp)){
-				$sql = "UPDATE namespaces SET prefix='".$prefix."' WHERE
-				modelID=".$this->modelID." AND namespace='".$nmsp."'";
+				$sql = "UPDATE namespaces SET prefix=".$this->dbConn->qstr($prefix)." WHERE
+				modelID=".$this->modelID." AND namespace=".$this->dbConn->qstr($nmsp);
 			}else{
 				$sql = "INSERT INTO namespaces
                     (modelID, namespace, prefix)
                     VALUES
-                    (" .$this->modelID .","
-				."'" . $this->dbConn->qstr($nmsp)   ."',"
-				."'" . $this->dbConn->qstr($prefix) ."')";
+                    (" .$this->modelID .','
+				. $this->dbConn->qstr($nmsp)   . ','
+				. $this->dbConn->qstr($prefix) . ')';
 			}
 
 			$rs =& $this->dbConn->execute($sql);
@@ -1225,7 +1224,7 @@
 		$res = true;
 		$sql = "SELECT * FROM namespaces
           	 WHERE modelID = " .$this->modelID." AND
-			namespace='".$nmsp."'" ;
+			namespace=" . $this->dbConn->qstr($nmsp);
 		$rs =& $this->dbConn->execute($sql);
 		if (!$rs){
 			$this->dbConn->errorMsg();
@@ -1261,7 +1260,7 @@
 	function removeNamespace($nmsp){
 
 		$sql = 'DELETE FROM namespaces
-           WHERE modelID=' .$this->modelID." AND namespace='".$nmsp."'";
+           WHERE modelID=' .$this->modelID." AND namespace=". $this->dbConn->qstr($nmsp);
 
 		$rs =& $this->dbConn->execute($sql);
 		if (!$rs)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 2 3 4 .. 6 > >> (Page 2 of 6)

2007	Jan	Feb	Mar	Apr	May	Jun (19)	Jul (6)	Aug (65)	Sep (4)	Oct (5)	Nov (8)	Dec (2)
2008	Jan (1)	Feb (9)	Mar (1)	Apr	May (8)	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec