solr_ead 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,39 +1,39 @@
 PATH
   remote: .
   specs:
-    solr_ead (0.2.0)
-      om (~> 1.8.0)
+    solr_ead (0.3.2)
+      om
       rsolr
       sanitize
-      solrizer (~> 2.0.0)
+      solrizer (~> 2.1.0.rc1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.4)
     columnize (0.3.6)
     daemons (1.1.9)
-    debugger (1.2.2)
+    debugger (1.2.3)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
       debugger-ruby_core_source (~> 1.1.5)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.5)
+    debugger-ruby_core_source (1.1.6)
     deprecation (0.0.5)
       activesupport
     diff-lcs (1.1.3)
     i18n (0.6.1)
-    json (1.7.5)
+    json (1.7.6)
     mediashelf-loggable (0.4.9)
-    multi_json (1.4.0)
-    nokogiri (1.5.5)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
     om (1.8.0)
       activemodel
       activesupport
@@ -49,20 +49,21 @@ GEM
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    solrizer (2.0.0)
+    solrizer (2.1.0.rc1)
+      activesupport
       daemons
       mediashelf-loggable (~> 0.4.7)
       nokogiri
       om (>= 1.5.0)
       stomp
       xml-simple
-    stomp (1.2.7)
+    stomp (1.2.8)
     xml-simple (1.1.2)
     yard (0.8.3)
 

data/README.md

@@ -50,11 +50,22 @@ You can also do this via the command line:
 This code originated in a Blacklight application and some of its default solr fields
 reflect a Blacklight-style solr implementation.  For example, certain facet fields such as
 subject_topic_facet and title_display will appear in your solr index by default.  If you
-are trying out the gem within a default Blacklight installation, you should be able to
-index your ead without any modifications.  However, the only fields that will appear in
-your search results will be format and title.  In order to make this into working
-solution, you'll need to modify both the definitions of documents and components within
-SolrEad and configure Blacklight's own display and facet fields accordingly.
+are trying out the gem within a default Blacklight installation, you will need to make
+the following changes to your schema.xml file:
+
+    <dynamicField name="*_id" type="string" indexed="true" stored="true" multiValued="false" />
+    <dynamicField name="*_s"  type="string" indexed="true" stored="true" multiValued="true"  />
+
+Fields ending in "_id" are used for identifying components within finding aids as well as
+the finding aid itself, which may not always be the same as the default "id" field for
+the solr document.  "_s" fields are not multivalued by default in Blacklight, so you'll
+need to edit the existing entry for this dyamic field to reflect the change.
+
+Other than that, your solr configuration should require no futher modifications;
+however,  the only fields that will appear in your search results will be format
+and title.  In order to make this into working solution, you'll need to modify
+both the definitions of documents and components within SolrEad and configure
+Blacklight's own display and facet fields accordingly.
 
 ## Applications
 
@@ -160,6 +171,15 @@ your solrconfig.xml file, under the "search" request handler:
 
     <lst name="appends"><str name="fq">-component_children_b:[TRUE TO *]</str></lst>
 
+## Issues
+
+### eadid format
+
+solr_ead uses the <eadid> node to create unique ids for documents.  Consequently, if you're using
+a rails app, this id will be a part of the url.  If your eadid has .xml or some other combination
+of characters preceeded by a period, this will cause Rails to interpret these characters as a 
+format, which you don't want.  You may need to edit your eadid nodes if this is the case.
+
 ## Contributing
 
 If you have questions or have specific needs, let me know. If you have other ideas or

data/lib/solr_ead/component.rb

@@ -86,7 +86,7 @@ class SolrEad::Component
     super(solr_doc)
     solr_doc.merge!({"format" => "Archival Item"})
     solr_doc["parent_unittitles_display"].length > 0 ? solr_doc.merge!({"heading_display" => [ solr_doc["parent_unittitles_display"], self.title.first].join(" >> ")  }) : solr_doc.merge!({"heading_display" => self.title.first  })
-    solr_doc.merge!({"ref_id" => self.ref.first})
+    solr_doc.merge!({"ref_id" => self.ref.first.strip})
   end
 
 end

data/lib/solr_ead/document.rb

