mp::odr o;
rewrite_reqline(o, hreq, vars);
yaz_log(YLOG_LOG, ">> Request headers");
- rewrite_headers(o, hreq->headers, vars);
- rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars);
+ rewrite_headers(o, hreq->headers, vars, req_uri_pats, req_groups_bynum);
+ rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars,
+ req_uri_pats, req_groups_bynum);
package.request() = gdu;
}
package.move();
yaz_log(YLOG_LOG, "Response code %d", hres->code);
mp::odr o;
yaz_log(YLOG_LOG, "<< Respose headers");
- rewrite_headers(o, hres->headers, vars);
- rewrite_body(o, &hres->content_buf, &hres->content_len, vars);
+ rewrite_headers(o, hres->headers, vars, res_uri_pats, res_groups_bynum);
+ rewrite_body(o, &hres->content_buf, &hres->content_len, vars,
+ res_uri_pats, res_groups_bynum);
package.response() = gdu;
}
}
}
void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
- std::map<std::string, std::string> & vars) const
+ std::map<std::string, std::string> & vars,
+ const spair_vec & uri_pats,
+ const std::vector<std::map<int, std::string> > & groups_bynum) const
{
for (Z_HTTP_Header *header = headers;
header != 0;
sheader += ": ";
sheader += header->value;
yaz_log(YLOG_LOG, "%s: %s", header->name, header->value);
- std::string out = test_patterns(vars,
- sheader,
- req_uri_pats, req_groups_bynum);
+ std::string out = test_patterns(vars, sheader, uri_pats, groups_bynum);
if (!out.empty())
{
size_t pos = out.find(": ");
}
void yf::HttpRewrite::rewrite_body (mp::odr & o, char **content_buf, int *content_len,
- std::map<std::string, std::string> & vars) const
+ std::map<std::string, std::string> & vars,
+ const spair_vec & uri_pats,
+ const std::vector<std::map<int, std::string> > & groups_bynum) const
{
if (*content_buf)
{
std::string body(*content_buf);
std::string nbody =
- test_patterns(vars, body, req_uri_pats, req_groups_bynum);
+ test_patterns(vars, body, uri_pats, groups_bynum);
if (!nbody.empty())
{
*content_buf = odr_strdup(o, nbody.c_str());
= groups_bynum.find(i);
if (it != groups_bynum.end())
{ //it is
- std::string name = it->second;
if (!what[i].str().empty())
- vars[name] = what[i];
+ vars[it->second] = what[i];
}
}
//prepare replacement string
std::string rvalue = sub_vars(uri_pat, vars);
- //rewrite value
- std::string rhvalue = what.prefix().str()
- + rvalue + what.suffix().str();
yaz_log(YLOG_LOG, "! Rewritten '%s' to '%s'",
what.str(0).c_str(), rvalue.c_str());
- out += rhvalue;
+ out.append(start, what[0].first);
+ out.append(rvalue);
start = what[0].second; //move search forward
}
+ //if we had a match cat the last part
+ if (start != txt.begin())
+ out.append(start, end);
return out;
}