Changeset 13087

Timestamp:

03/14/08 00:18:14 (10 months ago)

Author:

alex

Message:

"default" is a reserved word in JS. Making occurances of it in keys palletable to the parser. Fixes yahoo.smd for Safari/WebKit.

Files:

• dojox/trunk/rpc/SMDLibrary/yahoo.smd (modified) (34 diffs)

dojox/trunk/rpc/SMDLibrary/yahoo.smd

@@ -1 +1 @@
 {
-        SMDVersion: "2.0",
-        id: "http://developer.yahoo.com/search/", // FIXME: is this the kind of value we're supposed to use here?
-        description: "Yahoo's search API",
+        "SMDVersion": "2.0",
+        // FIXME: is this the kind of value we're supposed to use here?
+        "id": "http://developer.yahoo.com/search/", 
+        "description": "Yahoo's search API",
 
         transport: "JSONP",
@@ -8 +9 @@
         additionalParameters: true,
         parameters: [
-                { name: "appid", optional: false, default: "dojotoolkit" },
-                { name: "output", optional: false, default: "json" }
+                { name: "appid", optional: false, "default": "dojotoolkit" },
+                { name: "output", optional: false, "default": "json" }
         ],
 
@@ -27 +28 @@
                         target: "http://answers.yahooapis.com/AnswersService/V1/questionSearch",
                         parameters: [
-                                { name: "query", type: "string", optional: false, default: "" },
-                                { name: "search_in", type: "string", optional: true, default: "all" }, // can be "all", "question", "best_answer"
-                                { name: "category_id", type: "integer", optional: true, default: null }, // one of (category_id, category_name) is required
-                                { name: "category_name", type: "string", optional: true, default: null },
-                                { name: "region", type: "string", optional: true, default: "us" }, // can be "us", "uk", "ca", "au", "in", "es", "br", "ar", "mx", "e1", "it", "de", "fr", "sg"
-                                { name: "date_range", type: "string", optional: true, default: "all" }, // can be "all", "7", "7-30", "30-60", "60-90", "more90"
-                                { name: "sort", type: "string", optional: true, default: "relevance" }, // can be "relevance", "date_desc", "date_asc"
-                                { name: "type", type: "string", optional: true, default: "all" }, // can be "all", "resolved", "open", "undecided"
-                                { name: "start", type: "integer", optional: true, default: 0 },
-                                { name: "results", type: "integer", optional: true, default: 10 } // max 50
+                                { name: "query", type: "string", optional: false, "default": "" },
+                                { name: "search_in", type: "string", optional: true, "default": "all" }, // can be "all", "question", "best_answer"
+                                { name: "category_id", type: "integer", optional: true, "default": null }, // one of (category_id, category_name) is required
+                                { name: "category_name", type: "string", optional: true, "default": null },
+                                { name: "region", type: "string", optional: true, "default": "us" }, // can be "us", "uk", "ca", "au", "in", "es", "br", "ar", "mx", "e1", "it", "de", "fr", "sg"
+                                { name: "date_range", type: "string", optional: true, "default": "all" }, // can be "all", "7", "7-30", "30-60", "60-90", "more90"
+                                { name: "sort", type: "string", optional: true, "default": "relevance" }, // can be "relevance", "date_desc", "date_asc"
+                                { name: "type", type: "string", optional: true, "default": "all" }, // can be "all", "resolved", "open", "undecided"
+                                { name: "start", type: "integer", optional: true, "default": 0 },
+                                { name: "results", type: "integer", optional: true, "default": 10 } // max 50
                         ]
                 },
