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

Revision: 569
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=569&view=rev
Author:   p_frischmuth
Date:     2008-05-18 22:24:39 -0700 (Sun, 18 May 2008)

Log Message:
-----------
[fixed] loadModelFromString for N3

Modified Paths:
--------------
    trunk/rdfapi-php/api/model/Model.php
    trunk/rdfapi-php/api/syntax/N3Parser.php
    trunk/rdfapi-php/test/unit/Model/Model_tests.php

Modified: trunk/rdfapi-php/api/model/Model.php
===================================================================
--- trunk/rdfapi-php/api/model/Model.php	2008-05-14 15:08:04 UTC (rev 568)
+++ trunk/rdfapi-php/api/model/Model.php	2008-05-19 05:24:39 UTC (rev 569)
@@ -170,10 +170,10 @@
 			 			E_USER_ERROR);
 		}
 		
-		if ($parser instanceof JsonParser) {
+		if (($parser instanceof JsonParser) || ($parser instanceof N3Parser)) {
 			$parser->generateModelFromString($str, $this);
 		} else {
-			$parser->generateModel($str, false, $this);
+			$temp = $parser->generateModel($str, false, $this);
 			
 			$this->addModel($temp);
             if($this->getBaseURI() == null) {

Modified: trunk/rdfapi-php/api/syntax/N3Parser.php
===================================================================
--- trunk/rdfapi-php/api/syntax/N3Parser.php	2008-05-14 15:08:04 UTC (rev 568)
+++ trunk/rdfapi-php/api/syntax/N3Parser.php	2008-05-19 05:24:39 UTC (rev 569)
@@ -247,6 +247,12 @@
     $m = $this->parse2model($input,$model);
     return $m;
   }
+  
+  function generateModelFromString($n3String, $model) {
+      
+      $m = $this->parse2model($n3String, $model);
+      $m->addModel($m);
+  }
 
 
   /* ==================== Private Methods from here ==================== */

Modified: trunk/rdfapi-php/test/unit/Model/Model_tests.php
===================================================================
--- trunk/rdfapi-php/test/unit/Model/Model_tests.php	2008-05-14 15:08:04 UTC (rev 568)
+++ trunk/rdfapi-php/test/unit/Model/Model_tests.php	2008-05-19 05:24:39 UTC (rev 569)
@@ -49,6 +49,18 @@
                 new Literal('Fred')));
         $this->assertIdentical(1, $ont->size());
     }
+    
+    function testLoadFromStringN3() {
+        $mem = &ModelFactory::getDefaultModel();
+        
+        $n3String = '<http://example.com/res1> <http://example.com/label> "ttt" .';
+        
+        $mem->loadFromString($n3String, 'n3');
+        
+        $this->assertTrue($mem->contains(new Statement(new Resource('http://example.com/res1'),
+                                                       new Resource('http://example.com/label'),
+                                                       new Literal('ttt'))));
+    }
 }
 
 ?>
\ No newline at end of file


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