activerdf_sparql 1.0 → 1.1

data/Rakefile

@@ -15,7 +15,7 @@ setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="1.0"
+version=ENV['REL']
 name="activerdf_sparql"
 
 setup_gem(name, version) do |spec|

data/lib/activerdf_sparql/sparql.rb

@@ -1,8 +1,3 @@
-# SPARQL adapter
-#
-# Author:: Eyal Oren and Sebastian Gerke
-# Copyright:: (c) 2005-2006
-# License:: LGPL
 require 'active_rdf'
 require 'queryengine/query2sparql'
 require 'open-uri'
@@ -10,9 +5,9 @@ require 'cgi'
 require 'rexml/document'
 require "#{File.dirname(__FILE__)}/sparql_result_parser"
   
-
+# SPARQL adapter
 class SparqlAdapter < ActiveRdfAdapter
-	$log.info "loading SPARQL adapter"
+	$activerdflog.info "loading SPARQL adapter"
 	ConnectionPool.register_adapter(:sparql, self)
 	
 	# Instantiate the connection with the SPARQL Endpoint.
@@ -30,7 +25,7 @@ class SparqlAdapter < ActiveRdfAdapter
 		raise ActiveRdfError, "Result format unsupported" unless 
 		known_formats.include?(@result_format)
 		
-		$log.info "Sparql adapter initialised #{inspect}"
+		$activerdflog.info "Sparql adapter initialised #{inspect}"
 	end
 
 	def size
@@ -42,21 +37,24 @@ class SparqlAdapter < ActiveRdfAdapter
 	def query(query, &block)
 		time = Time.now
     qs = Query2SPARQL.translate(query)
-		$log.debug "executing sparql query #{query}"
+		$activerdflog.debug "executing sparql query #{query}"
 
 		execute_sparql_query(qs, header(query), &block)
 	end
 		
 	# do the real work of executing the sparql query
 	def execute_sparql_query(qs, header, &block)
-		$log.debug "executing query #{qs} on url #@url"
+		$activerdflog.debug "executing query #{qs} on url #@url"
 
 		# encoding query string in URL
 		url = "#@url?query=#{CGI.escape(qs)}"
 
     # querying sparql endpoint
+		response = ''
 		begin 
-			response = open(url, header).read
+		  open(url, header) do |f|
+				response = f.read
+			end
 		rescue OpenURI::HTTPError => e
 			raise ActiveRdfError, "could not query SPARQL endpoint, server said: #{e}"
 			return []
@@ -105,21 +103,15 @@ class SparqlAdapter < ActiveRdfAdapter
     results = []    
     vars = parsed_object['head']['vars']
     objects = parsed_object['results']['bindings']
-    if vars.length > 1
-      objects.each do |obj|
-        result = []
-        vars.each do |v|
-          result << create_node( obj[v]['type'], obj[v]['value'])
-        end
-        results << result
-      end
-    else
-      objects.each do |obj| 
-        obj.each_value do |e|
-          results << create_node(e['type'], e['value'])
-        end
-      end
-    end
+
+		objects.each do |obj|
+			result = []
+			vars.each do |v|
+				result << create_node( obj[v]['type'], obj[v]['value'])
+			end
+			results << result
+		end
+
     results
   end
   

data/lib/activerdf_sparql/sparql_result_parser.rb

@@ -1,9 +1,4 @@
-# parser for SPARQL XML result set
-#
-# Author:: Sebastian Gerke
-# Copyright:: (c) 2005-2006
-# License:: LGPL
-
+# Parser for SPARQL XML result set.
 class SparqlResultParser
   attr_reader :result
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerdf_sparql
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2006-11-02 00:00:00 +00:00
+  version: "1.1"
+date: 2006-12-08 00:00:00 +00:00
 summary: ActiveRDF adapter to SPARQL endpoint
 require_paths: 
 - lib