From b88a383151a9143aba747692eb33d0e4ff5ea721 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@pool-226-177.res.carleton.edu>
Date: Sun, 1 Jun 2008 01:23:11 -0500
Subject: [PATCH] Yahoo updates

---
 extra/yahoo/authors.txt        |  1 +
 extra/yahoo/summary.txt        |  2 +-
 extra/yahoo/yahoo-tests.factor |  4 +--
 extra/yahoo/yahoo.factor       | 50 ++++++++++++++++++++++++++--------
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/extra/yahoo/authors.txt b/extra/yahoo/authors.txt
index f990dd0ed2..382fc3fc09 100644
--- a/extra/yahoo/authors.txt
+++ b/extra/yahoo/authors.txt
@@ -1 +1,2 @@
 Daniel Ehrenberg
+Walton Chan
diff --git a/extra/yahoo/summary.txt b/extra/yahoo/summary.txt
index 662369d96e..98287365af 100644
--- a/extra/yahoo/summary.txt
+++ b/extra/yahoo/summary.txt
@@ -1 +1 @@
-Yahoo! search example using XML-RPC
+Yahoo! search example using XML
diff --git a/extra/yahoo/yahoo-tests.factor b/extra/yahoo/yahoo-tests.factor
index dc684af726..3776715c7b 100644
--- a/extra/yahoo/yahoo-tests.factor
+++ b/extra/yahoo/yahoo-tests.factor
@@ -1,4 +1,4 @@
-USING: tools.test yahoo kernel io.files xml sequences ;
+USING: tools.test yahoo kernel io.files xml sequences accessors ;
 
 [ T{
     result
@@ -8,4 +8,4 @@ USING: tools.test yahoo kernel io.files xml sequences ;
     "Official site with news, tour dates, discography, store, community, and more."
 } ] [ "resource:extra/yahoo/test-results.xml" file>xml parse-yahoo first ] unit-test
 
-[ "http://search.yahooapis.com/WebSearchService/V1/webSearch?appid=Factor-search&query=hi&results=1" ] [ "hi" 1 "Factor-search" query ] unit-test
+[ "http://search.yahooapis.com/WebSearchService/V1/webSearch?appid=Factor-search&query=hi&results=2&similar_ok=1" ] [ "hi" <search> "Factor-search" >>appid 2 >>results t >>similar-ok query ] unit-test
diff --git a/extra/yahoo/yahoo.factor b/extra/yahoo/yahoo.factor
index 214ad04979..dd7ce962c2 100755
--- a/extra/yahoo/yahoo.factor
+++ b/extra/yahoo/yahoo.factor
@@ -1,12 +1,15 @@
-! Copyright (C) 2006 Daniel Ehrenberg
+! Copyright (C) 2006 Daniel Ehrenberg, Walton Chan
 ! See http://factorcode.org/license.txt for BSD license.
 USING: http.client xml xml.utilities kernel sequences
-namespaces http math.parser help math.order locals ;
+namespaces http math.parser help math.order locals accessors ;
 IN: yahoo
 
 TUPLE: result title url summary ;
 
 C: <result> result
+    
+TUPLE: search query results adult-ok start appid region type
+format similar-ok language country site subscription license ;
 
 : parse-yahoo ( xml -- seq )
     "Result" deep-tags-named [
@@ -18,19 +21,44 @@ C: <result> result
 : yahoo-url ( -- str )
     "http://search.yahooapis.com/WebSearchService/V1/webSearch" ;
 
-:: query ( search num appid -- url )
+: param ( search str quot -- search )
+    >r over r> call [ url-encode [ % ] bi@ ] [ drop ] if* ;
+    inline
+
+: num-param ( search str quot -- search )
+    [ dup [ number>string ] when ] compose param ; inline
+
+: bool-param ( search str quot -- search )
+    [ "1" and ] compose param ; inline
+
+: query ( search -- url )
     [
-        yahoo-url %
-        "?appid=" % appid %
-        "&query=" % search url-encode %
-        "&results=" % num #
+        yahoo-url %     
+        "?appid=" [ appid>> ] param
+        "&query=" [ query>> ] param
+        "&region=" [ region>> ] param
+        "&type=" [ type>> ] param
+        "&format=" [ format>> ] param
+        "&language=" [ language>> ] param
+        "&country=" [ country>> ] param
+        "&site=" [ site>> ] param
+        "&subscription=" [ subscription>> ] param
+        "&license=" [ license>> ] param
+        "&results=" [ results>> ] num-param
+        "&start=" [ start>> ] num-param
+        "&adult_ok=" [ adult-ok>> ] bool-param
+        "&similar_ok=" [ similar-ok>> ] bool-param
+        drop
     ] "" make ;
 
 : factor-id
     "fRrVAKzV34GDyeRw6bUHDhEWHRedwfOC7e61wwXZLgGF80E67spxdQXuugBe2pgIevMmKwA-" ;
 
-: search-yahoo/id ( search num id -- seq )
-    query http-get string>xml parse-yahoo ;
+: <search> ( query -- search )
+    search new
+        factor-id >>appid
+        10 >>results
+        swap >>query ;
 
-: search-yahoo ( search num -- seq )
-    factor-id search-yahoo/id ;
+: search-yahoo ( search -- seq )
+    query http-get string>xml parse-yahoo ;