activerdf 1.6.3 → 1.6.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+== activerdf (1.6.4) 
+  * new method: ConnectionPool.remove_data_source(adapter) which should be called
+    by all adapter.close methods
+
 == activerdf (1.6.3) Thu, 09 Aug 2007 15:11:15 +0100
   * added support for LANG filters and engine-specific keyword search in SPARQL
 

data/lib/active_rdf/federation/connection_pool.rb

@@ -57,6 +57,10 @@ class ConnectionPool
     @@adapter_pool.select {|adapter| adapter.reads? }
   end
 
+  def ConnectionPool.write_adapters
+    @@adapter_pool.select {|adapter| adapter.writes? }
+  end
+  
   # returns adapter-instance for given parameters (either existing or new)
   def ConnectionPool.add_data_source(connection_params)
     $activerdflog.info "ConnectionPool: add_data_source with params: #{connection_params.inspect}"
@@ -83,6 +87,25 @@ class ConnectionPool
     self.write_adapter = adapter if adapter.writes?
 
     return adapter
+  end
+  
+  # remove one adapter from activerdf
+  def ConnectionPool.remove_data_source(adapter)
+    $activerdflog.info "ConnectionPool: remove_data_source with params: #{adapter.to_s}"
+    
+    index = @@adapter_pool.index(adapter)
+
+    # remove_data_source mit be called repeatedly, e.g because the adapter object is stale
+    unless index.nil?
+      @@adapter_parameters.delete_at(index)
+      @@adapter_pool.delete_at(index)
+      if self.write_adapters.empty?
+        self.write_adapter = nil
+      else
+        self.write_adapter = self.write_adapters.first
+      end
+    end
+    
   end
 
 	# sets adapter-instance for connection parameters (if you want to re-enable an existing adapter)

data/lib/active_rdf/federation/federation_manager.rb

@@ -15,7 +15,6 @@ class FederationManager
   # by distributing query over complete read-pool
   # and aggregating the results
   def FederationManager.query(q, options={:flatten => true})
-    $activerdflog.debug "querying #{q.to_sp}"
 		if ConnectionPool.read_adapters.empty?
 			raise ActiveRdfError, "cannot execute query without data sources" 
 		end

data/lib/active_rdf/queryengine/query.rb

@@ -100,10 +100,14 @@ class Query
   end
 
   # filter variable on specified language tag, e.g. lang(:o, 'en')
-  def lang variable, tag
-    #filter "regex(lang(?#{variable}), '^#{tag}(-|$)', 'i')"
-    filter "lang(?#{variable}) = '#{tag}'"
-    #filter "langMatches(lang(?#{variable}), '#{tag}')"
+  # optionally matches exactly on language dialect, otherwise only 
+  # language-specifier is considered
+  def lang variable, tag, exact=false
+    if exact
+      filter "lang(?#{variable} = '#{tag}'"
+    else
+      filter "regex(lang(?#{variable}), '^#{tag.gsub(/_.*/,'')}$')"
+    end
   end
 
   # adds reverse sorting predicates
@@ -177,7 +181,6 @@ class Query
   # usage:: query.execute do |s,p,o| ... end
   def execute(options={:flatten => false}, &block)
     options = {:flatten => true} if options == :flatten
-    $activerdflog.debug("executing: #{self.to_sp}")
 
     if block_given?
       for result in FederationManager.query(self, options)

data/lib/active_rdf/queryengine/query2sparql.rb

@@ -5,6 +5,7 @@ require 'active_rdf'
 # Translates abstract query into SPARQL that can be executed on SPARQL-compliant
 # data source.
 class Query2SPARQL
+    
   Engines_With_Keyword = [:yars2, :virtuoso]
   def self.translate(query, engine=nil)
     str = ""

data/lib/active_rdf.rb

@@ -1,11 +1,16 @@
 # ActiveRDF loader
 
-# adding active_rdf subdirectory to the ruby loadpath
-file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-this_dir = File.dirname(File.expand_path(file))
-$: << this_dir
+if RUBY_PLATFORM =~ /java/
+  # jruby can not follow symlinks, because java does not know the symlink concept
+  this_dir = File.dirname(File.expand_path(__FILE__))
+else
+  file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+  this_dir = File.dirname(File.expand_path(file))  
+end
+$: << this_dir + '/'
 $: << this_dir + '/active_rdf/'
 
+
 require 'active_rdf_helpers'
 require 'active_rdf_log'
 
@@ -32,13 +37,19 @@ require 'rubygems'
 if Gem::cache.search(/^activerdf$/).empty?
 	# we are not running as a gem
 	$activerdflog.info 'ActiveRDF is NOT installed as a Gem'
