Skip to content

Commit

Permalink
Rescue for rss/fachinfo/item_to_html, not only parts of it
Browse files Browse the repository at this point in the history
  • Loading branch information
ngiger committed Jan 11, 2016
1 parent cf88125 commit 68f42d7
Showing 1 changed file with 27 additions and 28 deletions.
55 changes: 27 additions & 28 deletions src/view/rss/fachinfo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,37 @@ def item_to_html(context, fachinfo, feed)
iksnrs = nil
begin
iksnrs = fachinfo.iksnrs
rescue => e
puts "rss/fachinfo #{__LINE__}: rescue #{e.inspect} for rss/fachinfo #{__LINE__}: #{fachinfo.inspect}"
return ""
end
puts "rss/fachinfo #{__LINE__}: #{fachinfo.inspect} iksnrs #{iksnrs.inspect} language #{language}"
document = fachinfo.send(language)
return "" unless(document.is_a?(FachinfoDocument))
document = fachinfo.send(language)
return "" unless(document.is_a?(FachinfoDocument))

item = feed.items.new_item
item.author = "ODDB.org"
item = feed.items.new_item
item.author = "ODDB.org"

return "" unless fachinfo.respond_to?(:localized_name)
name = item.title = sanitize(fachinfo.localized_name(language))
return "" unless name
return "" unless iksnrs && iksnrs.is_a?(Array)
args = {:reg => iksnrs.first}
item.guid.content = item.link = @lookandfeel._event_url(:fachinfo, args)
item.guid.isPermaLink = true
item.date = fachinfo.revision.utc
return "" unless fachinfo.respond_to?(:localized_name)
name = item.title = sanitize(fachinfo.localized_name(language))
return "" unless name
return "" unless iksnrs && iksnrs.is_a?(Array)
args = {:reg => iksnrs.first}
item.guid.content = item.link = @lookandfeel._event_url(:fachinfo, args)
item.guid.isPermaLink = true
item.date = fachinfo.revision.utc

comp = FachinfoTemplate.new(fachinfo, @session, self)
comp = FachinfoTemplate.new(fachinfo, @session, self)

ptrn = /#{Regexp.escape(name)}(®|\(TM\))?/u
link = HtmlGrid::Link.new(:name, fachinfo, @session, self)
link.href = @lookandfeel._event_url(:search,
:search_type => 'st_sequence',
:search_query => name.gsub('/', '%2F'))
html = comp.to_html(context)
html.gsub!(%r{<pre\b.*?</pre>}imu) { |match| match.gsub(%r{\n}u, '<BR>') }
item.description = sanitize(html).gsub(ptrn) do |match|
link.value = match
link.to_html(context)
ptrn = /#{Regexp.escape(name)}(®|\(TM\))?/u
link = HtmlGrid::Link.new(:name, fachinfo, @session, self)
link.href = @lookandfeel._event_url(:search,
:search_type => 'st_sequence',
:search_query => name.gsub('/', '%2F'))
html = comp.to_html(context)
html.gsub!(%r{<pre\b.*?</pre>}imu) { |match| match.gsub(%r{\n}u, '<BR>') }
item.description = sanitize(html).gsub(ptrn) do |match|
link.value = match
link.to_html(context)
end
rescue => e
puts "rss/fachinfo #{__LINE__}: rescue #{e.inspect} for rss/fachinfo #{__LINE__}: #{fachinfo.inspect}"
return ""
end
end

Expand Down

0 comments on commit 68f42d7

Please sign in to comment.