activerdf 1.6.1 → 1.6.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+== activerdf (1.6.2) Fri, 03 Aug 2007 14:07:54 +0100
+  * initial support for FILTERs in SPARQL
+
 == activerdf (1.6.1) Thu, 19 Apr 2007 22:57:01 +0100
   * fix bug 107280: add support for full query options (including context) in dynamic finders
 

data/lib/active_rdf/queryengine/query.rb

@@ -6,7 +6,8 @@ require 'federation/federation_manager'
 # data source.  In all clauses symbols represent variables: 
 # Query.new.select(:s).where(:s,:p,:o).
 class Query
-	attr_reader :select_clauses, :where_clauses, :sort_clauses, :keywords, :limits, :offsets, :reverse_sort_clauses
+	attr_reader :select_clauses, :where_clauses, :sort_clauses, :keywords, :limits, :offsets, :reverse_sort_clauses, :filter_clauses
+
 	bool_accessor :distinct, :ask, :select, :count, :keyword, :reasoning
 
 	def initialize
@@ -16,6 +17,7 @@ class Query
 		@select_clauses = []
 		@where_clauses = []
 		@sort_clauses = []
+    @filter_clauses = []
 		@keywords = {}
 		@reasoning = true
     @reverse_sort_clauses = []
@@ -67,6 +69,34 @@ class Query
 		self
 	end
 
+  # adds one or more generic filters
+  # NOTE: you have to use SPARQL syntax for variables, eg. regex(?s, 'abc')
+  def filter *s
+    # add filter clauses
+    @filter_clauses << s
+    @filter_clauses.uniq!
+
+    self
+  end
+
+  # adds regular expression filter on one variable
+  # variable is Ruby symbol that appears in select/where clause, regex is Ruby 
+  # regular expression
+  def filter_regexp(variable, regexp)
+    raise(ActiveRdfError, "variable must be a symbol") unless variable.is_a? Symbol
+    raise(ActiveRdfError, "regexp must be a ruby regexp") unless regexp.is_a? Regexp
+
+    filter "regex(?#{variable}, #{regexp.inspect.gsub('/','"')})"
+  end
+  alias :filter_regex :filter_regexp
+
+  def filter_operator(variable, operator, operand)
+    raise(ActiveRdfError, "variable must be a Symbol") unless variable.is_a? Symbol
+
+    filter "(?#{variable} #{operator} #{operand}"
+  end
+
+
   # adds reverse sorting predicates
   def reverse_sort *s
     # add sort clauses without duplicates

data/lib/active_rdf/queryengine/query2sparql.rb

@@ -10,7 +10,7 @@ class Query2SPARQL
 			select_clauses = query.select_clauses.collect{|s| construct_clause(s)}
 
       str << "SELECT #{distinct}#{select_clauses.join(' ')} "
-      str << "WHERE { #{where_clauses(query)} }"
+      str << "WHERE { #{where_clauses(query)} #{filter_clauses(query)}}"
     elsif query.ask?
       str << "ASK { #{where_clauses(query)} }"
     end
@@ -18,6 +18,11 @@ class Query2SPARQL
     return str
   end
 
+  # concatenate filters in query
+  def self.filter_clauses(query)
+    "FILTER #{query.filter_clauses.join(" ")}" unless query.filter_clauses.empty?
+  end
+
   # concatenate each where clause using space (e.g. 's p o')
   # and concatenate the clauses using dot, e.g. 's p o . s2 p2 o2 .'
   def self.where_clauses(query)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
-date: 2007-04-19 00:00:00 +01:00
+  version: 1.6.2
+date: 2007-08-03 00:00:00 +01:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -33,43 +33,43 @@ files:
 - README
 - CHANGELOG
 - test/federation
-- test/objectmanager
-- test/queryengine
-- test/common.rb
-- test/test_adapters.rb
-- test/test_person_data.nt
-- test/small-one.nt
-- test/small-two.nt
 - test/federation/test_federation_manager.rb
 - test/federation/test_connection_pool.rb
+- test/objectmanager
 - test/objectmanager/test_resource_reading.rb
 - test/objectmanager/test_literal.rb
 - test/objectmanager/test_namespace.rb
 - test/objectmanager/test_object_manager.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_log.rb
-- lib/active_rdf_helpers.rb
 - lib/active_rdf/federation
-- lib/active_rdf/objectmanager
-- lib/active_rdf/queryengine
 - 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/object_manager.rb
+- lib/active_rdf/queryengine
 - lib/active_rdf/queryengine/query.rb
 - lib/active_rdf/queryengine/query2sparql.rb
 - lib/active_rdf/queryengine/ntriples_parser.rb
 - lib/active_rdf/queryengine/query2jars2.rb
+- lib/active_rdf.rb
+- lib/active_rdf_log.rb
+- lib/active_rdf_helpers.rb
 test_files: []
 
 rdoc_options: []