summaryrefslogtreecommitdiffabout
path: root/lib/message.cc
authorMichael Krelin <hacker@klever.net>2008-03-03 17:16:32 (UTC)
committer Michael Krelin <hacker@klever.net>2008-03-03 17:16:32 (UTC)
commitecb6a585d1fc3705836dc896fe348b970101e8d3 (patch) (side-by-side diff)
tree2ae11b4109988ab63093c041f8d5925794d51323 /lib/message.cc
parent374985b5317d559b561d7f557034661e314f5605 (diff)
downloadlibopkele-ecb6a585d1fc3705836dc896fe348b970101e8d3.zip
libopkele-ecb6a585d1fc3705836dc896fe348b970101e8d3.tar.gz
libopkele-ecb6a585d1fc3705836dc896fe348b970101e8d3.tar.bz2
renamed basic_message to basic_fields
since oauth fieldsets aren't really messages Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib/message.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/message.cc78
1 files changed, 1 insertions, 77 deletions
diff --git a/lib/message.cc b/lib/message.cc
index 78f20f4..b2324b7 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1,100 +1,24 @@
#include <cassert>
#include <opkele/types.h>
#include <opkele/exception.h>
#include <opkele/util.h>
#include <opkele/debug.h>
#include "config.h"
namespace opkele {
using std::input_iterator_tag;
using std::unary_function;
- struct __om_copier : public unary_function<const string&,void> {
- public:
- const basic_message& from;
- basic_message& to;
-
- __om_copier(basic_message& t,const basic_message& f)
- : from(f), to(t) { }
-
- result_type operator()(argument_type f) {
- to.set_field(f,from.get_field(f)); }
- };
-
- basic_message::basic_message(const basic_message& x) {
- x.copy_to(*this);
- }
- void basic_message::copy_to(basic_message& x) const {
- x.reset_fields();
- for_each(fields_begin(),fields_end(),
- __om_copier(x,*this) );
- }
- void basic_message::append_to(basic_message& x) const {
- for_each(fields_begin(),fields_end(),
- __om_copier(x,*this) );
- }
-
- struct __om_query_builder : public unary_function<const string&,void> {
- public:
- const basic_message& om;
- bool first;
- string& rv;
- const char *pfx;
-
- __om_query_builder(const char *p,string& r,const basic_message& m)
- : om(m), first(true), rv(r), pfx(p) {
- for_each(om.fields_begin(),om.fields_end(),*this);
- }
- __om_query_builder(const char *p,string& r,const basic_message& m,const string& u)
- : om(m), first(true), rv(r), pfx(p) {
- rv = u;
- if(rv.find('?')==string::npos)
- rv += '?';
- else
- first = false;
- for_each(om.fields_begin(),om.fields_end(),*this);
- }
-
- result_type operator()(argument_type f) {
- if(first)
- first = false;
- else
- rv += '&';
- if(pfx) rv += pfx;
- rv+= f;
- rv += '=';
- rv += util::url_encode(om.get_field(f));
- }
- };
-
- string basic_message::append_query(const string& url,const char *pfx) const {
- string rv;
- return __om_query_builder(pfx,rv,*this,url).rv;
- }
- string basic_message::query_string(const char *pfx) const {
- string rv;
- return __om_query_builder(pfx,rv,*this).rv;
- }
-
- void basic_message::reset_fields() {
- throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
- }
- void basic_message::set_field(const string&,const string&) {
- throw not_implemented(OPKELE_CP_ "set_field() not implemented");
- }
- void basic_message::reset_field(const string&) {
- throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
- }
struct __om_ns_finder : public unary_function<const string&,bool> {
public:
const basic_openid_message& om;
const string& uri;
__om_ns_finder(const basic_openid_message& m,
const string& u) : om(m), uri(u) { }
result_type operator()(argument_type f) {
return
(!strncmp(f.c_str(),"ns.",sizeof("ns.")-1))
@@ -120,25 +44,25 @@ namespace opkele {
void basic_openid_message::from_keyvalues(const string& kv) {
reset_fields();
string::size_type p = 0;
while(true) {
string::size_type co = kv.find(':',p);
if(co==string::npos)
break;
#ifndef POSTELS_LAW
string::size_type nl = kv.find('\n',co+1);
if(nl==string::npos)
throw bad_input(OPKELE_CP_ "malformed input");
if(nl>co)
- insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1)));
+ set_field(kv.substr(p,co-p),kv.substr(co+1,nl-co-1));
p = nl+1;
#else /* POSTELS_LAW */
string::size_type lb = kv.find_first_of("\r\n",co+1);
if(lb==string::npos) {
set_field(kv.substr(p,co-p),kv.substr(co+1));
break;
}
if(lb>co)
set_field(kv.substr(p,co-p),kv.substr(co+1,lb-co-1));
string::size_type nolb = kv.find_first_not_of("\r\n",lb);
if(nolb==string::npos)
break;