Merge branch 'master' of heroku.com:obscure-caverns-2114

idk
clementmiao · Mar 12, 2014 · 2ae8ce9 · 2ae8ce9
2 parents c572ffd + e628f76
commit 2ae8ce9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 9 deletions.
diff --git a/chicago_api/settings.py~ b/chicago_api/settings.py~
@@ -81,13 +81,7 @@ DATABASES = {
      }
  }
 
-#DATABASES = {
-#    'default': {
-#        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-#        'NAME': 'chicago_api',
-#        'USER': 'clementmiao',
-#    }
-#}
+
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
@@ -111,7 +105,7 @@ STATIC_URL = '/static/'
 
 # Parse database configuration from $DATABASE_URL
 import dj_database_url
-# DATABASES['default'] =  dj_database_url.config()
+DATABASES['default'] =  dj_database_url.config()
 
 # DATABASES = {'default': dj_database_url.config()}
 # DATABASES = {'default': dj_database_url.config(default='postgres://pgddcfmpztaggy:55_6JhtdTBVJWhUdE5Dxu99lyb@ec2-54-197-227-238.compute-1.amazonaws.com:5432/d3hqtt3qjo674c')}

diff --git a/chicago_api/urls.py~ b/chicago_api/urls.py~
@@ -0,0 +1,13 @@
+from django.conf.urls import patterns, include, url
+
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    url(r'^$', 'chicago_api.views.home', name='home'),
+    # url(r'^blog/', include('blog.urls')),
+    url(r'^gmap/', include('gmap.urls')),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^social_data/',include('social_data.urls')),
+)
diff --git a/social_data/icons/neighborhoods_2012.kmz b/social_data/icons/neighborhoods_2012.kmz
diff --git a/social_data/neighborhoods_2012.kmz b/social_data/neighborhoods_2012.kmz
diff --git a/social_data/scrape_facebook.py b/social_data/scrape_facebook.py
@@ -54,7 +54,7 @@ def scrape_facebook():
 			date = d0 + timedelta(seconds = x['timestamp'])
 			post = Post(service = s, latitude = x['latitude'],\
 				longitude = x['longitude'], identifier = x['id'],\
-				 text = x['message'], link = "", image= "",\
+				 text = x['message'][:256], link = "", image= "",\
 				  timestamp = date)
 			post.save()
 

diff --git a/social_data/urls.py~ b/social_data/urls.py~
@@ -0,0 +1,16 @@
+from django.conf.urls import patterns, include, url
+from django.conf import settings
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    url(r'^$', 'social_data.views.home', name='social-home'),
+    (r'^icons/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': settings.BASE_DIR + "/social_data/icons"}),
+    # url(r'^icons/twitter','social_data.views.home')
+    # url(r'^icons/(?P<meal_id>\d+)/$', '.views.meal', name='diary-meal'),
+)
+