Changeset 91 for trunk/app/controllers/application.rb

Timestamp:

01/08/07 23:17:18 (6 years ago)

Author:

dema

Message:

Greatly simplified configuration of repositories. Now, just drop your *.rdf file into the /db directory and you're good to go. No more hassling with system.conf and the /tmp directory, no more usernames and passwords, just a simple file-based rdf database on the /db directory.

PS: Unit testing rules!

Files:

• trunk/app/controllers/application.rb (modified) (3 diffs)

trunk/app/controllers/application.rb

@@ -6 +6 @@
 class ApplicationController < ActionController::Base
   observer :model_observer
-  prepend_before_filter :verify_repo, :except => :select_repo
+  prepend_before_filter :verify_repo, :except => [:select, :set]
   before_filter :set_return_to
         before_filter :set_charset
@@ -18 +18 @@
   def verify_repo
     if @session['repo'].nil? or @session['repo'].blank? 
-      redirect_to :controller => 'repository', :action => 'select_repo' and return false
+      redirect_to :controller => 'repository', :action => 'select' and return false
     else
       set_repo
@@ -25 +25 @@
 
   def set_repo
-    if @session['repo']['repository'] != SemanticRecord::Base::repository['repository']
-      SemanticRecord::Base::change_repository(@session['repo']['repository'],
-                                              @session['repo']['username'],
-                                              @session['repo']['password'])
+    if @session['repo'] != SemanticRecord::Base::repository['repository']
+      SemanticRecord::Base::change_repository(@session['repo'])
     end
   end