Merge branch 'sfx4solr' of github.com:team-umlaut/umlaut into sfx4solr

team-umlaut · Nov 7, 2012 · 60bb07d · 60bb07d
2 parents 5a6dec5 + e2af64a
commit 60bb07d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/search_methods/sfx4_solr/README.md b/app/controllers/search_methods/sfx4_solr/README.md
@@ -45,7 +45,7 @@ SearchMethod in order to avoid (promote?) ambiguity and confusion.
 
 Once your Solr instance is configured and started, run
 
-    $ rake sunspot:reindex
+    $ rake sunspot:reindex[,Sfx4::Local::AzTitle]
 
 to index the AZ titles in Solr. This reindex should probably be run periodically and coincide with SFX KB updates.
 

diff --git a/app/models/sfx4/abstract/az_extra_info.rb b/app/models/sfx4/abstract/az_extra_info.rb
@@ -17,7 +17,7 @@ def self.included(klass)
           self.primary_key = 'AZ_EXTRA_INFO_ID'
 
           belongs_to :az_title,
-                     :foreign_key => 'AZ_TITLE_ID',
+                     :foreign_key => 'OBJECT_ID',
                      :class_name => "#{klass.to_s.deconstantize}::AzTitle"
 
           include MetadataHelper # for normalize_lccn
@@ -37,7 +37,7 @@ def lccn
       end
 
       def extra_info_xml
-        @extra_info_xml ||= Nokogiri::XML(EXTRA_INFO_XML)
+        @extra_info_xml ||= Nokogiri::XML(self.EXTRA_INFO_XML)
       end
     end
   end

diff --git a/app/models/sfx4/abstract/az_title.rb b/app/models/sfx4/abstract/az_title.rb
@@ -31,6 +31,7 @@ def self.included(klass)
                     :class_name => "#{klass.to_s.deconstantize}::AzLetterGroup"
 
           has_one   :az_extra_info,
+                    :primary_key => 'OBJECT_ID',
                     :foreign_key => 'OBJECT_ID',
                     :class_name => "#{klass.to_s.deconstantize}::AzExtraInfo"