summaryrefslogtreecommitdiffabout
path: root/lib
Unidiff
Diffstat (limited to 'lib') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/fields.cc86
-rw-r--r--lib/message.cc78
3 files changed, 88 insertions, 78 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9b25b42..20d15b8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,5 +29,5 @@ libopkele_la_SOURCES = \
29 discovery.cc \ 29 discovery.cc \
30 basic_rp.cc prequeue_rp.cc \ 30 basic_rp.cc prequeue_rp.cc \
31 message.cc \ 31 fields.cc message.cc \
32 basic_op.cc verify_op.cc 32 basic_op.cc verify_op.cc
33libopkele_la_LDFLAGS = \ 33libopkele_la_LDFLAGS = \
diff --git a/lib/fields.cc b/lib/fields.cc
new file mode 100644
index 0000000..d494098
--- a/dev/null
+++ b/lib/fields.cc
@@ -0,0 +1,86 @@
1#include <opkele/types.h>
2#include <opkele/exception.h>
3#include <opkele/util.h>
4
5namespace opkele {
6 using std::unary_function;
7
8 struct __om_copier : public unary_function<const string&,void> {
9 public:
10 const basic_fields& from;
11 basic_fields& to;
12
13 __om_copier(basic_fields& t,const basic_fields& f)
14 : from(f), to(t) { }
15
16 result_type operator()(argument_type f) {
17 to.set_field(f,from.get_field(f)); }
18 };
19
20 basic_fields::basic_fields(const basic_fields& x) {
21 x.copy_to(*this);
22 }
23 void basic_fields::copy_to(basic_fields& x) const {
24 x.reset_fields();
25 for_each(fields_begin(),fields_end(),
26 __om_copier(x,*this) );
27 }
28 void basic_fields::append_to(basic_fields& x) const {
29 for_each(fields_begin(),fields_end(),
30 __om_copier(x,*this) );
31 }
32
33 struct __om_query_builder : public unary_function<const string&,void> {
34 public:
35 const basic_fields& om;
36 bool first;
37 string& rv;
38 const char *pfx;
39
40 __om_query_builder(const char *p,string& r,const basic_fields& m)
41 : om(m), first(true), rv(r), pfx(p) {
42 for_each(om.fields_begin(),om.fields_end(),*this);
43 }
44 __om_query_builder(const char *p,string& r,const basic_fields& m,const string& u)
45 : om(m), first(true), rv(r), pfx(p) {
46 rv = u;
47 if(rv.find('?')==string::npos)
48 rv += '?';
49 else
50 first = false;
51 for_each(om.fields_begin(),om.fields_end(),*this);
52 }
53
54 result_type operator()(argument_type f) {
55 if(first)
56 first = false;
57 else
58 rv += '&';
59 if(pfx) rv += pfx;
60 rv+= f;
61 rv += '=';
62 rv += util::url_encode(om.get_field(f));
63 }
64 };
65
66 string basic_fields::append_query(const string& url,const char *pfx) const {
67 string rv;
68 return __om_query_builder(pfx,rv,*this,url).rv;
69 }
70 string basic_fields::query_string(const char *pfx) const {
71 string rv;
72 return __om_query_builder(pfx,rv,*this).rv;
73 }
74
75 void basic_fields::reset_fields() {
76 throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
77 }
78 void basic_fields::set_field(const string&,const string&) {
79 throw not_implemented(OPKELE_CP_ "set_field() not implemented");
80 }
81 void basic_fields::reset_field(const string&) {
82 throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
83 }
84
85
86}
diff --git a/lib/message.cc b/lib/message.cc
index 78f20f4..b2324b7 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -11,80 +11,4 @@ namespace opkele {
11 using std::unary_function; 11 using std::unary_function;
12 12
13 struct __om_copier : public unary_function<const string&,void> {
14 public:
15 const basic_message& from;
16 basic_message& to;
17
18 __om_copier(basic_message& t,const basic_message& f)
19 : from(f), to(t) { }
20
21 result_type operator()(argument_type f) {
22 to.set_field(f,from.get_field(f)); }
23 };
24
25 basic_message::basic_message(const basic_message& x) {
26 x.copy_to(*this);
27 }
28 void basic_message::copy_to(basic_message& x) const {
29 x.reset_fields();
30 for_each(fields_begin(),fields_end(),
31 __om_copier(x,*this) );
32 }
33 void basic_message::append_to(basic_message& x) const {
34 for_each(fields_begin(),fields_end(),
35 __om_copier(x,*this) );
36 }
37
38 struct __om_query_builder : public unary_function<const string&,void> {
39 public:
40 const basic_message& om;
41 bool first;
42 string& rv;
43 const char *pfx;
44
45 __om_query_builder(const char *p,string& r,const basic_message& m)
46 : om(m), first(true), rv(r), pfx(p) {
47 for_each(om.fields_begin(),om.fields_end(),*this);
48 }
49 __om_query_builder(const char *p,string& r,const basic_message& m,const string& u)
50 : om(m), first(true), rv(r), pfx(p) {
51 rv = u;
52 if(rv.find('?')==string::npos)
53 rv += '?';
54 else
55 first = false;
56 for_each(om.fields_begin(),om.fields_end(),*this);
57 }
58
59 result_type operator()(argument_type f) {
60 if(first)
61 first = false;
62 else
63 rv += '&';
64 if(pfx) rv += pfx;
65 rv+= f;
66 rv += '=';
67 rv += util::url_encode(om.get_field(f));
68 }
69 };
70
71 string basic_message::append_query(const string& url,const char *pfx) const {
72 string rv;
73 return __om_query_builder(pfx,rv,*this,url).rv;
74 }
75 string basic_message::query_string(const char *pfx) const {
76 string rv;
77 return __om_query_builder(pfx,rv,*this).rv;
78 }
79
80 void basic_message::reset_fields() {
81 throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
82 }
83 void basic_message::set_field(const string&,const string&) {
84 throw not_implemented(OPKELE_CP_ "set_field() not implemented");
85 }
86 void basic_message::reset_field(const string&) {
87 throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
88 }
89 13
90 struct __om_ns_finder : public unary_function<const string&,bool> { 14 struct __om_ns_finder : public unary_function<const string&,bool> {
@@ -130,5 +54,5 @@ namespace opkele {
130 throw bad_input(OPKELE_CP_ "malformed input"); 54 throw bad_input(OPKELE_CP_ "malformed input");
131 if(nl>co) 55 if(nl>co)
132 insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); 56 set_field(kv.substr(p,co-p),kv.substr(co+1,nl-co-1));
133 p = nl+1; 57 p = nl+1;
134#else /* POSTELS_LAW */ 58#else /* POSTELS_LAW */