activerdf 1.6.5 → 1.6.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+== activerdf (1.6.6) Fri, 21 Sep 2007 10:06:17 +0100
+  * parse bnodes in SPARQL queries
+  * bugfix when using RDFS classes in queries
+
 == activerdf (1.6.5) Thu, 20 Sep 2007 13:39:04 +0100
   * bugfix in SPARQL regex query (Mikael Lammentausta)
 

data/lib/active_rdf/objectmanager/bnode.rb

@@ -0,0 +1,5 @@
+class BNode < RDFS::Resource
+  def to_s
+    "_:#{uri}"
+  end
+end

data/lib/active_rdf/objectmanager/resource.rb

@@ -372,6 +372,10 @@ module RDFS
 			"<#{uri}>"
 		end
 
+    def Resource.to_s
+      "<#{uri}>"
+    end
+
 		private
 
 #		def ancestors(predicate)

data/lib/active_rdf/queryengine/query.rb

@@ -147,10 +147,10 @@ class Query
 			# if you construct this query manually, you shouldn't! if your select 
 			# variable happens to be in one of the removed clauses: tough luck.
 
-			unless s.is_a?(RDFS::Resource) or s.is_a?(Symbol)
+			unless s.respond_to?(:uri) or s.is_a?(Symbol)
 				raise(ActiveRdfError, "cannot add a where clause with s #{s}: s must be a resource or a variable")
 			end
-			unless p.is_a?(RDFS::Resource) or p.is_a?(Symbol)
+			unless p.respond_to?(:uri) or p.is_a?(Symbol)
 				raise(ActiveRdfError, "cannot add a where clause with p #{p}: p must be a resource or a variable")
 			end
 

data/lib/active_rdf/queryengine/query2sparql.rb

@@ -14,8 +14,8 @@ class Query2SPARQL
 
       str << "SELECT #{distinct}#{select_clauses.join(' ')} "
       str << "WHERE { #{where_clauses(query)} #{filter_clauses(query)}} "
-      str << "LIMIT #{query.limits}" if query.limits
-      str << "OFFSET #{query.offsets}" if query.offsets
+      str << "LIMIT #{query.limits}" if query.limits and sparql_engine != :yars2
+      str << "OFFSET #{query.offsets}" if query.offsets and sparql_engine !=:yars2
     elsif query.ask?
       str << "ASK { #{where_clauses(query)} }"
     end

data/lib/active_rdf.rb

@@ -18,6 +18,7 @@ $activerdflog.info "ActiveRDF started, logging level: #{$activerdflog.level}"
 
 # load standard classes that need to be loaded at startup
 require 'objectmanager/resource'
+require 'objectmanager/bnode'
 require 'objectmanager/literal'
 require 'objectmanager/namespace'
 require 'federation/connection_pool'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: 1.6.5
-date: 2007-09-20 00:00:00 +01:00
+  version: 1.6.6
+date: 2007-09-21 00:00:00 +01:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -62,6 +62,7 @@ files:
 - lib/active_rdf/objectmanager/namespace.rb
 - lib/active_rdf/objectmanager/literal.rb
 - lib/active_rdf/objectmanager/object_manager.rb
+- lib/active_rdf/objectmanager/bnode.rb
 - lib/active_rdf/queryengine
 - lib/active_rdf/queryengine/query.rb
 - lib/active_rdf/queryengine/query2sparql.rb