Show
Ignore:
Timestamp:
11/17/08 13:28:38 (5 years ago)
Author:
samuraraujo
Message:
 
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • activerdf-1.6.10/lib/active_rdf/federation/federation_manager.rb

    r146 r151  
    3030  # and aggregating the results 
    3131  def FederationManager.query(q, options={:flatten => true}) 
    32      
     32    
    3333                if ConnectionPool.read_adapters.empty? 
    3434                        raise ActiveRdfError, "cannot execute query without data sources"  
     
    3838    # and yield them consequtively 
    3939    if block_given? 
    40       ConnectionPool.read_adapters.each do |source| 
    41          
     40      ConnectionPool.read_adapters.each do |source|         
    4241        source.query(q) do |*clauses| 
    4342          yield(*clauses) 
     
    5049      # were filtered out when doing results.union) 
    5150      results = [] 
    52       ConnectionPool.read_adapters.each do |source| 
    53           
     51      ConnectionPool.read_adapters.each do |source|          
    5452                                source_results = source.query(q) 
    5553                                source_results.each do |clauses| 
    5654                                        results << clauses 
    57                                 end 
    5855                        end 
    59  
     56                        end 
     57  
    6058      # filter the empty results 
    6159      results.reject {|ary| ary.empty? } 
     
    7068      # to prevent unnecessarily nested array [[eyal],[renaud],...] 
    7169      results.flatten! if q.select_clauses.size == 1 or q.ask? 
    72  
     70     
    7371      # remove array (return single value or nil) if asked to 
    7472      if options[:flatten] or q.count?