solr_marc.rake in blacklight-3.4.0

- old
+ new

@@ -86,17 +86,18 @@
   arguments  = {}
 
   arguments["MARC_FILE"] = ENV["MARC_FILE"]
 
   
-  app_site_path = File.expand_path(File.join(Rails.root, "config", "SolrMarc"))
-  plugin_site_path = File.expand_path(File.join(Rails.root, "vendor", "plugins", "blacklight", "config", "SolrMarc"))
+  arguments[:config_properties_path] = ENV['CONFIG_PATH']
 
 
   # Find config in local app or plugin, possibly based on our RAILS_ENV (::Rails.env)
-  arguments[:config_properties_path] = ENV['CONFIG_PATH']
   unless arguments[:config_properties_path]
+    app_site_path = File.expand_path(File.join(Rails.root, "config", "SolrMarc"))
+    plugin_site_path = File.expand_path(File.join(Rails.root, "vendor", "plugins", "blacklight", "config", "SolrMarc"))
+
     [ File.join(app_site_path, "config-#{::Rails.env}.properties"  ),
       File.join( app_site_path, "config.properties"),
       File.join( plugin_site_path, "config-#{::Rails.env}.properties"),
       File.join( plugin_site_path, "config.properties"),
     ].each do |file_path|
@@ -115,32 +116,26 @@
   # one in local app.  
   arguments[:solrmarc_jar_path] = ENV['SOLRMARC_JAR_PATH'] || locate_path("lib", "SolrMarc.jar") 
   
 
       
+  # solrmarc.solr.war.path and solr.path, for now pull out of ENV
+  # if present. In progress. jrochkind 25 Apr 2011. 
+  arguments[:solr_war_path] = ENV["SOLR_WAR_PATH"] if ENV["SOLR_WAR_PATH"]
+  arguments[:solr_path] = ENV['SOLR_PATH'] if ENV['SOLR_PATH']
 
   # Solr URL, find from solr.yml, app or plugin
   # use :replicate_master_url for current env if present, otherwise :url
   # for current env. 
   # Also take jetty_path from there if present. 
-  solr_yml_path = locate_path("config", "solr.yml")
-  if ( File.exists?( solr_yml_path ))
-    solr_config = YAML::load(File.open(solr_yml_path))
-    if c = solr_config[::Rails.env]
-      arguments[:solr_url] = c['url']    
-      if c['jetty_path']
-        arguments[:solr_path] = File.expand_path(File.join(c['jetty_path'], "solr"), Rails.root)
-        arguments[:solr_war_path] = File.expand_path(File.join(c['jetty_path'], "webapps", "solr.war"), Rails.root)
+    if c = Blacklight.solr_config
+      arguments[:solr_url] = c[:url]    
+      if c[:jetty_path]
+        arguments[:solr_path] ||= File.expand_path(File.join(c[:jetty_path], "solr"), Rails.root)
+        arguments[:solr_war_path] ||= File.expand_path(File.join(c[:jetty_path], "webapps", "solr.war"), Rails.root)
       end
-    end
   end
   
-  # solrmarc.solr.war.path and solr.path, for now pull out of ENV
-  # if present. In progress. jrochkind 25 Apr 2011. 
-  arguments[:solr_war_path] = ENV["SOLR_WAR_PATH"] if ENV["SOLR_WAR_PATH"]
-  arguments[:solr_path] = ENV['SOLR_PATH'] if ENV['SOLR_PATH']
-
-
   return arguments
 end
 
 def solrmarc_command_line(arguments)
   cmd = "java #{arguments[:solrmarc_mem_arg]} "