Changeset 401

Timestamp:

04/20/09 20:31:59 (9 years ago)

Author:

samuraraujo

Message:

 

Files:

• Explorator/trunk/vendor/plugins/active_rdf/lib/active_rdf/federation/connection_pool.rb (modified) (6 diffs)

Explorator/trunk/vendor/plugins/active_rdf/lib/active_rdf/federation/connection_pool.rb

@@ -41 +41 @@
     self.write_adapter = nil
   end
-   def ConnectionPool.void
-   @@void
+  def ConnectionPool.void
+    @@void
   end
   def ConnectionPool.adapters
@@ -70 +70 @@
   
   # returns adapter-instance for given parameters (either existing or new)
-  def ConnectionPool.add_data_source(connection_params)
+  def ConnectionPool.add_data_source(connection_params )
     $activerdflog.info "ConnectionPool: add_data_source with params: #{connection_params.inspect}"
     
@@ -82 +82 @@
       $activerdflog.debug("Create a new adapter for parameters #{connection_params.inspect}")
       adapter = create_adapter(connection_params)
-      @@adapter_parameters << connection_params
-      @@adapter_pool << adapter
+      # this is necessary because activerdf search in the order repositories were added
+      if adapter.title == 'INTERNAL' 
+        
+        @@adapter_parameters << connection_params
+        @@adapter_pool << adapter
+      else
+        @@adapter_parameters.insert(0,connection_params)
+        @@adapter_pool.insert(0,adapter)
+      end
     else
       # if adapter parametrs registered already,
@@ -102 +109 @@
   def ConnectionPool.remove_data_source(adapter)
     RDFS::Resource.reset_cache() 
-     
+    
     $activerdflog.info "ConnectionPool: remove_data_source with params: #{adapter.to_s}"
     
@@ -111 +118 @@
       @@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
+      #      if self.write_adapters.empty?
+      #        self.write_adapter = nil
+      #      else
+      #        self.write_adapter = self.write_adapters.first
+      #      end
       
     end
@@ -141 +148 @@
   #find an sparql adapter by its uri
   def ConnectionPool.find_by_uri(uri)
- 
+    
     @@adapter_pool.each {|x|
-     if x.instance_of? SparqlAdapter
- 
-       if x.url == uri
-         return x
-       end
-     end
+      if x.instance_of? SparqlAdapter
+        
+        if x.url == uri
+          return x
+        end
+      end
     }
     return nil
-   
+    
   end
   # adapter-types can register themselves with connection pool by