diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-26 20:59:35 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-26 20:59:35 +0000 |
commit | 7c018c6fb691b65ac1cb181a95f5766e2933eb3c (patch) | |
tree | b12eb4fd6fc05faebd9d481f1d57599cd0b2829e /sca-cpp/trunk/modules/http/http.hpp | |
parent | 0ee21c5d9657a1259a731722f53666ad135279bb (diff) |
Correctly pass query strings through component wiring redirects and improve format of XML and JSON response documents.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074924 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/http.hpp')
-rw-r--r-- | sca-cpp/trunk/modules/http/http.hpp | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/sca-cpp/trunk/modules/http/http.hpp b/sca-cpp/trunk/modules/http/http.hpp index 26a2e0cf0c..e2327be40a 100644 --- a/sca-cpp/trunk/modules/http/http.hpp +++ b/sca-cpp/trunk/modules/http/http.hpp @@ -620,6 +620,39 @@ const failable<size_t> recv(char* c, const size_t l, const CURLSession& cs) { return recv(c, l, cs); } + +/** + * Filter path segment in a list of arguments. + */ +const bool filterPath(const value& arg) { + return isString(arg); +} + +/** + * Filter query string arguments in a list of arguments. + */ +const bool filterQuery(const value& arg) { + return isList(arg); +} + +/** + * Converts a list of key value pairs to a query string. + */ +ostringstream& queryString(const list<list<value> > args, ostringstream& os) { + if (isNil(args)) + return os; + debug(car(args), "http::queryString::arg"); + os << car(car(args)) << "=" << c_str(cadr(car(args))); + if (!isNil(cdr(args))) + os << "&"; + return queryString(cdr(args), os); +} + +const string queryString(const list<list<value> > args) { + ostringstream os; + return str(queryString(args, os)); +} + /** * HTTP client proxy function. */ @@ -630,7 +663,13 @@ struct proxy { const value operator()(const list<value>& args) const { const value fun = car(args); if (fun == "get") { - const failable<value> val = get(uri + path(cadr(args)), cs); + const list<value> lp = filter<value>(filterPath, cadr(args)); + debug(lp, "http::queryString::arg"); + const list<value> lq = filter<value>(filterQuery, cadr(args)); + debug(lq, "http::get::query"); + const value p = path(lp); + const value q = queryString(lq); + const failable<value> val = get(uri + p + (q != ""? string("?") + q : string("")), cs); return content(val); } if (fun == "post") { |