@@ -52,6 +52,8 @@ class SolrEad::Document
     t.arrangement_heading(:path=>"archdesc/arrangement/head", :index_as=>[:displayable])
     t.bioghist(:path=>"archdesc/bioghist/p", :index_as=>[:searchable])
     t.bioghist_heading(:path=>"archdesc/bioghist/head", :index_as=>[:displayable])
+    t.bibliography(:path=>"archdesc/bibliography/bibref", :index_as=>[:searchable])
+    t.bibliography_heading(:path=>"archdesc/bibliography/head", :index_as=>[:displayable])
     t.custodhist(:path=>"archdesc/custodhist/p", :index_as=>[:searchable])
     t.custodhist_heading(:path=>"archdesc/custodhist/head", :index_as=>[:displayable])
     t.fileplan(:path=>"archdesc/fileplan/p", :index_as=>[:searchable])
@@ -75,8 +77,8 @@ class SolrEad::Document
 
   def to_solr(solr_doc = Hash.new)
     super(solr_doc)
-    solr_doc.merge!({"id"              => self.eadid.first})
-    solr_doc.merge!({"ead_id"          => self.eadid.first})
+    solr_doc.merge!({"id"              => self.eadid.first.strip})
+    solr_doc.merge!({"ead_id"          => self.eadid.first.strip})
     solr_doc.merge!({"format"          => "Archival Collection"})
     solr_doc.merge!({"heading_display" => ("Guide to the " + self.title.first + " (" + self.title_num.first + ")")}) unless self.title_num.empty?
     return solr_doc

data/lib/solr_ead/indexer.rb

@@ -41,6 +41,7 @@ class Indexer
   # Creates a new instance of SolrEad::Indexer and connects to your solr server
   # using the url supplied in your config/solr.yml file.
   def initialize(opts={})
+    Solrizer.default_field_mapper = EadMapper.new
     if defined?(Rails.root)
       url = YAML.load_file(File.join(Rails.root,"config","solr.yml"))[Rails.env]['url']
     elsif ENV['RAILS_ENV']

data/lib/solr_ead/version.rb

@@ -1,3 +1,3 @@
 module SolrEad
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/solr_ead.rb

@@ -10,7 +10,6 @@ module SolrEad
 end
 
 require "ead_mapper"
-require "terminology_based_solrizer"
 require "solr_ead/behaviors"
 require "solr_ead/om_behaviors"
 require "solr_ead/indexer"

data/lib/tasks/solr_ead.rake

@@ -1,5 +1,3 @@
-require "solr_ead"
-
 namespace :solr_ead do
 
   desc "Index and ead into solr using FILE=<path/to/ead.xml>"

data/solr_ead.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = SolrEad::VERSION
 
   # Dependencies
-  gem.add_dependency('om',       '~> 1.8.0')
-  gem.add_dependency('solrizer', '~> 2.0.0')
+  gem.add_dependency('om')
+  gem.add_dependency('solrizer', '~> 2.1.0.rc1')
   gem.add_dependency('rsolr')
   gem.add_dependency('sanitize')
   gem.add_development_dependency('yard')

data/spec/document_spec.rb

@@ -3,10 +3,13 @@ require "spec_helper"
 describe SolrEad::Document do
 
   before(:all) do
+    Solrizer.default_field_mapper = EadMapper.new
     @ex1 = SolrEad::Document.from_xml(fixture "ARC-0005.xml")
     @ex2 = SolrEad::Document.from_xml(fixture "pp002010.xml")
+    @ex3 = SolrEad::Document.from_xml(fixture "ARC-0161.xml")
     @solr_ex1 = @ex1.to_solr
     @solr_ex2 = @ex2.to_solr
+    @solr_ex3 = @ex3.to_solr
   end
 
   describe "#terminology" do
@@ -44,6 +47,10 @@ describe SolrEad::Document do
       @ex2.to_xml.should match "<c01\s"\
     end
 
+    it "should have a bibliography" do
+      @ex3.bibliography.first.should == "All Music Guide. Accessed February 4, 2013. http://www.allmusic.com/."
+    end
+
   end
 
   describe ".to_solr" do