Changeset 210

Timestamp:

12/13/08 11:51:48 (5 years ago)

Author:

samuraraujo

Message:

 

Location:

activerdf-1.6.10/lib/active_rdf

Files:

• federation/connection_pool.rb (modified) (2 diffs)
• init.rb (modified) (1 diff)
• objectmanager/resource.rb (modified) (3 diffs)
• queryengine/query2sparql.rb (modified) (3 diffs)

activerdf-1.6.10/lib/active_rdf/federation/connection_pool.rb

@@ -133 +133 @@
   # indicating which adapter-type they are
   def ConnectionPool.register_adapter(type, klass)
-    $activerdflog.info "ConnectionPool: registering adapter of type #{type} for class #{klass}"
+    $activerdflog.debug "ConnectionPool: registering adapter of type #{type} for class #{klass}"
     @@registered_adapter_types[type] = klass
   end
@@ -140 +140 @@
   def ConnectionPool.create_adapter connection_params
     # lookup registered adapter klass
+ 
     klass = @@registered_adapter_types[connection_params[:type]]
-
+ 
     # raise error if adapter type unknown
     raise(ActiveRdfError, "unknown adapter type #{connection_params[:type]}") if klass.nil?

activerdf-1.6.10/lib/active_rdf/init.rb

@@ -9 +9 @@
 
 require 'sparql'
+

activerdf-1.6.10/lib/active_rdf/objectmanager/resource.rb

@@ -197 +197 @@
       end
     end
-    def self.find_all_predicates   
-      
+    def self.find_all_predicates      
       $all_predicates_array = Query.new.distinct(:s).where(:s,Namespace.lookup(:rdf,:type),Namespace.lookup(:rdf,:Property)).execute if $all_predicates_array == nil
     end
@@ -386 +385 @@
                 # RDFS::Resource.
                 def type   
-    types.compact!  
-                        types.collect do |type|
+    
+                tmp =   types.collect do |type|
                                 ObjectManager.construct_class(type)
-                        end
+                end
+    tmp.compact
                 end
 
@@ -528 +528 @@
                         defaults << self.class.class_uri
      
-                        (types + defaults).uniq
+                        (types + defaults).compact.uniq
                 end
         end

activerdf-1.6.10/lib/active_rdf/queryengine/query2sparql.rb

@@ -58 +58 @@
   #build keywords
   def self.keywords_clauses(query)
-    if query.keyword?      
-     
+    if query.keyword?           
       filters= Array.new
       query.keywords.each do |term, keyword|
@@ -75 +74 @@
     where_clauses = query.where_clauses.collect do |s,p,o,c|
       object = nil
-      #replace a where clause by filter in case of String as object.
-    
+      #replace a where clause by filter in case of String as object.    
       if o.instance_of? String
         object = o       
@@ -92 +90 @@
       end
     end    
-    "#{where_clauses.join(' . ')} ." unless where_clauses.empty?
-    
-    
+    "#{where_clauses.join(' . ')} ." unless where_clauses.empty?    
   end
   def self.construct_clause(term)