Fix json output and hdfs reference fix

Author: quidryan

build.gradle

@@ -1,4 +1,4 @@
-version = '0.2'
+version = '0.3'
 
 // Modify these values if you want to build against different versions of Hadoop
 hadoop_version = '0.20.2'

src/main/java/org/hackreduce/mappers/Stage2Mapper.java

@@ -39,11 +39,12 @@ public class Stage2Mapper extends Mapper<LongWritable, Text, Text, CityYearRecor
     @Override
     public void setup(Context context) {
         try {
-            URI citiesURI = new URI("/datasets/geonames/");
-            FileSystem fileSystem= FileSystem.get(citiesURI, context.getConfiguration());
+            URI citiesURI = new URI("/");
+
+            FileSystem fileSystem= FileSystem.get(context.getConfiguration());
 
             Reader reader;
-            Path citiesPath = new Path("cities15000.txt");
+            Path citiesPath = new Path("/datasets/geonames/cities15000.txt");
             if( fileSystem.exists(citiesPath) ) {
                 FSDataInputStream in = fileSystem.open(citiesPath);
                 reader = new InputStreamReader(in);

src/main/java/org/hackreduce/models/CityYearRecord.java

@@ -63,13 +63,13 @@ public void readFields(DataInput in) throws IOException {
 
       public String toString(){
       	String result = "{" ; 
-      	result += "count:\"" +  this.count + "\",";
-      	result += "city:\""  + this.cr.asciiname + "\",";
-      	result += "long:\"" + this.cr.longitude + "\",";
-      	result += "lat:\"" + this.cr.latitude + "\",";
-      	result += "year:\"" + this.year + "\",";
-        result += "population:\"" + this.cr.population + "\",";
-      	result += "id:\"" + this.cr.geonameid + "\"}";
+      	result += "\"count\":\"" +  this.count + "\",";
+      	result += "\"city\":\""  + this.cr.asciiname + "\",";
+      	result += "\"long\":\"" + this.cr.longitude + "\",";
+      	result += "\"lat\":\"" + this.cr.latitude + "\",";
+      	result += "\"year\":\"" + this.year + "\",";
+        result += "\"population\":\"" + this.cr.population + "\",";
+      	result += "\"id\":\"" + this.cr.geonameid + "\"}";
       	return result;
 
         }