update with changes from Production branch

This commit is contained in:
Lee Lawlor
2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions

View File

@ -0,0 +1,11 @@
<%= @count %> records processed
<br>
<%= @time_start %> => start controller
<br>
<%= @time_after_db %> => after database operations (<%= @time_after_db - @time_start %> seconds)
<br>
<%= @time_after_sort %> => after sorting (<%= @time_after_sort - @time_after_db %> seconds)
<br>
<%= @time_after_json %> => after to_json is processed (<%= @time_after_json - @time_after_sort %> seconds)
<br>
<%= Time.now %> => after view output (<%= Time.now - @time_after_json %> seconds)

View File

@ -1,2 +1,2 @@
<% if @success %><%= CSV.generate_line @csv_headers %><% @feed_output.each do |feed| %><% row = [] %><% @csv_headers.each do |attr| %><% row.push(feed.send(attr)) %><% end %><%= CSV.generate_line row %><% end %><% else %>-1<% end %>
<% if @success %><%= CSV.generate_line @csv_headers %><% @feed_output.each do |feed| %><% row = [] %><% @csv_headers.each do |attr| %><% row.push(feed.send(attr)) %><% end %><%= CSV.generate_line(row).html_safe %><% end %><% else %>-1<% end %>

View File

@ -1 +1 @@
<%= render :partial => 'index.json.erb' %>
<%= render :partial => 'feed/index.json.erb' %>