Permalink
Browse files

Merge branch 'master' of github.com:ireapps/census into pl

  • Loading branch information...
2 parents e8ef373 + fe298ed commit 1387f270e99b4b676946296642e12377686573f6 @onyxfish onyxfish committed Aug 8, 2011
Showing 341 changed files with 44,369 additions and 20,159 deletions.
@@ -1,5 +1,7 @@
<VirtualHost *:8080>
ServerName censusweb.beta.tribapps.com
+ ServerAlias census.beta.tribapps.com
+ ServerAlias census.tribapps.com
ServerAlias www.censusweb.beta.tribapps.com
SetEnv DEPLOYMENT_TARGET staging
@@ -26,8 +28,8 @@
RewriteEngine on
# canonical hostname
- RewriteCond %{HTTP_HOST} !^censusweb.beta.tribapps.com [NC]
- RewriteRule ^/(.*) http://censusweb.beta.tribapps.com/$1 [L,R]
+ RewriteCond %{HTTP_HOST} !^census.tribapps.com [NC]
+ RewriteRule ^/(.*) http://census.tribapps.com/$1 [L,R]
RewriteCond %{REQUEST_URI} /maintenance.html$
RewriteRule $ / [R=302,L]
View
@@ -45,11 +45,11 @@ def staging():
Work on staging environment
"""
env.settings = 'staging'
- env.hosts = ['censusweb.beta.tribapps.com']
+ env.hosts = ['census.tribapps.com']
env.user = 'ubuntu'
env.s3_bucket = 'media-beta.tribapps.com'
- env.site_domain = 'censusweb.beta.tribapps.com'
- env.cache_server = 'censusweb.beta.tribapps.com'
+ env.site_domain = 'census.tribapps.com'
+ env.cache_server = 'census.tribapps.com'
"""
Branches
@@ -4,7 +4,7 @@ $(function(){
Backbone.history.start()
if ( !location.hash )
location.hash=""
- }
+ };
ReportController = Backbone.Controller.extend({
routes: {
@@ -60,7 +60,7 @@ $(function(){
$("#ajax-loader").hide();
}
- })
+ });
Browser = Backbone.View.extend({
tagName: "aside",
@@ -132,5 +132,5 @@ $(function(){
defaultTables: function() {
window.location.hash = window.DEFAULT_TABLES;
}
- })
-})
+ });
+});
View
@@ -106,7 +106,7 @@ $(function(){
// Browser handles displaying reports
$("#ajax-loader").hide();
- startBrowser();
+ window.startBrowser();
}
});
});
@@ -253,14 +253,18 @@ $(function(){
// Table mouseover row highlighting.
$('.report td').live('mouseover mouseleave', function(e) {
if (e.type == 'mouseover') {
- status = ''
+ var status = '';
$(this).addClass("selected");
$(this).parent().addClass("highlight");
status = $(this).parent().find('.label').text();
if ($(this).index() > 0) {
$("colgroup", $(this).parents("table")).eq($(this).index()).addClass("highlight"); //column
- status += ', ' + $($(this).parents("table").find('.locationdef')[Math.ceil($(this).index()/4) - 1]).clone().find('*').remove().end().text().trim();
- status += ', ' + $($(this).parents("table").find('.subhead')[$(this).index() - 1]).text().trim();
+ try {
+ status += ', ' + $($(this).parents("table").find('.locationdef')[Math.ceil($(this).index()/4) - 1]).clone().find('*').remove().end().text().trim();
+ status += ', ' + $($(this).parents("table").find('.subhead')[$(this).index() - 1]).text().trim();
+ } catch(e) {
+ // IE doesn't seem to like this?
+ }
}
$('#status').show().text(status);
} else {
@@ -0,0 +1,16 @@
+#!/bin/bash
+# 17 IL
+./batch_sf.sh "Illinois" production
+./deploy_data.py staging
+./deploy_lookups.py staging
+./deploy_labels.py staging
+# 46 SD
+./batch_sf.sh "South Dakota" production
+# 32 NV
+./batch_sf.sh "Nevada" production
+# 41 OR
+./batch_sf.sh "Oregon" production
+# 18 IN
+./batch_sf.sh "Indiana" production
+# 53 WA
+./batch_sf.sh "Washington" production
View
@@ -15,7 +15,11 @@ For the geoheader files, which are fixed width, you may find useful the csvkit l
NOTE: Take care with character encoding. Some place names (such as those with Spanish words) contain non-ASCII characters. The Census Bureau encodes the files using "latin-1" encoding.
The in2csv example above handles this correctly. in2csv always writes output files in UTF-8, so adjust your database load scripts accordingly.
-Thanks to Ron Campbell of the Orange County Register for contributing the basis of **geo_2010.sql**
+Thanks to Ron Campbell of the Orange County Register for contributing the basis of **geo_2010.sql** Thanks to Mike Stucka of the Telegraph of Macon for suggestions to clarify the SQL and make it more compatible.
+
+Note that the column IDs do not exactly match the values printed in the SF1 technical documentation. Our method was to zero-pad digits to three positions, but we made no allowance for the occasional presence of letters qualifying race/ethnic variations on certain tables. Therefore, our column lengths vary in length somewhat compared to the SF1 versions of the labels. (If anyone is motivated to create an alternate SQL file or view which maintains tighter consistency with the SF1 technical documentation, please feel free to send a file or issue a pull request.)
+
+The column names in our SQL files align with the metadata files described below.
SAS
===
Oops, something went wrong.

0 comments on commit 1387f27

Please sign in to comment.