@@ -44 +45 @@
                         target: "http://answers.yahooapis.com/AnswersService/V1/getByCategory",
                         parameters: [
-                                { name: "category_id", type: "integer", optional: true, default: null }, // one of (category_id, category_name) is required
-                                { name: "category_name", type: "string", optional: true, default: null },
-                                { name: "type", type: "string", optional: true, default: "all" }, // can be "all", "resolved", "open", "undecided"
-                                { name: "region", type: "string", optional: true, default: "us" }, // can be "us", "uk", "ca", "au", "in", "es", "br", "ar", "mx", "e1", "it", "de", "fr", "sg"
-                                { name: "sort", type: "string", optional: true, default: "date_desc" }, // can be "date_desc", "date_asc", "ans_count_desc", "ans_count_asc"
-                                { name: "start", type: "integer", optional: true, default: 0 },
-                                { name: "results", type: "integer", optional: true, default: 10 } // max 50
+                                { name: "category_id", type: "integer", optional: true, "default": null }, // one of (category_id, category_name) is required
+                                { name: "category_name", type: "string", optional: true, "default": null },
+                                { name: "type", type: "string", optional: true, "default": "all" }, // can be "all", "resolved", "open", "undecided"
+                                { name: "region", type: "string", optional: true, "default": "us" }, // can be "us", "uk", "ca", "au", "in", "es", "br", "ar", "mx", "e1", "it", "de", "fr", "sg"
+                                { name: "sort", type: "string", optional: true, "default": "date_desc" }, // can be "date_desc", "date_asc", "ans_count_desc", "ans_count_asc"
+                                { name: "start", type: "integer", optional: true, "default": 0 },
+                                { name: "results", type: "integer", optional: true, "default": 10 } // max 50
                         ]
                 },
@@ -58 +59 @@
                         target: "http://answers.yahooapis.com/AnswersService/V1/getQuestion",
                         parameters: [
-                                { name: "question_id", type: "string", optional: true, default: null }
+                                { name: "question_id", type: "string", optional: true, "default": null }
                         ]
                 },
@@ -66 +67 @@
                         target: "http://answers.yahooapis.com/AnswersService/V1/getByUser",
                         parameters: [
-                                { name: "user_id", type: "string", optional: false, default: "" },
-                                { name: "type", type: "string", optional: true, default: "all" }, // can be "all", "resolved", "open", "undecided"
-                                { name: "filter", type: "string", optional: true, default: "question" }, // can be "question", "answer", "best_answer"
-                                { name: "sort", type: "string", optional: true, default: "date_desc" }, // can be "date_desc", "date_asc", "ans_count_desc", "ans_count_asc"
-                                { name: "start", type: "integer", optional: true, default: 0 },
-                                { name: "results", type: "integer", optional: true, default: 10 } // max 50
+                                { name: "user_id", type: "string", optional: false, "default": "" },
+                                { name: "type", type: "string", optional: true, "default": "all" }, // can be "all", "resolved", "open", "undecided"
+                                { name: "filter", type: "string", optional: true, "default": "question" }, // can be "question", "answer", "best_answer"
+                                { name: "sort", type: "string", optional: true, "default": "date_desc" }, // can be "date_desc", "date_asc", "ans_count_desc", "ans_count_asc"
+                                { name: "start", type: "integer", optional: true, "default": 0 },
+                                { name: "results", type: "integer", optional: true, "default": 10 } // max 50
                         ]
                 },
@@ -83 +84 @@
                         target: "http://search.yahooapis.com/AudioSearchService/V1/artistSearch",
                         parameters: [
-                                { name: "artist", type: "string", optional: true, default: "" }, // one of (artist, artistid) is required
-                                { name: "artistid", type: "string", optional: true, default: "" },
-                                { name: "type", type: "string", optional: true, default: "all" }, // can be "all", "any", "phrase"
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "artist", type: "string", optional: true, "default": "" }, // one of (artist, artistid) is required
+                                { name: "artistid", type: "string", optional: true, "default": "" },
+                                { name: "type", type: "string", optional: true, "default": "all" }, // can be "all", "any", "phrase"
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -95 +96 @@
                         target: "http://search.yahooapis.com/AudioSearchService/V1/albumSearch",
                         parameters: [
-                                { name: "artist", type: "string", optional: true, default: "" },
-                                { name: "artistid", type: "string", optional: true, default: "" },
-                                { name: "album", type: "string", optional: true, default: "" },
-                                { name: "albumid", type: "string", optional: true, default: "" },
-                                { name: "type", type: "string", optional: true, default: "all" }, // can be "all", "any", "phrase"
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "artist", type: "string", optional: true, "default": "" },
+                                { name: "artistid", type: "string", optional: true, "default": "" },
+                                { name: "album", type: "string", optional: true, "default": "" },
+                                { name: "albumid", type: "string", optional: true, "default": "" },
+                                { name: "type", type: "string", optional: true, "default": "all" }, // can be "all", "any", "phrase"
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -110 +111 @@
                         target: "http://search.yahooapis.com/AudioSearchService/V1/songSearch",
                         parameters: [
-                                { name: "artist", type: "string", optional: true, default: "" },
-                                { name: "artistid", type: "string", optional: true, default: "" },
-                                { name: "album", type: "string", optional: true, default: "" },
-                                { name: "albumid", type: "string", optional: true, default: "" },
-                                { name: "song", type: "string", optional: true, default: "" },
-                                { name: "songid", type: "string", optional: true, default: "" },
-                                { name: "type", type: "string", optional: true, default: "all" }, // can be "all", "any", "phrase"
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "artist", type: "string", optional: true, "default": "" },
+                                { name: "artistid", type: "string", optional: true, "default": "" },
+                                { name: "album", type: "string", optional: true, "default": "" },
+                                { name: "albumid", type: "string", optional: true, "default": "" },
+                                { name: "song", type: "string", optional: true, "default": "" },
+                                { name: "songid", type: "string", optional: true, "default": "" },
+                                { name: "type", type: "string", optional: true, "default": "all" }, // can be "all", "any", "phrase"
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -126 +127 @@
                         target: "http://search.yahooapis.com/AudioSearchService/V1/songDownloadLocation",
                         parameters: [
-                                { name: "songid", type: "string", optional: false, default: "" },
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 },
-                                { name: "source", type: "string", optional: true, default: "" } // can be "audiolunchbox", "artistdirect", "buymusic", "dmusic", "emusic", "epitonic", "garageband", "itunes", "yahoo", "livedownloads", "mp34u", "msn", "musicmatch", "mapster", "passalong", "rhapsody", "soundclick", "theweb"
+                                { name: "songid", type: "string", optional: false, "default": "" },
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 },
+                                { name: "source", type: "string", optional: true, "default": "" } // can be "audiolunchbox", "artistdirect", "buymusic", "dmusic", "emusic", "epitonic", "garageband", "itunes", "yahoo", "livedownloads", "mp34u", "msn", "musicmatch", "mapster", "passalong", "rhapsody", "soundclick", "theweb"
                         ]
                 },
@@ -143 +144 @@
                         target: "http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction",
                         parameters: [
-                                { name: "context", type: "string", optional: false, default: "" },
-                                { name: "query", type: "string", optional: true, default: "" }
+                                { name: "context", type: "string", optional: false, "default": "" },
+                                { name: "query", type: "string", optional: true, "default": "" }
                         ]
                 },
@@ -156 +157 @@
                         target: "http://search.yahooapis.com/ImageSearchService/V1/imageSearch",
                         parameters: [
-                                { name: "query", type: "string", optional: false, default: "" },
-                                { name: "type", type: "string", optional: true, default: "any" }, // can be "all", "any", "phrase"
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 },
-                                { name: "format", type: "string", optional: true, default: "any" }, // can be "any", "bmp", "gif", "jpeg", "png"
-                                { name: "adult_ok", type: "boolean", optional: true, default: null },
-                                { name: "coloration", type: "string", optional: true, default: "any" }, // can be "any", "color", "bw"
-                                { name: "site", type: "string", optional: true, default: null }
+                                { name: "query", type: "string", optional: false, "default": "" },
+                                { name: "type", type: "string", optional: true, "default": "any" }, // can be "all", "any", "phrase"
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 },
+                                { name: "format", type: "string", optional: true, "default": "any" }, // can be "any", "bmp", "gif", "jpeg", "png"
+                                { name: "adult_ok", type: "boolean", optional: true, "default": null },
+                                { name: "coloration", type: "string", optional: true, "default": "any" }, // can be "any", "color", "bw"
+                                { name: "site", type: "string", optional: true, "default": null }
                         ]
                 },
