cleaning the code

Vivek G.S · Vivek G.S · commit fb0a543da1f9 · 2013-11-26T18:46:20.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+.project
+*.sublime-project
+*.sublime-workspace
+*.tmproj
+*.bak
+*.swp
+*~.nib
+node_modules/
diff --git a/app.js b/app.js
@@ -8,7 +8,7 @@ var express = require('express')
     app.set('views', __dirname + '/public');
 
    	app.use(express.bodyParser());
-
+    app.use(app.routes);
     routes(app);
 
     app.listen(3001);
diff --git a/dummy.js b/dummy.js
@@ -1,35 +1,23 @@
-var http = require('https');
-var urls = [
-    'https://ajax.googleapis.com/ajax/services/search/news?v=1.0&q=barack%20obama',
-    'https://ajax.googleapis.com/ajax/services/search/news?v=1.0&q=technology'
-];
-var allResults = [];
-var responded = 0;
-function collectResponse(res) {
-    var response = {};
-    res.setEncoding('utf8');
-    res.on('data', function(d) {
-        response.body = d;
-    });
+var http = require('http');
+function Restapi () {
+    this.curlCall = function(req,res){
+        var search = req.query.search;
+        var url =   'http://ajax.googleapis.com/ajax/services/search/news?v=1.0&q='+search;
+        http.get(url, this.collectData);
+    }
+    this.collectData = function(req,res){
 
-    res.on('end', function() {
-        //console.log(responseBody);
-//        var response = JSON.parse(responseBody);
-//        allResults = allResults.concat(response.results);
-        console.log(response.body.signedRedirectUrl);
-//        for(var i=0;i<=allResults.length;i++){
-//            console.log(allResults.content[i]);
-//        }
-//        response.forEach(function(result){
-//            console.log(result);
-//        });
-       // console.log('I have %d results for', response.results.length, res.req.path);
-//        responded += 1;
-//        if (responded == urls.length) {
-//            console.log('All responses ended. Number of total results:', allResults.length);
-//        }
-    });
+        res.setEncoding('utf8');
+        res.on('data', function(d) {
+            responseBody = d;
+        });
+        res.on('end', function(request,response) {
+            var responseEnd = JSON.parse(responseBody);
+            console.log(responseEnd);
+            return response.render('index', {
+                title: 'Index Page'
+            });
+        });
+    }
 }
-urls.forEach(function(url) {
-    http.get(url, collectResponse);
-});
+module.exports = Restapi;
diff --git a/public/index.html b/public/index.html
@@ -6,7 +6,7 @@
 </head>
 <body>
     <div id='content' >
-        <form id='send-form' method="get" action="/getresult">
+        <form id='send-form' method="get" action="/getresult/">
             <input id='search' type='text' value='' name="search"/>
             <input id='send' type='submit' value='Search'/>
         </form>
diff --git a/routes/index.js b/routes/index.js
@@ -1,13 +1,12 @@
-var Restapi = require('./restapi')
+var Restapi = require('./rest/restapi')
 module.exports = exports = function(app) { 
 
-	var restapi = new RestAPI(app);
+	var restapi = new Restapi(app);
 
 	app.get('/', function(req,res){
 		return res.render('index', {
                 title: 'Index Page'
             });
 	});
-
-	app.get('/getresult/:search', restapi.curlCall);
+	app.get('/getresult/', restapi.curlCall);
 }
diff --git a/routes/rest/restapi.js b/routes/rest/restapi.js
@@ -1,16 +1,17 @@
-var https = require('https');
-function RestAPI () {
+var http = require('http');
+function Restapi () {
     this.curlCall = function(req,res){
         var search = req.query.search;
-        var url =   'https://ajax.googleapis.com/ajax/services/search/news?v=1.0&q='+search;
-        console.log(url);
-        https.get(url,function(req,res){
-            console.log(res);
+        var url =   'http://ajax.googleapis.com/ajax/services/search/news?v=1.0&q='+search;
+        http.get(url,function(hreq,hres){
+            //hres.setEncoding('utf8');
+            //var resNews = JSON.parse(hres);
+            //console.log(resNews);
             return res.render('index', {
                 title: 'Search Page',
-                data:res
+                data:hres
             });
         });
     }
 }
-module.exports = RestAPI;
+module.exports = Restapi;
