[bug fix] + pass city id in jakdojade.pl requests

Stanley · Oct 15, 2011 · e3081a7 · e3081a7
1 parent 8e37cb5
commit e3081a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/bin/import/stops/jakdojade.js b/bin/import/stops/jakdojade.js
@@ -6,21 +6,19 @@ var request = require('request')
 
 var city = process.argv[2]
 
-request({uri:'http://'+city+'.jakdojade.pl/molbas/transit', method:'POST', headers: {
+request({uri:'http://krakow.jakdojade.pl/molbas/transit', method:'POST', headers: {
   'Accept':'*/*',
   'Accept-Charset':'ISO-8859-2,utf-8;q=0.7,*;q=0.3',
   'Accept-Language':'pl-PL,pl;q=0.8,en-US;q=0.6,en;q=0.4',
   'Connection':'keep-alive',
   'Content-Length':'246',
   'Content-Type':'text/x-gwt-rpc; charset=UTF-8',
-  'Cookie':'agg=2000; JSESSIONID=478A87A33E39F6130DFA4EF607E13CAD',
   'Host':city+'.jakdojade.pl',
-  'Origin':'http://'+city+'.jakdojade.pl',
-  'Referer':'http://'+city+'.jakdojade.pl/',
-  'User-Agent':'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.112 Safari/534.30',
-  'X-GWT-Module-Base':'http://'+city+'.jakdojade.pl/molbas/',
+  'Origin':'http://krakow.jakdojade.pl',
+  'Referer':'http://krakow.jakdojade.pl/',
+  'X-GWT-Module-Base':'http://krakow.jakdojade.pl/molbas/',
   'X-GWT-Permutation':'A489B6773B01EC476C21D1375F26F9BD'
-  }, body: '7|0|7|http://'+city+'.jakdojade.pl/molbas/|F92AB3F710683E04BDF8C95AD8C2871F|com.molbas.gwt.client.services.TransitServices|getStopsInArea|J|D|I|1|2|3|4|6|5|6|6|6|6|7|fQ|0.0|90.0|0.0|90.0|17|'},
+  }, body: '7|0|7|http://krakow.jakdojade.pl/molbas/|F92AB3F710683E04BDF8C95AD8C2871F|com.molbas.gwt.client.services.TransitServices|getStopsInArea|J|D|I|1|2|3|4|6|5|6|6|6|6|7|'+city+'|0.0|90.0|0.0|90.0|17|'},
   function(err, resp, body){
     if(err){
       console.error(err)

diff --git a/bin/import/stops/jakdojade.rb b/bin/import/stops/jakdojade.rb
@@ -6,7 +6,7 @@
 require 'time'
 
 db = CouchRest.database "http://localhost:5984/#{ARGV[0]}" # TODO: read it from config/database
-all = JSON.parse($stdin.read[4..-3].sub('].concat([',','))
+all = JSON.parse($stdin.read[4..-3].sub('].concat([',',').sub('],[',','))
 a, b, stops, x, y = all.slice!(-5..-1)
 
 all.each_slice(25) do |slice|