@@ -4,7 +4,7 @@ <author>Balaji Narayanan</author> <author>Tom Hughes-Croucher</author> <description>Placemaker</description> - <sampleQuery>select * from {table} where documentContent="I+live+in+Sunnyvale,+CA" and documentType="text/plain"</sampleQuery> + <sampleQuery>SELECT * FROM {table} WHERE documentContent = "They followed him to deepest Africa and found him there, in Timbuktu" AND documentType="text/plain" AND appid = ""</sampleQuery> <documentationURL>http://developer.yahoo.com/geo/placemaker/</documentationURL> </meta> <bindings> @@ -24,6 +24,7 @@ </inputs> <execute> <![CDATA[ + content = "documentURL=" + documentURL + "&documentType=" + documentType + "&appid=" + appid; if (documentTitle) { content += "&documentTitle=" + documentTitle; } if (inputLanguage) { content += "&inputLanguage=" + inputLanguage; } @@ -32,31 +33,44 @@ postResponse = request.accept("application/xml").contentType("application/x-www-form-urlencoded").post(content).response; - default xml namespace = "http://wherein.yahooapis.com/v1/schema"; - - places = Array(); - for each (var place in postResponse.document.placeDetails.place) { - places.push(place); - } - - references = Array(); - for each (var reference in postResponse.document.referenceList.reference) { - references.push(reference); - } - - default xml namespace = ""; + if (postResponse != null) { + + default xml namespace = "http://wherein.yahooapis.com/v1/schema"; + + matches = Array(); + + for each (var place in postResponse.document.placeDetails.place) { + if (matches[place.woeId]) { + matches[place.woeId].place = place; + } else { + matches[place.woeId] = Array(); + matches[place.woeId].place = place; + } + } + for each (var reference in postResponse.document.referenceList.reference) { + if (matches[reference.woeIds]) { + matches[reference.woeIds].reference = reference; + } else { + matches[reference.woeIds] = Array(); + matches[reference.woeIds].reference = reference; + } + } + default xml namespace = ""; - var output = <matches></matches>; + var output = <matches></matches>; - for(var i=0;i<places.length;i++) { - match = <match></match>; - match.node += places[i]; - match.node += references[i]; + for each (var match in matches) { + var matchXML = <match></match>; + matchXML.node += match.place; + matchXML.node += match.reference; - output.node += match; + output.node += matchXML; + } + + response.object = output; + } - response.object = output; ]]> </execute> </select> @@ -76,36 +90,52 @@ </inputs> <execute> <![CDATA[ + content = "documentContent=" + documentContent + "&documentType=" + documentType + "&appid=" + appid; if (documentTitle) { content += "&documentTitle=" + documentTitle; } if (inputLanguage) { content += "&inputLanguage=" + inputLanguage; } if (autoDisambiguate) { content += "&autoDisambiguate=" + autoDisambiguate; } if (focusWoeid) { content += "&focusWoeid=" + focusWoeid; } - + postResponse = request.accept("application/xml").contentType("application/x-www-form-urlencoded").post(content).response; - default xml namespace = "http://wherein.yahooapis.com/v1/schema"; - places = Array(); - for each (var place in postResponse.document.placeDetails.place) { - places.push(place); - } - references = Array(); - for each (var reference in postResponse.document.referenceList.reference) { - references.push(reference); - } - default xml namespace = ""; + if (postResponse != null) { + + default xml namespace = "http://wherein.yahooapis.com/v1/schema"; + + matches = Array(); + + for each (var place in postResponse.document.placeDetails.place) { + if (matches[place.woeId]) { + matches[place.woeId].place = place; + } else { + matches[place.woeId] = Array(); + matches[place.woeId].place = place; + } + } + for each (var reference in postResponse.document.referenceList.reference) { + if (matches[reference.woeIds]) { + matches[reference.woeIds].reference = reference; + } else { + matches[reference.woeIds] = Array(); + matches[reference.woeIds].reference = reference; + } + } + default xml namespace = ""; - var output = <matches></matches>; + var output = <matches></matches>; - for(var i=0;i<places.length;i++) { - match = <match></match>; - match.node += places[i]; - match.node += references[i]; + for each (var match in matches) { + var matchXML = <match></match>; + matchXML.node += match.place; + matchXML.node += match.reference; - output.node += match; - } + output.node += matchXML; + } - response.object = output; + response.object = output; + + } ]]> </execute> </select> geo/geo.placemaker.xml 84aa5dd7681daa61d535de9343a649daa413c1af Tom Hughes-Croucher tom_croucher@yahoo.com http://github.com/spullara/yql-tables/commit/3eb98adb133edf98d09743fed7ea82dd5e0bff51 3eb98adb133edf98d09743fed7ea82dd5e0bff51 2009-05-22T00:00:47-07:00 2009-05-21T16:16:22-07:00 fixing exceptions when url doesn't parse; fixed misaligned places and references Signed-off-by: Sam Pullara <spullara@yahoo.com> 5ad1edb38fce4dd4ad268f503452aa01c9de61e9 Sam Pullara spullara@yahoo.com