hydra-core 5.0.0.pre14 → 5.0.0.pre15

data/lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml

@@ -16,26 +16,56 @@
  limitations under the License.
 -->
 
+<!-- 
+     For more details about configurations options that may appear in
+     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+-->
 <config>
+  <!-- In all configuration below, a prefix of "solr." for class names
+       is an alias that causes solr to search appropriate packages,
+       including org.apache.solr.(search|update|request|core|analysis)
+
+       You may also specify a fully qualified Java classname if you
+       have your own custom plugins.
+    -->
+
+  <!-- Set this to 'false' if you want solr to continue working after
+       it has encountered an severe configuration error.  In a
+       production environment, you may want solr to keep working even
+       if one handler is mis-configured.
+
+       You may also set this to false using by setting the system
+       property:
+
+         -Dsolr.abortOnConfigurationError=false
+    -->
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+  
+  <!-- Controls what version of Lucene various components of Solr
+       adhere to.  Generally, you want to use the latest version to
+       get all bug fixes and improvements. It is highly recommended
+       that you fully re-index after changing this setting as it can
+       affect both how text is indexed and queried.
+    -->
   <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
 
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
-  
+
+  <!-- solr lib dirs -->
   <lib dir="../lib/contrib/analysis-extras/lib" />
   <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
-
-  <dataDir>${solr.data.dir:}</dataDir>
   
+  <dataDir>${solr.data.dir:}</dataDir>
+
   <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
 
   <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
 
-    
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
@@ -48,32 +78,136 @@
       <str name="echoParams">all</str>
     </lst>
   </requestHandler>
-   
+
   <!-- config for the admin interface --> 
   <admin>
-    <defaultQuery>solr</defaultQuery>
+    <defaultQuery>search</defaultQuery>
   </admin>
+
+
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <!-- default values for query parameters can be specified, these
+         will be overridden by parameters in the request
+      -->
+     <lst name="defaults">
+       <str name="defType">dismax</str>
+       <str name="echoParams">explicit</str>
+       <str name="q.alt">*:*</str>
+       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+       <!-- this qf and pf are used by default, if not otherwise specified by
+            client. The default blacklight_config will use these for the
+            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            below, which the default blacklight_config will specify for
+            those searches. You may also be interested in:
+            http://wiki.apache.org/solr/LocalParams
+       -->
+        <str name="qf">
+          id
+          title_t^25000
+          text
+          active_fedora_model_s
+          object_type_facet
+        </str>
+        <str name="pf">
+          id
+          title_t^250000
+          text^10
+          active_fedora_model_s
+          object_type_facet
+        </str>
+
+       <str name="author_qf">
+         author_unstem_search^200
+         author_addl_unstem_search^50
+         author_t^20
+         author_addl_t
+       </str>
+       <str name="author_pf">
+         author_unstem_search^2000
+         author_addl_unstem_search^500
+         author_t^200
+         author_addl_t^10
+       </str>
+       <str name="title_qf">
+         title_unstem_search^50000
+         subtitle_unstem_search^25000
+         title_addl_unstem_search^10000
+         title_t^5000
+         subtitle_t^2500
+         title_addl_t^100
+         title_added_entry_unstem_search^50
+         title_added_entry_t^10
+         title_series_unstem_search^5
+         title_series_t
+       </str>
+       <str name="title_pf">
+         title_unstem_search^500000
+         subtitle_unstem_search^250000
+         title_addl_unstem_search^100000
+         title_t^50000
+         subtitle_t^25000
+         title_addl_t^1000
+         title_added_entry_unstem_search^500
+         title_added_entry_t^100
+         title_series_t^50
+         title_series_unstem_search^10
+       </str>
+       <str name="subject_qf">
+         subject_topic_unstem_search^200
+         subject_unstem_search^125
+         subject_topic_facet^100
+         subject_t^50
+         subject_addl_unstem_search^10
+         subject_addl_t
+       </str>
+       <str name="subject_pf">
+         subject_topic_unstem_search^2000
+         subject_unstem_search^1250
+         subject_t^1000
+         subject_topic_facet^500
+         subject_addl_unstem_search^100
+         subject_addl_t^10
+       </str>
+       
+       <int name="ps">3</int>
+       <float name="tie">0.01</float>
+
+       <!-- NOT using marc_display because it is large and will slow things down for search results -->
+       <str name="fl">
+         *, 
+         score,
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">format</str>
+       <str name="facet.field">lc_1letter_facet</str>
+       <str name="facet.field">lc_alpha_facet</str>
+       <str name="facet.field">lc_b4cutter_facet</str>
+       <str name="facet.field">language_facet</str>
+       <str name="facet.field">pub_date</str>
+       <str name="facet.field">subject_era_facet</str>
+       <str name="facet.field">subject_geo_facet</str>
+       <str name="facet.field">subject_topic_facet</str>
+       
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
       
-  <requestHandler name="search" class="solr.SearchHandler" default="true" >
-    <lst name="defaults">
-      <str name="defType">dismax</str>
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str>
-      <str name="echoParams">explicit</str>
-      <float name="tie">0.01</float>
-      <str name="qf">id^0.8 id_t^0.8 format text^0.3</str>
-      <str name="pf">id^0.9  id_t^0.9 text^0.5</str>
-      <str name="fl">
-        id,text,title_t,date_t,year_facet,month_facet,medium_t,series_facet,box_facet,folder_facet,has_model_s
-      </str>
-      <str name="mm">
-        2&lt;-1 5&lt;-2 6&lt;90%
-      </str>
-      <int name="ps">100</int>
-      <str name="q.alt">*:*</str>
-    </lst>
   </requestHandler>
 
