equal
deleted
inserted
replaced
148 function retrieveTweets() { |
148 function retrieveTweets() { |
149 var options = { |
149 var options = { |
150 // "keyword" : swTw.columns_words.join(" OR "), |
150 // "keyword" : swTw.columns_words.join(" OR "), |
151 // "lang" : "fr", |
151 // "lang" : "fr", |
152 "keyword" : tracking_keywords.join(" OR "), |
152 "keyword" : tracking_keywords.join(" OR "), |
|
153 "social_network" : $social_network, |
153 "pages" : 1, |
154 "pages" : 1, |
154 "rpp" : 100, |
155 "rpp" : 100, |
155 "cbEnd" : function() { |
156 "cbEnd" : function() { |
156 callbackTweets(this.tweets); |
157 callbackTweets(this.tweets); |
157 } |
158 } |
188 options.rpp || (options.rpp = 100); |
189 options.rpp || (options.rpp = 100); |
189 options.currentPage = 0; |
190 options.currentPage = 0; |
190 |
191 |
191 var baseurl = "http://search.twitter.com/search.json", |
192 var baseurl = "http://search.twitter.com/search.json", |
192 suffix = (options.since_id ? "&since_id=" + options.since_id : '' ) + "&callback=?", |
193 suffix = (options.since_id ? "&since_id=" + options.since_id : '' ) + "&callback=?", |
193 jsonurl = baseurl + "?q=" + encodeURIComponent(options.keyword)+ "&rpp=" + options.rpp |
194 jsonurl = baseurl + "?social_network="+options.social_network+"&q=" + encodeURIComponent(options.keyword)+ "&rpp=" + options.rpp |
194 + (options.lang ? "&lang=" + options.lang : '' ) + suffix; |
195 + (options.lang ? "&lang=" + options.lang : '' ) + suffix; |
195 getTweetUrl(jsonurl); |
196 getTweetUrl(jsonurl); |
196 } |
197 } |
197 |
198 |
198 $(document).ready(function() { |
199 $(document).ready(function() { |