Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur: Wrong logging error. Temporary fix for broken river of news. Fixing broken starred stories (with no classifiers).
lmorchard · Oct 25, 2011 · 02c40ac · 02c40ac
2 parents 4486d9d + 881d89e
commit 02c40ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py
@@ -190,7 +190,7 @@ def import_signup(request):
                 login_user(request, new_user)
                 return HttpResponseRedirect(reverse('index'))
             else:
-                logging.info(request, "~BR~FW ***> Can't find user token during import/signup. Re-authenticating...")
+                logging.user(request, "~BR~FW ***> Can't find user token during import/signup. Re-authenticating...")
                 return HttpResponseRedirect(reverse('google-reader-authorize'))
     else:
         signup_form = SignupForm(prefix='signup')

diff --git a/apps/reader/views.py b/apps/reader/views.py
@@ -528,7 +528,7 @@ def load_river_stories(request):
     mstories = MStory.objects(
         story_guid__nin=read_stories,
         story_feed_id__in=feed_ids,
-        story_date__gte=start - bottom_delta
+        # story_date__gte=start - bottom_delta
     ).map_reduce("""function() {
             var d = feed_last_reads[this[~story_feed_id]];
             if (this[~story_date].getTime()/1000 > d) {

diff --git a/fabfile.py b/fabfile.py
@@ -219,7 +219,7 @@ def setup_task():
 def setup_installs():
     sudo('apt-get -y update')
     sudo('apt-get -y upgrade')
-    sudo('apt-get -y install build-essential gcc scons libreadline-dev sysstat iotop git zsh python-dev locate python-software-properties libpcre3-dev libssl-dev make pgbouncer python-psycopg2 libmemcache0 memcached python-memcache libyaml-0-2 python-yaml python-numpy python-scipy python-imaging munin munin-node munin-plugins-extra curl ntp monit')
+    sudo('apt-get -y install build-essential gcc scons libreadline-dev sysstat iotop git zsh python-dev locate python-software-properties libpcre3-dev libdbd-pg-perl libssl-dev make pgbouncer python-psycopg2 libmemcache0 memcached python-memcache libyaml-0-2 python-yaml python-numpy python-scipy python-imaging munin munin-node munin-plugins-extra curl ntp monit')
     sudo('add-apt-repository ppa:pitti/postgresql')
     sudo('apt-get -y update')
     sudo('apt-get -y install postgresql-client-9.0')

diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js
@@ -3359,7 +3359,9 @@
 
         make_story_feed_title: function(story) {
             var title = story.story_title;
-            var feed_titles = this.model.classifiers[story.story_feed_id].titles;
+            var feed_titles = this.model.classifiers[story.story_feed_id] && 
+                              this.model.classifiers[story.story_feed_id].titles ||
+                              [];
 
             _.each(feed_titles, function(score, title_classifier) {
                 if (title.indexOf(title_classifier) != -1) {
@@ -3370,15 +3372,18 @@
         },
 
         make_story_feed_author: function(story) {
-            var score = this.model.classifiers[story.story_feed_id].authors[story.story_authors];
+            var score = this.model.classifiers[story.story_feed_id] && 
+                        this.model.classifiers[story.story_feed_id].authors[story.story_authors];
 
             return $.make('div', { 
                 className: 'NB-feed-story-author ' + (!!score && 'NB-score-'+score || '') 
             }, story.story_authors).data('author', story.story_authors);
         },
 
         make_story_feed_tags: function(story) {
-            var feed_tags = this.model.classifiers[story.story_feed_id].tags;
+            var feed_tags = this.model.classifiers[story.story_feed_id] && 
+                            this.model.classifiers[story.story_feed_id].tags ||
+                            {};
 
             return $.make('div', { className: 'NB-feed-story-tags' }, 
                 _.map(story.story_tags, function(tag) {