RubyGems - hydra-head - Versions diffs - 3.0.0 → 3.0.1 - Mend

hydra-head 3.0.0 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

data/HISTORY.textile +7 -0
data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb +2 -2
data/lib/generators/hydra/templates/solr_conf/conf/schema.xml +7 -1
data/lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml +117 -55
data/lib/hydra-head/version.rb +1 -1
data/test_support/features/html_validity.feature +2 -2
data/test_support/features/mods_asset_search_result.feature +2 -2
metadata +4 -4

data/HISTORY.textile CHANGED Viewed

@@ -1,3 +1,10 @@
+h3. 3.0.1
+* generator has the correct solr config files
+* reverted back to using object_type_facet for "Format" facet.  This is instead of using active_fedora_model_s, which made some cucumber tests unstable because active_fedora_model_s is populated inconsistently by ActiveFedora (really we should deprecate that solr field)
+h2. 3.0.0: Upgrade to Rails 3
 h3. 0.0.1
 Pulled plugin code from Hydrus

data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb CHANGED Viewed

@@ -51,7 +51,7 @@ Blacklight.configure(:shared) do |config|
   #
   config[:facet] = {
     :field_names => (facet_fields = [
-      "active_fedora_model_s",
+      "object_type_facet",
       "pub_date",
       "subject_topic_facet",
       "language_facet",
@@ -60,7 +60,7 @@ Blacklight.configure(:shared) do |config|
       "subject_era_facet"
     ]),
     :labels => {
-      "active_fedora_model_s"   => "Format",
+      "object_type_facet"   => "Format",
       "pub_date"            => "Publication Year",
       "subject_topic_facet" => "Topic",
       "language_facet"      => "Language",

data/lib/generators/hydra/templates/solr_conf/conf/schema.xml CHANGED Viewed

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+IMPORTANT
+This copy of the solr schema is only used in the context of testing hydra-head.  If you want to make changes available to individual hydra heads, you must apply them to the template in lib/generators/hydra/templates/solr_config
+-->
 <schema name="Hydra" version="1.1">
   <!-- For complete comments from the Solr project example schema.xml:
       http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/schema.xml?view=markup
@@ -91,7 +95,7 @@
    <field name="format" type="string" indexed="true" stored="true"/>
    <!-- pub_date is assumed by Blacklight's default configuration, so we must define it here to avoid errors -->
    <field name="pub_date" type="string" indexed="true" stored="true" multiValued="true"/>
    <dynamicField name="*_i"  type="sint"    indexed="true"  stored="true"/>
    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>
    <dynamicField name="*_l"  type="slong"   indexed="true"  stored="true"/>
@@ -114,5 +118,7 @@
  <defaultSearchField>text</defaultSearchField>
  <solrQueryParser defaultOperator="AND" />
  <copyField source="*_facet" dest="text" />
+ <copyField source="*_t" dest="text" />
+ <copyField source="*_s" dest="text" />
 </schema>

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

@@ -82,51 +82,121 @@
      </lst>
   </requestHandler>
-  <!-- For complete comments from the Solr project example solrconfig.xml:
-      http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
-    See also:
-      http://wiki.apache.org/solr/SolrConfigXml
-  -->
+  <!-- Searching ("All Fields") -->
+    <requestHandler name="search" class="solr.SearchHandler" default="true">
+      <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>
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <lst name="defaults">
-      <!-- Making defType lucene to exclude file assets -->
-      <str name="defType">lucene</str>
-      <!-- lucene params -->
-      <str name="df">has_model_s</str>
-      <str name="q.op">AND</str>
-      <!-- dismax params -->
-      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
-      <str name="q.alt">*:*</str>
-      <str name="qf_dismax">id^0.8 id_t^0.8 title_t^0.3 mods_t^0.2</str>
-      <str name="pf_dismax">id^0.9  id_t^0.9 title_t^0.5 mods_t^0.2</str>
-      <int name="ps">100</int>
-      <float name="tie">0.01</float>
-      <!-- general -->
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str>
-	    <str name="echoParams">explicit</str>
-      <str name="fl">
-        id,title_t,date_t,year_facet,month_facet,has_model_s,has_collection_member_s,is_part_of_s,system_create_dt,
-        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,
-        person_7_role_t,person_8_role_t,person_9_role_t,
-        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,
-        person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
-        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,
-        person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,
-        status_t,subject_t,depositor_t,
-				journal_title_info_t,journal_issue_publication_date_t,
-				journal_issue_pages_end_t,journal_issue_volume_t,journal_title_info_main_title_t,journal_issue_pages_start_t,
-				journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
-        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
-        person_7_institution_t,person_8_institution_t,person_9_institution_t,
-        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
-        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_main_title_t, mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
-        object_type_facet, department_facet, peer_reviewed_facet
-      </str>
-    </lst>
-  </requestHandler>
+        <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>
   <requestHandler name="public_search" class="solr.SearchHandler" >
     <lst name="defaults">
       <!-- Making defType lucene to exclude file assets -->
@@ -137,6 +207,8 @@
       <!-- dismax params -->
       <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
       <str name="q.alt">*:*</str>
+      <str name="qf">id^0.8 id_t^0.8 format text^0.3 journal_issn_t</str>
+      <str name="pf">id^0.9  id_t^0.9 text^0.5 journal_issn_t</str>
       <str name="qf_dismax">id^0.8 id_t^0.8 format text^0.3</str>
       <str name="pf_dismax">id^0.9  id_t^0.9 text^0.5</str>
       <int name="ps">100</int>
@@ -146,17 +218,7 @@
       <str name="facet.mincount">1</str>
 	    <str name="echoParams">explicit</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,has_collection_member_s,system_create_dt,
-        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,person_7_role_t,person_8_role_t,person_9_role_t,
-        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
-        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,depositor_t,
-        journal_title_info_t, journal_title_info_main_title_t, journal_issue_publication_date_t, journal_issue_pages_start_t, journal_issue_pages_end_t, journal_issue_volume_t, journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
-        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
-        person_7_institution_t,person_8_institution_t,person_9_institution_t,
-        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
-        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_t,mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
-        object_type_facet, department_facet, peer_reviewed_facet
+       *,score
       </str>
     </lst>
   </requestHandler>

data/lib/hydra-head/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test_support/features/html_validity.feature CHANGED Viewed

@@ -14,14 +14,14 @@ Feature: HTML validity
   Scenario: Search Results (unauthenticated)
     Given I am on the home page
-    When I follow "ModsAsset"
+    When I follow "Article"
     Then I should see "TITLE OF HOST JOURNAL"
     And the page should be HTML5 valid
   Scenario: Search Results (authenticated)
     Given I am logged in as "archivist1@example.com"
     When I am on the home page
-    And I follow "ModsAsset"
+    And I follow "Article"
     Then I should see "TITLE OF HOST JOURNAL"
     And the page should be HTML5 valid

data/test_support/features/mods_asset_search_result.feature CHANGED Viewed

@@ -13,12 +13,12 @@ Feature: ModsAsset Search Result
   Scenario: html5 valid - unauthenticated
     Given I am on the home page
-    When I follow "ModsAsset"
+    When I follow "Article"
     Then the page should be HTML5 valid
   Scenario: html5 valid - authenticated
     Given I am logged in as "archivist1@example.com"
     When I am on the home page
-    And I follow "ModsAsset"
+    And I follow "Article"
     Then the page should be HTML5 valid

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  hash: 7
+  hash: 5
   prerelease:
   segments:
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00 -08:00
+date: 2011-11-10 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency