Menu
▾
▴
[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [448] trunk/rdfapi-php
|
From: <cw...@us...> - 2007-06-19 15:48:57
|
Revision: 448
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=448&view=rev
Author: cweiske
Date: 2007-06-19 08:48:52 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Add ORDER BY dateTime support
Modified Paths:
--------------
trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
trunk/rdfapi-php/test/unit/Sparql/cases.php
Added Paths:
-----------
trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3
trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq
trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res
Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php 2007-06-13 16:26:58 UTC (rev 447)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php 2007-06-19 15:48:52 UTC (rev 448)
@@ -26,7 +26,10 @@
* @var array
*/
public static $arCastTypes = array(
- 'http://www.w3.org/2001/XMLSchema#integer' => 'SIGNED INTEGER'
+ 'http://www.w3.org/2001/XMLSchema#integer' => 'SIGNED INTEGER',
+ //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',
);
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-06-13 16:26:58 UTC (rev 447)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-06-19 15:48:52 UTC (rev 448)
@@ -9,7 +9,7 @@
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlParser.php';
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngine.php';
require_once RDFAPI_INCLUDE_DIR . 'dataset/NamedGraphMem.php';
-//require_once 'Console/Color.php';
+require_once 'Console/Color.php';
class testSparqlDbTests extends UnitTestCase
{
@@ -76,6 +76,9 @@
} catch (Exception $e) {
$bOk = false;
$t = null;
+ //an exception is an error
+ var_dump($e->getMessage());
+ $this->assertTrue(false);
}
/*
if (!$bOk) {
Modified: trunk/rdfapi-php/test/unit/Sparql/cases.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-06-13 16:26:58 UTC (rev 447)
+++ trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-06-19 15:48:52 UTC (rev 448)
@@ -22,7 +22,7 @@
'tests' => 'sparql_limitOffset_tests',
'checkfunc' => 'resultCheckSort'
),
- 'filter' => array(
+ 'filter' => array(//'deact'=>1,
'title' => 'filter tests',
'tests' => 'sparql_filter_tests',
'checkfunc' => 'resultCheck'
@@ -86,6 +86,7 @@
$_SESSION['sparql_sort_tests'] = array(
+
1 => array('data' => 'data-sort-4.n3',
'query' => "query-sort-5",
'result' => "sort5") ,
@@ -118,6 +119,9 @@
'query' => "query-sort-4",
'result' => "sort8") ,
+ 9 => array('data' => "data-sort-datetime.n3",
+ 'query' => "query-sort-datetime",
+ 'result' => "sort-datetime") ,
);
Added: trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3 (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3 2007-06-19 15:48:52 UTC (rev 448)
@@ -0,0 +1,6 @@
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+
+_:a dc:created "2004-12-31T18:01:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+_:b dc:created "2004-01-31T18:01:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+_:c dc:created "2007-03-12T17:02:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+_:d dc:created "2007-03-12T17:01:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
Added: trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq 2007-06-19 15:48:52 UTC (rev 448)
@@ -0,0 +1,5 @@
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+
+SELECT ?created
+WHERE { ?x dc:created ?created }
+ORDER BY ASC(?created)
Added: trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res 2007-06-19 15:48:52 UTC (rev 448)
@@ -0,0 +1,19 @@
+$result = array();
+$res1 = new Literal("2004-12-31T18:01:00-05:00");
+$res2 = new Literal("2004-01-31T18:01:00-05:00");
+$res3 = new Literal("2007-03-12T17:02:00-05:00");
+$res4 = new Literal("2007-03-12T17:01:00-05:00");
+
+$res1->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+$res2->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+$res3->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+$res4->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+
+
+
+$result = array(
+ array('?created' => $res2),
+ array('?created' => $res1),
+ array('?created' => $res4),
+ array('?created' => $res3),
+);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
