Merge pull request #5 from powermik/master

error getting csv
This commit is contained in:
ioBridge 2013-02-10 18:11:59 -08:00
commit ea6df07e8b
2 changed files with 4 additions and 3 deletions

View File

@ -58,7 +58,7 @@ Start Terminal
<code>bash < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )</code>
<code>echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function' >> ~/.bash_profile</code>
<code>source .bash_profile</code>
<code>source ~/.bash_profile</code>
<code>sudo aptitude install mysql-server libmysqlclient-dev libmysql-ruby</code>
Note: Enter and confirm a new MySQL password
@ -82,4 +82,4 @@ Start Terminal
<code>rake db:create</code>
<code>rake db:schema:load</code>
<code>rails server</code>
<code>rails server</code>

View File

@ -248,7 +248,8 @@ class FeedController < ApplicationController
end_time = get_floored_time(feeds.last.created_at, seconds)
# create empty array with appropriate size
timeslices = Array.new(((end_time - start_time) / seconds).floor)
timeslices = Array.new((((end_time - start_time) / seconds).abs).floor)
# create a blank clone of the first feed so that we only get the necessary attributes
empty_feed = create_empty_clone(feeds.first)