@@ -175 +176 @@
                         target: "http://local.yahooapis.com/LocalSearchService/V3/localSearch",
                         parameters: [
-                                { name: "query", type: "string", optional: true, default: "" }, // optional, but one of (query, listing_id) is required
-                                { name: "listing_id", type: "string", optional: true, default: "" },
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 20
-                                { name: "start", type: "integer", optional: true, default: 1 },
-                                { name: "sort", type: "string", optional: true, default: "relevance" }, // can be "relevance", "title", "distance", "rating"
+                                { name: "query", type: "string", optional: true, "default": "" }, // optional, but one of (query, listing_id) is required
+                                { name: "listing_id", type: "string", optional: true, "default": "" },
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 20
+                                { name: "start", type: "integer", optional: true, "default": 1 },
+                                { name: "sort", type: "string", optional: true, "default": "relevance" }, // can be "relevance", "title", "distance", "rating"
                                 { name: "radius", type: "float", optional: true }, // the default varies according to location
-                                { name: "street", type: "string", optional: true, default: null },
-                                { name: "city", type: "string", optional: true, default: null },
-                                { name: "state", type: "string", optional: true, default: null }, // full name or two-letter abbreviation
-                                { name: "zip", type: "any", optional: true, default: null }, // ddddd or ddddd-dddd format
-                                { name: "location", type: "string", optional: true, default: null }, // free text, supersedes the street, city, state, zip fields
+                                { name: "street", type: "string", optional: true, "default": null },
+                                { name: "city", type: "string", optional: true, "default": null },
+                                { name: "state", type: "string", optional: true, "default": null }, // full name or two-letter abbreviation
+                                { name: "zip", type: "any", optional: true, "default": null }, // ddddd or ddddd-dddd format
+                                { name: "location", type: "string", optional: true, "default": null }, // free text, supersedes the street, city, state, zip fields
                                 { name: "latitude", type: "float", optional: true }, // -90 to 90
                                 { name: "longitude", type: "float", optional: true }, // -180 to 180
@@ -198 +199 @@
                         target: "http://collections.local.yahooapis.com/LocalSearchService/V1/collectionSearch",
                         parameters: [
-                                { name: "query", type: "string", optional: true, default: "" }, // optional, but at least one of (query, username) is required
-                                { name: "username", type: "string", optional: true, default: "" },
-                                { name: "city", type: "string", optional: true, default: null },
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "query", type: "string", optional: true, "default": "" }, // optional, but at least one of (query, username) is required
+                                { name: "username", type: "string", optional: true, "default": "" },
+                                { name: "city", type: "string", optional: true, "default": null },
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -210 +211 @@
                         target: "http://collections.local.yahooapis.com/LocalSearchService/V1/getCollection",
                         parameters: [
-                                { name: "collection_id", type: "integer", optional: false, default: "" }
+                                { name: "collection_id", type: "integer", optional: false, "default": "" }
                         ]
                 },
@@ -222 +223 @@
                         target: "http://search.yahooapis.com/MyWebService/V1/urlSearch",
                         parameters: [
-                                { name: "tag", type: "string", optional: true, default: "" },
-                                { name: "yahooid", type: "string", optional: true, default: "" },
-                                { name: "sort", type: "string", optional: true, default: "date" }, // can be "date", "title", "url"
-                                { name: "reverse_sort", type: "boolean", optional: true, default: 0 },
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "tag", type: "string", optional: true, "default": "" },
+                                { name: "yahooid", type: "string", optional: true, "default": "" },
+                                { name: "sort", type: "string", optional: true, "default": "date" }, // can be "date", "title", "url"
+                                { name: "reverse_sort", type: "boolean", optional: true, "default": 0 },
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -235 +236 @@
                         target: "http://search.yahooapis.com/MyWebService/V1/tagSearch",
                         parameters: [
-                                { name: "url", type: "string", optional: true, default: "" },
-                                { name: "yahooid", type: "string", optional: true, default: "" },
-                                { name: "sort", type: "string", optional: true, default: "popularity" }, // can be "popularity", "tag", "date"
-                                { name: "reverse_sort", type: "boolean", optional: true, default: 0 },
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "url", type: "string", optional: true, "default": "" },
+                                { name: "yahooid", type: "string", optional: true, "default": "" },
+                                { name: "sort", type: "string", optional: true, "default": "popularity" }, // can be "popularity", "tag", "date"
+                                { name: "reverse_sort", type: "boolean", optional: true, "default": 0 },
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -248 +249 @@
                         target: "http://search.yahooapis.com/MyWebService/V1/relatedTags",
                         parameters: [
-                                { name: "tag", type: "string", optional: false, default: "" },
-                                { name: "yahooid", type: "string", optional: true, default: "" },
-                                { name: "sort", type: "string", optional: true, default: "popularity" }, // can be "popularity", "tag", "date"
-                                { name: "reverse_sort", type: "boolean", optional: true, default: 0 },
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 }
+                                { name: "tag", type: "string", optional: false, "default": "" },
+                                { name: "yahooid", type: "string", optional: true, "default": "" },
+                                { name: "sort", type: "string", optional: true, "default": "popularity" }, // can be "popularity", "tag", "date"
+                                { name: "reverse_sort", type: "boolean", optional: true, "default": 0 },
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 }
                         ]
                 },
