<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -40,7 +40,7 @@
 |
 */
 
-$route['default_controller'] = &quot;welcome&quot;;
+$route['default_controller'] = &quot;yql&quot;;
 $route['scaffolding_trigger'] = &quot;&quot;;
 
 </diff>
      <filename>system/application/config/routes.php</filename>
    </modified>
    <modified>
      <diff>@@ -10,58 +10,94 @@ class Yql extends Controller {
 	
 	function index()
 	{
-	    echo '&lt;ul&gt;';
-	    echo '&lt;li&gt;&lt;a href=&quot;search_twitter/@kulor&quot;&gt;Search Twitter for &quot;@kulor&quot;&lt;/a&gt;&lt;/li&gt;';
-	    echo '&lt;li&gt;&lt;a href=&quot;search_flickr/kulor&quot;&gt;Search Flickr for &quot;kulor&quot;&lt;/a&gt;&lt;/li&gt;';
-	    echo '&lt;li&gt;&lt;a href=&quot;search_yahoo/kulor&quot;&gt;Search Yahoo for &quot;kulor&quot;&lt;/a&gt;&lt;/li&gt;';
-	    echo '&lt;li&gt;&lt;a href=&quot;search_wikipedia/open&quot;&gt;Search Wikipedia for &quot;open&quot;&lt;/a&gt;&lt;/li&gt;';
-	    echo '&lt;/ul&gt;';
-        
+		$data['examples'][] = array('href' =&gt; '/yql_php/yql/geo_lookup/LHR', 'title' =&gt; 'Geo lookup for &quot;LHR&quot;');
+		$data['examples'][] = array('href' =&gt; '/yql_php/yql/search_flickr/kulor', 'title' =&gt; 'Search Flickr for &quot;kulor&quot;');
+		$data['examples'][] = array('href' =&gt; '/yql_php/yql/search_yahoo/kulor', 'title' =&gt; 'Search Yahoo for &quot;kulor&quot;');
+		$data['examples'][] = array('href' =&gt; '/yql_php/yql/search_wikipedia/open', 'title' =&gt; 'Search Wikipedia for &quot;open&quot;');
+		$data['examples'][] = array('href' =&gt; '/yql_php/yql/search_twitter/kulor', 'title' =&gt; 'Search Twitter for &quot;kulor&quot;');
+		$data['examples'][] = array('href' =&gt; '/yql_php/yql/finance_topstories', 'title' =&gt; 'Finance Top stories');
+        $this-&gt;load-&gt;view('index', $data);
 	}
 
 	
-	function geo_test()
+	function geo_lookup($location = 'LHR')
 	{
-	    echo '&lt;pre&gt;';
-	    print_r($this-&gt;yql_lib-&gt;test_query());
+		$yql_query = &quot;select name,centroid,woeid from geo.places where text=\&quot;&quot; . $location . &quot;\&quot;&quot;;
+		$results['query'] = $yql_query;
+	    $results['search'] = $this-&gt;yql_lib-&gt;query($yql_query);
+		$results['page_title'] = 'Geo Lookup';
+		
+		$this-&gt;load-&gt;view('header', $results);
+		$this-&gt;load-&gt;view('query_output', $results);
+		$this-&gt;load-&gt;view('yql_geo_lookup', $results);
+		$this-&gt;load-&gt;view('footer');
 	}
 
 	
-	function search_twitter($term = '@kulor')
+	function search_twitter($term = 'kulor')
 	{
-	    echo '&lt;pre&gt;';
 	    $yql_query = 'select * from json where url=&quot;http://search.twitter.com/search.json?q=' . $term . '&quot; and itemPath = &quot;json.results&quot;';
-	    print_r($this-&gt;yql_lib-&gt;query($yql_query));
+		$results['query'] = $yql_query;
+	    $results['search'] = $this-&gt;yql_lib-&gt;query($yql_query);
+		$results['page_title'] = 'Twitter search results';
+		
+		$this-&gt;load-&gt;view('header', $results);
+		$this-&gt;load-&gt;view('query_output', $results);
+		$this-&gt;load-&gt;view('yql_search_twitter', $results);
+		$this-&gt;load-&gt;view('footer');
 	}
 
 	
 	function search_flickr($term = 'kulor')
 	{
-	    echo '&lt;pre&gt;';
 	    $yql_query = 'select * from flickr.photos.search where text=&quot;' . $term . '&quot; limit 10';
-	    print_r($this-&gt;yql_lib-&gt;query($yql_query));	    
+		$results['query'] = $yql_query;
+	    $results['search'] = $this-&gt;yql_lib-&gt;query($yql_query)-&gt;photo;
+		$results['page_title'] = 'Flickr search results';
+		
+		$this-&gt;load-&gt;view('header', $results);
+		$this-&gt;load-&gt;view('query_output', $results);
+		$this-&gt;load-&gt;view('yql_search_flickr', $results);
+		$this-&gt;load-&gt;view('footer');
 	}
 
 	
 	function search_yahoo($term = 'kulor')
 	{
-	    echo '&lt;pre&gt;';
-	    $yql_query = 'select title,abstract from search.web where query=&quot;' . $term . '&quot;';
-	    print_r($this-&gt;yql_lib-&gt;query($yql_query));
+	    $yql_query = 'select * from search.web where query=&quot;' . $term . '&quot;';
+		$results['query'] = $yql_query;
+	    $results['search'] = $this-&gt;yql_lib-&gt;query($yql_query)-&gt;result;
+		$results['page_title'] = 'Yahoo search results';
+		
+		$this-&gt;load-&gt;view('header', $results);
+		$this-&gt;load-&gt;view('query_output', $results);
+		$this-&gt;load-&gt;view('yql_search_yahoo', $results);
+		$this-&gt;load-&gt;view('footer');
 	}
 
 	
 	function search_wikipedia($term = 'open')
 	{
-	    echo '&lt;pre&gt;';
 	    $yql_query = 'select * from xml where url=&quot;http://en.wikipedia.org/w/api.php?action=opensearch&amp;search=' . $term . '&amp;format=xml&quot; and itemPath = &quot;SearchSuggestion.Section.Item&quot;';
-	    print_r($this-&gt;yql_lib-&gt;query($yql_query));
+		$results['query'] = $yql_query;
+	    $results['search'] = $this-&gt;yql_lib-&gt;query($yql_query)-&gt;Item;
+		$results['page_title'] = 'Wikipedia search results';
+		
+		$this-&gt;load-&gt;view('header', $results);
+		$this-&gt;load-&gt;view('query_output', $results);
+		$this-&gt;load-&gt;view('yql_search_wikipedia', $results);
+		$this-&gt;load-&gt;view('footer');
 	}
 	
 	function finance_topstories(){
 	    $yql_query = 'select * from html where url=&quot;http://finance.yahoo.com/q?s=yhoo&quot; and xpath=\'//div[@id=&quot;yfi_headlines&quot;]/div[2]/ul/li/a\'';
-	    $results['headlines']  = $this-&gt;yql_lib-&gt;query($yql_query);
-	    $this-&gt;load-&gt;view('finance_stories', $results);
-	    
+		$results['query'] = $yql_query;
+	    $results['search']  = $this-&gt;yql_lib-&gt;query($yql_query)-&gt;a;
+		$results['page_title'] = 'Finance Topstories for &quot;YHOO&quot;';
+		
+		$this-&gt;load-&gt;view('header', $results);
+		$this-&gt;load-&gt;view('query_output', $results);
+	    $this-&gt;load-&gt;view('yql_finance_topstories', $results);
+		$this-&gt;load-&gt;view('footer');
 	}
 }
\ No newline at end of file</diff>
      <filename>system/application/controllers/yql.php</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>system/application/views/finance_stories.php</filename>
    </removed>
    <removed>
      <filename>system/application/views/welcome_message.php</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>d7c775fe38dded9e36a5d453ac1f1b97d44e20b7</id>
    </parent>
  </parents>
  <author>
    <name>James Broad</name>
    <email>jb@carbonsilk.com</email>
  </author>
  <url>http://github.com/kulor/yql_php/commit/da559e966663a519f436d0aa9944212582806b98</url>
  <id>da559e966663a519f436d0aa9944212582806b98</id>
  <committed-date>2009-02-12T04:40:10-08:00</committed-date>
  <authored-date>2009-02-12T04:40:10-08:00</authored-date>
  <message>Adding lots of mainly look and feel changes</message>
  <tree>0ce244b9648b5c8d1419bc0f815fd00f70e15b01</tree>
  <committer>
    <name>James Broad</name>
    <email>jb@carbonsilk.com</email>
  </committer>
</commit>
