tweeking

chrismatthieu · Jul 4, 2011 · 9b6dee9 · 9b6dee9
1 parent 8d4e8d2
commit 9b6dee9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/tss_web_server.rb b/lib/tss_web_server.rb
@@ -80,11 +80,12 @@ class TSSWebServer < Sinatra::Base
     end
 
     get("/ustream") do
+      # key=339100083E900F21974AE0A065A54BF2
       channel = params[:channel]
       info = JSON.load(
-        open("http://api.ustream.tv/json/channel/%s/getInfo" % CGI.escape(channel)){ |f| f.read() })
+        open("http://api.ustream.tv/json/channel/%s/getInfo?key=339100083E900F21974AE0A065A54BF2" % CGI.escape(channel)){ |f| f.read() })
-      @channel_id = info["results"]["id"]
+      @channel_id = info["results"]["id"] rescue "cnn"
-      query = info["results"]["socialStream"]["hashtag"]
+      query = info["results"]["socialStream"]["hashtag"] rescue "cnn"
       return search(query, :ustream, false)
     end
 

diff --git a/views/search.erubis b/views/search.erubis
@@ -33,7 +33,7 @@
     function onLoad() {
       initialize();
 // supress left column
-onCloseLeftButtonClick();
+// onCloseLeftButtonClick();
     }
 
   </script>