@@ -265 +266 @@
                         target: "http://search.yahooapis.com/NewsSearchService/V1/newsSearch",
                         parameters: [
-                                { name: "query", type: "string", optional: false, default: "" },
-                                { name: "type", type: "string", optional: true, default: "any" }, // can be "all", "any", "phrase"
-                                { name: "results", type: "integer", optional: true, default: 10 }, // max 50
-                                { name: "start", type: "integer", optional: true, default: 1 },
-                                { name: "sort", type: "string", optional: true, default: "rank" }, // can be "rank", "date"
-                                { name: "language", type: "string", optional: true, default: null },
-                                { name: "site", type: "string", optional: true, default: null }
+                                { name: "query", type: "string", optional: false, "default": "" },
+                                { name: "type", type: "string", optional: true, "default": "any" }, // can be "all", "any", "phrase"
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // max 50
+                                { name: "start", type: "integer", optional: true, "default": 1 },
+                                { name: "sort", type: "string", optional: true, "default": "rank" }, // can be "rank", "date"
+                                { name: "language", type: "string", optional: true, "default": null },
+                                { name: "site", type: "string", optional: true, "default": null }
                         ]
                 },
@@ -283 +284 @@
                         target: "http://shopping.yahooapis.com/ShoppingService/V2/catalogListing",
                         parameters: [
-                                { name: "catalogid", type: "integer", optional: true, default: null }, // required if idtype,idvalue are not specified
-                                { name: "getlisting", type: "boolean", optional: true, default: 1 },
-                                { name: "getreview", type: "boolean", optional: true, default: 0 },
-                                { name: "getspec", type: "boolean", optional: true, default: 0 },
-                                { name: "idtype", type: "string", optional: true, default: null }, // can be "upc", "brand,model", "brand,partnum"; required if catalogid is not specified
-                                { name: "idvalue", type: "string", optional: true, default: null }, // required if catalogid is not specified
-                                { name: "onlynew", type: "boolean", optional: true, default: 1 },
-                                { name: "reviewstart", type: "integer", optional: true, default: 1 },
-                                { name: "reviewsort", type: "string", optional: true, default: "mostRecommended_descending" }, // can be "mostRecommended_descending", "mostRecommended_ascending", "latest_descending", "latest_ascending", "highestRated_descending", "highestRated_ascending"
-                                { name: "zip", type: "string", optional: true, default: null }
+                                { name: "catalogid", type: "integer", optional: true, "default": null }, // required if idtype,idvalue are not specified
+                                { name: "getlisting", type: "boolean", optional: true, "default": 1 },
+                                { name: "getreview", type: "boolean", optional: true, "default": 0 },
+                                { name: "getspec", type: "boolean", optional: true, "default": 0 },
+                                { name: "idtype", type: "string", optional: true, "default": null }, // can be "upc", "brand,model", "brand,partnum"; required if catalogid is not specified
+                                { name: "idvalue", type: "string", optional: true, "default": null }, // required if catalogid is not specified
+                                { name: "onlynew", type: "boolean", optional: true, "default": 1 },
+                                { name: "reviewstart", type: "integer", optional: true, "default": 1 },
+                                { name: "reviewsort", type: "string", optional: true, "default": "mostRecommended_descending" }, // can be "mostRecommended_descending", "mostRecommended_ascending", "latest_descending", "latest_ascending", "highestRated_descending", "highestRated_ascending"
+                                { name: "zip", type: "string", optional: true, "default": null }
                         ]
                 },
@@ -301 +302 @@
                         target: "http://api.shopping.yahoo.com/ShoppingService/V1/merchantSearch",
                         parameters: [
-                                { name: "merchantid", type: "integer", optional: false, default: null }
+                                { name: "merchantid", type: "integer", optional: false, "default": null }
                         ]
                 },
