svn commit: r528296 - in /lucene/solr/trunk/client/ruby/flare: Rakefile config/boot.rb config/environment.rb

[eh...@apache.org]

Author: ehatcher
Date: Thu Apr 12 17:37:31 2007
New Revision: 528296

URL: http://svn.apache.org/viewvc?view=rev&rev=528296
Log:
Update to require Rails 1.2.3

Modified:
    lucene/solr/trunk/client/ruby/flare/Rakefile
    lucene/solr/trunk/client/ruby/flare/config/boot.rb
    lucene/solr/trunk/client/ruby/flare/config/environment.rb

Modified: lucene/solr/trunk/client/ruby/flare/Rakefile
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/Rakefile?view=diff&rev=528296&r1=528295&r2=528296
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/Rakefile (original)
+++ lucene/solr/trunk/client/ruby/flare/Rakefile Thu Apr 12 17:37:31 2007
@@ -9,4 +9,4 @@
 
 require 'tasks/rails'
 
-require 'solr/solrtasks'
\ No newline at end of file
+#require 'solr/solrtasks'
\ No newline at end of file

Modified: lucene/solr/trunk/client/ruby/flare/config/boot.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/config/boot.rb?view=diff&rev=528296&r1=528295&r2=528296
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/config/boot.rb (original)
+++ lucene/solr/trunk/client/ruby/flare/config/boot.rb Thu Apr 12 17:37:31 2007
@@ -3,7 +3,7 @@
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
 
-  unless RUBY_PLATFORM =~ /mswin32/
+  unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
     require 'pathname'
     root_path = Pathname.new(root_path).cleanpath(true).to_s
   end
@@ -26,7 +26,7 @@
       rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
 
       if rails_gem
-        require_gem "rails", "=#{rails_gem.version.version}"
+        gem "rails", "=#{rails_gem.version.version}"
         require rails_gem.full_gem_path + '/lib/initializer'
       else
         STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
@@ -36,10 +36,10 @@
         exit 1
       end
     else
-      require_gem "rails"
+      gem "rails"
       require 'initializer'
     end
   end
 
   Rails::Initializer.run(:set_load_path)
-end
\ No newline at end of file
+end

Modified: lucene/solr/trunk/client/ruby/flare/config/environment.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/config/environment.rb?view=diff&rev=528296&r1=528295&r2=528296
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/config/environment.rb (original)
+++ lucene/solr/trunk/client/ruby/flare/config/environment.rb Thu Apr 12 17:37:31 2007
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '1.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '1.2.3' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -64,14 +64,16 @@
   # timeline: default, no timeline support without knowing the field(s) to use
   
   :development => {
+    :solr_query_type => :standard,
   },
 
   :delicious => {
     :timeline_dates => :published_year_facet,
-    :image_proc => Proc.new {|doc| "http://images.amazon.com/images/P/#{doc['asin_text']}.01.MZZZZZZZ"}
+    :image_proc => Proc.new {|doc| "http://images.amazon.com/images/P/#{doc['asin_text']}.01.MZZZZZZZ"},
   },
 
   :tang => {
+    :solr_query_type => :standard,
   },
   
   :marc => {