Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hydra 830 #6

Merged
merged 2 commits into from
Jun 25, 2012
Merged

Hydra 830 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea4835b
HYDRA-830: Parsing has_model_s for model name
awead Jun 25, 2012
d13372b
Merge branch 'master' into HYDRA-830
awead Jun 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/active_fedora/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,9 @@ def self.load_instance_from_solr(pid,solr_doc=nil)
else
raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
end
klass = if class_str = solr_doc['active_fedora_model_s']
class_str.first.constantize
klass = if class_str = solr_doc['has_model_s']
# Parse RDF string "info:fedora/afmodel:ActiveFedora_Base"
class_str.first.split(/:/).last.gsub(/_/,"::").constantize
else
ActiveFedora::Base
end
Expand Down