@@ -310 +311 @@
                         target: "http://shopping.yahooapis.com/ShoppingService/V3/productSearch",
                         parameters: [
-                                { name: "query", type: "string", optional: true, default: "" }, // required if category is not specified
-                                { name: "category", type: "any", optional: true, default: "" }, // required if query is not specified
-                                { name: "class", type: "string", optional: true, default: null }, // can be "catalogs", "freeoffers", "paidoffers"; defaults to all three of these
-                                { name: "department", type: "integer", optional: true, default: null },
-                                { name: "highestprice", type: "float", optional: true, default: null },
-                                { name: "lowestprice", type: "float", optional: true, default: null },
-                                { name: "merchantId", type: "integer", optional: true, default: null },
-                                { name: "refinement", type: "string", optional: true, default: null }, // used only if category is specified
-                                { name: "results", type: "integer", optional: true, default: 10 }, // 1-50
-                                { name: "show_numratings", type: "boolean", optional: true, default: 0 },
-                                { name: "show_narrowing", type: "boolean", optional: true, default: 1 },
+                                { name: "query", type: "string", optional: true, "default": "" }, // required if category is not specified
+                                { name: "category", type: "any", optional: true, "default": "" }, // required if query is not specified
+                                { name: "class", type: "string", optional: true, "default": null }, // can be "catalogs", "freeoffers", "paidoffers"; defaults to all three of these
+                                { name: "department", type: "integer", optional: true, "default": null },
+                                { name: "highestprice", type: "float", optional: true, "default": null },
+                                { name: "lowestprice", type: "float", optional: true, "default": null },
+                                { name: "merchantId", type: "integer", optional: true, "default": null },
+                                { name: "refinement", type: "string", optional: true, "default": null }, // used only if category is specified
+                                { name: "results", type: "integer", optional: true, "default": 10 }, // 1-50
+                                { name: "show_numratings", type: "boolean", optional: true, "default": 0 },
+                                { name: "show_narrowing", type: "boolean", optional: true, "default": 1 },
                                 { name: "sort", type: "string", optional: true }, // can be "price_ascending", "price_descending", "userrating_ascending", "userrating_descending"; omitted, the default is to sort by relevance
-                                { name: "start", type: "integer", optional: true, default: 1 } // 1-300
+                                { name: "start", type: "integer", optional: true, "default": 1 } // 1-300
                         ]
                 },
@@ -334 +335 @@
                         target: "http://search.yahooapis.com/SiteExplorerService/V1/inlinkData",
                         parameters: [
-                                { name: "query", type: "string", optional: false, default: "" },
-                                { name: "results", type: "integer", optional: true, default: 50 }, // max 100
-                                { name: "start", type: "integer", optional: true, default: 1 },
-                                { name: "entire_site", type: "boolean", optional: true, default: null },
-                                { name: "omit_inlinks", type: "string", optional: true, default: "none" } // can be "none", "domain", "subdomain"
+                                { name: "query", type: "string", optional: false, "default": "" },
+                                { name: "results", type: "integer", optional: true, "default": 50 }, // max 100
+                                { name: "start", type: "integer", optional: true, "default": 1 },
+                                { name: "entire_site", type: "boolean", optional: true, "default": null },
+                                { name: "omit_inlinks", type: "string", optional: true, "default": "none" } // can be "none", "domain", "subdomain"
                         ]
                 },
@@ -346 +347 @@
                         target: "http://search.yahooapis.com/SiteExplorerService/V1/pageData",
                         parameters: [
-                                { name: "query", type: "string", optional: false, default: "" },
-                                { name: "results", type: "integer", optional: true, default: 50 }, // max 100
-                                { name: "start", type: "integer", optional: true, default: 1 },
-                                { name: "domain_only", type: "boolean", optional: true, default: null }
+                                { name: "query", type: "string", optional: false, "default": "" },
+                                { name: "results", type: "integer", optional: true, "default": 50 }, // max 100
+                                { name: "start", type: "integer", optional: true, "default": 1 },
+                                { name: "domain_only", type: "boolean", optional: true, "default": null }
                         ]
                 },
@@ -357 +358 @@
                         target: "http://search.yahooapis.com/SiteExplorerService/V1/ping",
                         parameters: [
-