-	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/rdflite'
-	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/fetching'
-	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/suggesting'
-	load_adapter this_dir + '/../activerdf-redland/lib/activerdf_redland/redland'
-	load_adapter this_dir + '/../activerdf-sparql/lib/activerdf_sparql/sparql'
-	load_adapter this_dir + '/../activerdf-yars/lib/activerdf_yars/jars2'
-   load_adapter this_dir + '/../activerdf-sesame/lib/activerdf_sesame/sesame'
+	if RUBY_PLATFORM =~ /java/
+	  load_adapter this_dir + '/activerdf/activerdf-jena/lib/activerdf_jena/init'
+	  load_adapter this_dir + '/activerdf/activerdf-sparql/lib/activerdf_sparql/sparql'
+    #load_adapter this_dir + '/../activerdf-sesame/lib/activerdf_sesame/sesame'
+	else
+  	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/rdflite'
+  	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/fetching'
+  	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/suggesting'
+  	load_adapter this_dir + '/../activerdf-redland/lib/activerdf_redland/redland'
+  	load_adapter this_dir + '/../activerdf-sparql/lib/activerdf_sparql/sparql'
+  	load_adapter this_dir + '/../activerdf-yars/lib/activerdf_yars/jars2'	  
+  end
+  
 else
 	# we are running as a gem
 	require 'gem_plugin'

metadata

@@ -1,94 +1,89 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
-name: activerdf
-version: !ruby/object:Gem::Version 
-  version: 1.6.3
-date: 2007-08-09 00:00:00 +01:00
-summary: Offers object-oriented access to RDF (with adapters to several datastores).
-require_paths: 
-- lib
-email: eyal.oren@deri.org
+--- !ruby/object:Gem::Specification
 homepage: http://www.activerdf.org
-rubyforge_project: 
-description: Offers object-oriented access to RDF (with adapters to several datastores).
-autorequire: active_rdf
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
+extensions: []
+executables: []
+version: !ruby/object:Gem::Version
+  version: 1.6.4
 post_install_message: 
-authors: 
-- Eyal Oren
+date: 2007-09-01 22:00:00 +00:00
 files: 
 - LICENSE
 - README
 - CHANGELOG
+- test/common.rb
 - test/federation
-- test/federation/test_federation_manager.rb
-- test/federation/test_connection_pool.rb
 - test/objectmanager
-- test/objectmanager/test_resource_reading.rb
+- test/queryengine
+- test/small-one.nt
+- test/small-two.nt
+- test/test_adapters.rb
+- test/test_person_data.nt
+- test/federation/test_connection_pool.rb
+- test/federation/test_federation_manager.rb
 - test/objectmanager/test_literal.rb
 - test/objectmanager/test_namespace.rb
 - test/objectmanager/test_object_manager.rb
+- test/objectmanager/test_resource_reading.rb
 - test/objectmanager/test_resource_writing.rb
-- test/queryengine
 - test/queryengine/test_ntriples_parser.rb
 - test/queryengine/test_query.rb
 - test/queryengine/test_query2jars2.rb
 - test/queryengine/test_query2sparql.rb
 - test/queryengine/test_query_engine.rb
-- test/common.rb
-- test/test_adapters.rb
-- test/test_person_data.nt
-- test/small-one.nt
-- test/small-two.nt
 - lib/active_rdf
+- lib/active_rdf.rb
+- lib/active_rdf_helpers.rb
+- lib/active_rdf_log.rb
 - lib/active_rdf/federation
+- lib/active_rdf/objectmanager
+- lib/active_rdf/queryengine
+- lib/active_rdf/federation/active_rdf_adapter.rb
 - lib/active_rdf/federation/connection_pool.rb
 - lib/active_rdf/federation/federation_manager.rb
-- lib/active_rdf/federation/active_rdf_adapter.rb
-- lib/active_rdf/objectmanager
-- lib/active_rdf/objectmanager/resource.rb
-- lib/active_rdf/objectmanager/namespace.rb
 - lib/active_rdf/objectmanager/literal.rb
+- lib/active_rdf/objectmanager/namespace.rb
 - lib/active_rdf/objectmanager/object_manager.rb
-- lib/active_rdf/queryengine
-- lib/active_rdf/queryengine/query.rb
-- lib/active_rdf/queryengine/query2sparql.rb
+- lib/active_rdf/objectmanager/resource.rb
 - lib/active_rdf/queryengine/ntriples_parser.rb
+- lib/active_rdf/queryengine/query.rb
 - lib/active_rdf/queryengine/query2jars2.rb
-- lib/active_rdf.rb
-- lib/active_rdf_log.rb
-- lib/active_rdf_helpers.rb
-test_files: []
-
+- lib/active_rdf/queryengine/query2sparql.rb
+rubygems_version: 0.9.4
 rdoc_options: []
-
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
-requirements: []
-
+signing_key: 
+cert_chain: 
+name: activerdf
+has_rdoc: true
+platform: ruby
+summary: Offers object-oriented access to RDF (with adapters to several datastores).
+default_executable: 
+bindir: bin
+required_ruby_version: !ruby/object:Gem::Version::Requirement
+  version: 
+  requirements: 
+  - - '>'
+    - !ruby/object:Gem::Version
+      version: 0.0.0
+require_paths: 
+- lib
+specification_version: 1
+test_files: []
 dependencies: 
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: gem_plugin
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Version::Requirement
+    version: 
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.2.1
-    version: 
+description: Offers object-oriented access to RDF (with adapters to several datastores).
+authors: 
+- Eyal Oren
+email: eyal.oren@deri.org
+extra_rdoc_files: 
+- README
+requirements: []
+rubyforge_project: 
+autorequire: active_rdf