+
+<!-- Hydra Additions Start -->
+
   <requestHandler name="standard" class="solr.SearchHandler">
      <lst name="defaults">
        <str name="echoParams">explicit</str>
@@ -101,7 +235,9 @@
       </str>
     </lst>
   </requestHandler>
-  
+
+<!-- Hydra Additions End -->
+
   <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
   <requestHandler name="document" class="solr.SearchHandler" >
     <lst name="defaults">
@@ -113,33 +249,51 @@
   </requestHandler>
 
 
-   <!-- The spell check component can return a list of alternative spelling
-  suggestions.  -->
+
+   <!-- Spell Check
+
+        The spell check component can return a list of alternative spelling
+        suggestions.  
+
+        http://wiki.apache.org/solr/SpellCheckComponent
+     -->
   <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
 
     <str name="queryAnalyzerFieldType">textSpell</str>
 
+    <!-- Multiple "Spell Checkers" can be declared and used by this
+         component
+      -->
+
+    <!-- a spellchecker built from a field of the main index, and
+         written to disk
+      -->
     <lst name="spellchecker">
       <str name="name">default</str>
       <str name="field">spell</str>
-      <str name="spellcheckIndexDir">./spellchecker1</str>
-
+      <str name="spellcheckIndexDir">./spell</str>
+      <str name="buildOnOptimize">true</str>
     </lst>
     <lst name="spellchecker">
-      <str name="name">jarowinkler</str>
-      <str name="field">spell</str>
-      <!-- Use a different Distance Measure -->
-      <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>
-      <str name="spellcheckIndexDir">./spellchecker2</str>
-
+      <str name="name">author</str>
+      <str name="field">author_spell</str>
+      <str name="spellcheckIndexDir">./spell_author</str>
+      <str name="accuracy">0.7</str>
+      <str name="buildOnOptimize">true</str>
+    </lst>
+    <lst name="spellchecker">
+      <str name="name">subject</str>
+      <str name="field">subject_spell</str>
+      <str name="spellcheckIndexDir">./spell_subject</str>
+      <str name="accuracy">0.7</str>
+      <str name="buildOnOptimize">true</str>
     </lst>
-
     <lst name="spellchecker">
-      <str name="classname">solr.FileBasedSpellChecker</str>
-      <str name="name">file</str>
-      <str name="sourceLocation">spellings.txt</str>
-      <str name="characterEncoding">UTF-8</str>
-      <str name="spellcheckIndexDir">./spellcheckerFile</str>
+      <str name="name">title</str>
+      <str name="field">title_spell</str>
+      <str name="spellcheckIndexDir">./spell_title</str>
+      <str name="accuracy">0.7</str>
+      <str name="buildOnOptimize">true</str>
     </lst>
   </searchComponent>
 </config>

data/lib/generators/hydra/templates/solr_conf/solr.xml

@@ -28,7 +28,7 @@
   adminPath: RequestHandler path to manage cores.  
     If 'null' (or absent), cores will not be manageable via REST
   -->
-  <cores adminPath="/admin/cores">
+  <cores adminPath="/admin/cores" defaultCoreName="development">
     <core name="development" instanceDir="development-core" />
     <core name="test" instanceDir="test-core" />
   </cores>

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.0.0.pre14"
+  VERSION = "5.0.0.pre15"
 end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -72,7 +72,6 @@ describe CatalogController do
     describe "index" do
       it "should trigger enforce_index_permissions" do
         controller.should_receive(:add_access_controls_to_solr_params)
-        controller.should_receive(:enforce_index_permissions)
         get :index
       end
     end

data/spec/support/lib/generators/test_app_generator.rb

@@ -19,6 +19,10 @@ class TestAppGenerator < Rails::Generators::Base
     copy_file "spec/fixtures/hydra_test_generic_content.foxml.xml"
   end
 
+  def copy_rspec_rake_task
+    copy_file "lib/tasks/rspec.rake"
+  end
+
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
 

data/spec/support/lib/tasks/rspec.rake

@@ -0,0 +1,8 @@
+require 'rspec/core/rake_task'
+desc "run the hydra-core gem spec"
+gem_home = File.expand_path('../../../../..', __FILE__)
+RSpec::Core::RakeTask.new(:myspec) do |t|
+  t.pattern = gem_home + '/spec/**/*_spec.rb'
+  t.rspec_opts = "--colour"
+  t.ruby_opts = "-I#{gem_home}/spec"
+end

data/tasks/rspec.rake

@@ -3,12 +3,12 @@ require 'rspec/core/rake_task'
 
 
 desc "Run specs"
-RSpec::Core::RakeTask.new(:spec => [:generate, :fixtures]) do |t|
-  # if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
-  #   t.rcov = true
-  #   t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
-  # end
-  t.rspec_opts = "--colour"
+task :spec => [:generate, :fixtures] do |t|
+  Bundler.with_clean_env do
+    within_test_app do
+      system "rake myspec"
+    end
+  end
 end
 
 task :fixtures do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre14
+  version: 5.0.0.pre15
   prerelease: 6
 platform: ruby
 authors:
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre7
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre7
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc4
+        version: 5.0.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc4
+        version: 5.0.0.rc5
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre14
+        version: 5.0.0.pre15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre14
+        version: 5.0.0.pre15
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -382,6 +382,7 @@ files:
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
 - spec/support/lib/generators/test_app_generator.rb
+- spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
 - spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
@@ -439,6 +440,7 @@ test_files:
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
 - spec/support/lib/generators/test_app_generator.rb
+- spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
 - spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml