solr_ead 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzBlY2QzY2Y2MzdlNDhjNDg3NjRjOWJkOWNkNWUyNzZkM2M2OWYwMw==
+    ZDQzY2IzYzhhODUxZTg0NTk0Njk1YzczN2U2ZWY1NGM0OTVhNTAwOA==
   data.tar.gz: !binary |-
-    MWYzMjQ0YTc1NDRiZmNmZTg2MTBlZWE1YmE0YzA1OTJhMzM5Yzg2OA==
+    MzIyMzM2N2U3MDkwMjJjNDc0MmZkZTJjNzJhZmFmY2FhMWQzNjRmYg==
 SHA512:
   metadata.gz: !binary |-
-    Yzk1ZWI5NTE4ZWE4ZDUzNGU5ZGQ4MWFjOTQxNDViZjc3OWY1MThmNjM5NmQ0
-    NTY4YjQ0YzYxYmNlOTlmMjhkNDE3YjczY2ZlMmNhN2E1NGFiYzQxMGEzMjA1
-    MWU0OTc1ZDJlNmI0ODk0MTVmYzNhMjJiNjg2MGFkMTI4NjJiN2E=
+    ZWMwYTZiYjdlNzY0YjU0YWUwN2FhYjljYzEwOTcyOGExYTVlMjY5MmUzODlh
+    NjFlMzAxZWIwNDkwNzYyYzJkOGYxMDJmZjA1MWRjZGZlYzE5ZTQ2NzQyODFh
+    Mzc5MDAwNTJmYjljMzM0ZDQ0YWUzMGQ2ZmIyYzJhNTk2MGMwMDA=
   data.tar.gz: !binary |-
-    Njg0MTY0Y2Q0YTQxMzViZmUwNTY3MzkwNjEwMTNlMjJlODZlYjE1ZWVlZWMy
-    ODZlNzMzZDM4YjhiZjg3NWIwNWY0Zjk2OTc4NGZmNzQ4OGM0MjUwNjI3ODZm
-    YWQxZDc3ZjQ4ZGVjM2ZhZWRkMmVjNjEwNjczM2Q5ODIxYmEzOTY=
+    MmQzNjA0NzdjYzA5MDkyMTI3MGNkMjFlZDEyMDQzZTVhYmFjMTc0NDc3ODk4
+    NjQwMmEyZjUzMTVhZDZhMzZlMmQ3ZjY0ZThjNmUxMDgxMjMxMjRhZTQ1YmIy
+    YjNlOGExYjM3ZTEyNDdhYmI4ODUwMjgxMDllOTcxNTFkOGIxNDk=

data/lib/solr_ead/behaviors.rb

@@ -47,13 +47,14 @@ module SolrEad::Behaviors
   # The solr fields returned by this method are:
   #
   # id:: Unique identifier using the id attribute and the <eadid>
-  # ead_id:: The <eadid> node of the ead. This is so we know which ead this component belongs to.
-  # parent_id:: The id attribute of the parent <c> node
-  # parent_id_s:: Array of all the parent component ids for a given component.
-  # parent_unittitles_display:: Array of title fields for all the parent components of a given component.
-  # component_level_i:: numeric level of the component
-  # component_children_b:: Boolean field indicating whether or not the component has any child <c> nodes attached to it
-  # collection_facet:: Title field of the ead document so we can facet on all components in a collection
+  # ead_ssi:: The <eadid> node of the ead. This is so we know which ead this component belongs to.
+  # parent_ssi:: The id attribute of the parent <c> node
+  # parent_ssm:: Array of all the parent component ids for a given component.
+  # parent_unittitles_ssm:: Array of title fields for all the parent components of a given component.
+  # parent_unittitles_teim:: Same as above but indexed
+  # component_level_ii:: numeric level of the component
+  # component_children_bsi:: Boolean field indicating whether or not the component has any child <c> nodes attached to it
+  # collection_sim:: Title field of the ead document so we can facet on all components in a collection
   #
   # These fields are used so that we may reconstruct placement of a single component
   # within the hierarchy of the original ead.
@@ -63,6 +64,7 @@ module SolrEad::Behaviors
     addl_fields[Solrizer.solr_name("parent", :stored_sortable)]              = node.parent.attr("id") unless node.parent.attr("id").nil?
     addl_fields[Solrizer.solr_name("parent", :displayable)]                  = parent_id_list(node)
     addl_fields[Solrizer.solr_name("parent_unittitles", :displayable)]       = parent_unittitle_list(node)
+    addl_fields[Solrizer.solr_name("parent_unittitles", :searchable)]        = parent_unittitle_list(node)
     addl_fields[Solrizer.solr_name("component_level", :type => :integer)]    = parent_id_list(node).length + 1
     addl_fields[Solrizer.solr_name("component_children", :type => :boolean)] = component_children?(node)
     addl_fields[Solrizer.solr_name("collection", :facetable)]                = node.xpath("//archdesc/did/unittitle").text

data/lib/solr_ead/component.rb

@@ -8,7 +8,6 @@ class SolrEad::Component
     t.root(:path=>"c")
     t.ref_(:path=>"/c/@id")
     t.level(:path=>"/c/@level", :index_as=>[:facetable])
-
     t.title(:path=>"unittitle", :attributes=>{ :type => :none }, :index_as=>[:displayable])
     t.unitdate(:index_as=>[:displayable])
 
@@ -21,12 +20,6 @@ class SolrEad::Component
     t.persname(:index_as=>[:facetable])
     t.subject(:index_as=>[:facetable])
 
-    # These terms are proxied to match with Blacklight's default facets, but otherwise
-    # you can remove them or rename the above facet terms to match with your solr
-    # implementation.
-    t.subject_geo(:proxy=>[:geogname])
-    t.subject_topic(:proxy=>[:subject])
-
     # Item
     t.container {
       t.label(:path => {:attribute=>"label"})
@@ -73,32 +66,11 @@ class SolrEad::Component
     t.scopecontent_heading(:path=>"scopecontent/head")
     t.userestrict(:path=>"userestrict/p", :index_as=>[:displayable])
     t.userestrict_heading(:path=>"userestrict/head")
-
-    # <odd> nodes
-    # These guys depend on what's in <head> so we do some xpathy stuff...
-    t.note(:path=>'odd[./head="General note"]/p', :index_as=>[:displayable])
-    t.accession(:path=>'odd[./head[starts-with(.,"Museum Accession")]]/p', :index_as=>[:displayable])
-    t.print_run(:path=>'odd[./head[starts-with(.,"Limited")]]/p', :index_as=>[:displayable])
-
   end
 
   def to_solr(solr_doc = Hash.new)
     super(solr_doc)
-    Solrizer.insert_field(solr_doc, "format", "Archival Item", :facetable)
-    heading = get_heading solr_doc[Solrizer.solr_name("parent_unittitles", :displayable)]
-    Solrizer.insert_field(solr_doc, "heading", heading, :displayable) unless heading.nil?
     Solrizer.insert_field(solr_doc, "ref", self.ref.first.strip, :stored_sortable)
   end
 
-  protected
-
-  def get_heading parent_titles = Array.new
-    return nil if parent_titles.nil?
-    if parent_titles.length > 0
-      [parent_titles, self.title.first].join(" >> ")
-    else
-      self.title.first
-    end
-  end
-
 end

data/lib/solr_ead/document.rb

@@ -7,22 +7,7 @@ class SolrEad::Document
   # Define each term in your ead that you want put into the solr document
   set_terminology do |t|
     t.root(:path=>"ead")
-
     t.eadid
-    t.corpname(:index_as=>[:facetable])
-    t.famname(:index_as=>[:facetable])
-    t.genreform(:index_as=>[:facetable])
-    t.geogname(:index_as=>[:facetable])
-    t.name(:index_as=>[:facetable])
-    t.persname(:index_as=>[:facetable])
-    t.subject(:index_as=>[:facetable])
-
-    # These terms are proxied to match with Blacklight's default facets, but otherwise
-    # you can remove them or rename the above facet terms to match with your solr
-    # implementation.
-    t.subject_geo(:proxy=>[:geogname])
-    t.subject_topic(:proxy=>[:subject])
-
     t.title(:path=>"archdesc/did/unittitle", :index_as=>[:searchable, :displayable])
     t.title_filing(:path=>"titleproper", :attributes=>{ :type => "filing" }, :index_as=>[:sortable])
     t.title_num(:path=>"archdesc/did/unitid")
@@ -34,9 +19,16 @@ class SolrEad::Document
     t.langcode(:path=>"did/langmaterial/language/@langcode")
     t.abstract(:path=>"archdesc/did/abstract", :index_as=>[:searchable])
 
+    # Facets
+    t.corpname(:index_as=>[:facetable])
+    t.famname(:index_as=>[:facetable])
+    t.genreform(:index_as=>[:facetable])
+    t.geogname(:index_as=>[:facetable])
+    t.name(:index_as=>[:facetable])
+    t.persname(:index_as=>[:facetable])
+    t.subject(:index_as=>[:facetable])
     t.collection(:proxy=>[:title], :index_as=>[:facetable])
 
-
     # General field available within archdesc
     t.accessrestrict(:path=>"archdesc/accessrestrict/p", :index_as=>[:searchable])
     t.accessrestrict_heading(:path=>"archdesc/accessrestrict/head", :index_as=>[:displayable])
@@ -77,13 +69,8 @@ class SolrEad::Document
 
   def to_solr(solr_doc = Hash.new)
     super(solr_doc)
-    solr_doc.merge!({"id"              => self.eadid.first.strip})
-    Solrizer.insert_field(solr_doc, "format", "Archival Collection", :facetable)
+    solr_doc.merge!({"id" => self.eadid.first.strip})
     Solrizer.insert_field(solr_doc, "ead", self.eadid.first.strip, :stored_sortable)
-    unless self.title_num.empty?
-      heading = "Guide to the " + self.title.first + " (" + self.title_num.first + ")"
-      Solrizer.insert_field(solr_doc, "heading", heading, :displayable)
-    end
     return solr_doc
   end
 

data/lib/solr_ead/version.rb

@@ -1,3 +1,3 @@
 module SolrEad
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/component_spec.rb

@@ -14,8 +14,8 @@ describe SolrEad::Component do
       before :each do
         additional_fields = {
           "id" => "TEST-0001ref010",
-          Solrizer.solr_name("ead", :stored_sortable)                          => "TEST-0001",
-          Solrizer.solr_name("parent", :stored_sortable)                       => "ref001",
+          Solrizer.solr_name("ead", :stored_sortable)                 => "TEST-0001",
+          Solrizer.solr_name("parent", :stored_sortable)              => "ref001",
           Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
           Solrizer.solr_name("parent_unittitles", :displayable)       => ["Series I", "Subseries A", "Subseries 1"],
           Solrizer.solr_name("component_children", :type => :boolean) => FALSE
@@ -26,7 +26,6 @@ describe SolrEad::Component do
       it "should accept additional fields from a hash" do
         @solr_doc["id"].should == "TEST-0001ref010"
         @solr_doc[Solrizer.solr_name("level", :facetable)].should include "item"
-        @solr_doc[Solrizer.solr_name("heading", :displayable)].first.should == "Series I >> Subseries A >> Subseries 1 >> Internal Revenue Service Form Information Return [RESTRICTED]"
         @solr_doc[Solrizer.solr_name("accessrestrict", :displayable)].first.should match /^This item .* is available.$/
       end
 
@@ -38,9 +37,9 @@ describe SolrEad::Component do
 
     it "should format heading_display with only one element" do
       additional_fields = {
-        "id"                        => "TEST-0001ref010",
-        Solrizer.solr_name("ead", :stored_sortable)                          => "TEST-0001",
-        Solrizer.solr_name("parent", :stored_sortable)                       => "ref001",
+        "id"                                                        => "TEST-0001ref010",
+        Solrizer.solr_name("ead", :stored_sortable)                 => "TEST-0001",
+        Solrizer.solr_name("parent", :stored_sortable)              => "ref001",
         Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
         Solrizer.solr_name("parent_unittitles", :displayable)       => [],
         Solrizer.solr_name("component_children", :type => :boolean) => FALSE
@@ -48,7 +47,6 @@ describe SolrEad::Component do
       solr_doc = @doc.to_solr(additional_fields)
       solr_doc["id"].should == "TEST-0001ref010"
       solr_doc[Solrizer.solr_name("level", :facetable)].should include "item"
-      solr_doc[Solrizer.solr_name("heading", :displayable)].first.should == "Internal Revenue Service Form Information Return [RESTRICTED]"
       solr_doc[Solrizer.solr_name("accessrestrict", :displayable)].first.should match /^This item .* is available.$/
     end       
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_ead
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: om