Merge branch 'master' into hush_the_hound

samvera · May 17, 2016 · 76189b7 · 76189b7
2 parents bd94387 + 89c7e93
commit 76189b7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/...s/curation_concerns/generic_work_actor.rb → ...ion_concerns/actors/generic_work_actor.rb b/...s/curation_concerns/generic_work_actor.rb → ...ion_concerns/actors/generic_work_actor.rb
@@ -1,6 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work GenericWork`
 module CurationConcerns
-  class GenericWorkActor < CurationConcerns::Actors::BaseActor
+  module Actors
+    class GenericWorkActor < CurationConcerns::Actors::BaseActor
+    end
   end
 end
diff --git a/solr/config/solrconfig.xml b/solr/config/solrconfig.xml
@@ -17,42 +17,41 @@
 -->
 
 <!--
- This is a stripped down config file used for a simple example...  
- It is *not* a good example to work from. 
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
 -->
 <config>
-  
+
   <!-- 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>5.0.0</luceneMatchVersion>
-  
+
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
   <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-  </directoryFactory> 
+  </directoryFactory>
 
   <codecFactory class="solr.SchemaCodecFactory"/>
 
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
-
   <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-  
+
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
   </requestDispatcher>
-  
+
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
 
-  <!-- config for the admin interface --> 
+  <!-- config for the admin interface -->
   <admin>
     <defaultQuery>*:*</defaultQuery>
   </admin>
@@ -188,10 +187,21 @@
     </lst>
   </requestHandler>
 
+ <searchComponent name="termsComponent" class="solr.TermsComponent" />
+
+  <requestHandler name="/terms" class="solr.SearchHandler">
+    <lst name="defaults">
+      <bool name="terms">true</bool>
+    </lst>
+    <arr name="components">
+      <str>termsComponent</str>
+    </arr>
+  </requestHandler>
+
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -246,7 +256,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -309,4 +319,3 @@
     <!-- </lst> -->
   </requestHandler>
 </config>
-
diff --git a/...ation_concerns/generic_work_actor_spec.rb → ...oncerns/actors/generic_work_actor_spec.rb b/...ation_concerns/generic_work_actor_spec.rb → ...oncerns/actors/generic_work_actor_spec.rb
@@ -2,7 +2,7 @@
 #  `rails generate curation_concerns:work GenericWork`
 require 'rails_helper'
 
-RSpec.describe CurationConcerns::GenericWorkActor do
+RSpec.describe CurationConcerns::Actors::GenericWorkActor do
   it "has tests" do
     skip "Add your tests here"
   end