the whole library rewritten

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 5 insertions, 96 deletions

diff --git a/lib/params.cc b/lib/params.cc
index 7a572c1..6805516 100644
--- a/lib/params.cc
+++ b/lib/params.cc
@@ -1,121 +1,30 @@
 #include <opkele/types.h>
 #include <opkele/exception.h>
 #include <opkele/util.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
 
 #include "config.h"
 
 namespace opkele {
     using namespace std;
 
-    bool params_t::has_param(const string& n) const {
-	return find(n)!=end();
-    }
-    const string& params_t::get_param(const string& n) const {
-	const_iterator i = find(n);
-	if(i==end())
-	    throw failed_lookup(OPKELE_CP_ n+": no such parameter");
-	return i->second;
-    }
-    string& params_t::get_param(const string& n) {
-	iterator i = find(n);
-	if(i==end())
-	    throw failed_lookup(OPKELE_CP_ n+": no such parameter");
-	return i->second;
-    }
-
-    void params_t::parse_keyvalues(const string& kv) {
-	clear();
-	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)));
-	    p = nl+1;
-#else /* POSTELS_LAW */
-	    string::size_type lb = kv.find_first_of("\r\n",co+1);
-	    if(lb==string::npos) {
-		insert(value_type(kv.substr(p,co-p),kv.substr(co+1)));
-		break;
-	    }
-	    if(lb>co)
-		insert(value_type(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;
-	    p = nolb;
-#endif /* POSTELS_LAW */
-	}
-    }
-
-    void params_t::sign(secret_t secret,string& sig,const string& slist,const char *prefix) const {
-	string kv;
-	string::size_type p = 0;
-	while(true) {
-	    string::size_type co = slist.find(',',p);
-	    string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p);
-	    kv += f;
-	    kv += ':';
-	    if(prefix) f.insert(0,prefix);
-	    kv += get_param(f);
-	    kv += '\n';
-	    if(co==string::npos)
-		break;
-	    p = co+1;
-	}
-	unsigned int md_len = 0;
-	unsigned char *md = HMAC(
-		EVP_sha1(),
-		&(secret.front()),secret.size(),
-		(const unsigned char *)kv.data(),kv.length(),
-		0,&md_len);
-	sig = util::encode_base64(md,md_len);
-    }
-
     string params_t::append_query(const string& url,const char *prefix) const {
 	string rv = url;
 	bool p = true;
 	if(rv.find('?')==string::npos) {
-	    rv += '?';
-	    p = false;
-	}
-	for(const_iterator i=begin();i!=end();++i) {
+	    rv += '?'; p = false; }
+	for(fields_iterator i=fields_begin();i!=fields_end();++i) {
 	    if(p)
 		rv += '&';
 	    else
 		p = true;
-	    rv += prefix;
-	    rv += i->first;
+	    if(prefix) rv += prefix;
+	    rv += *i;
 	    rv += '=';
-	    rv += util::url_encode(i->second);
+	    rv += util::url_encode(get_field(*i));
 	}
 	return rv;
     }
 
-    string params_t::query_string(const char *prefix) const {
-	string rv;
-	for(const_iterator i=begin();i!=end();++i) {
-	    if(!rv.empty())
-		rv += '&';
-	    rv += prefix;
-	    rv += i->first;
-	    rv += '=';
-	    rv += util::url_encode(i->second);
-	}
-	return rv;
-    }
-
-    ostream& operator << (ostream& o,const params_t& p) {
-	for(params_t::const_iterator i=p.begin();i!=p.end();++i)
-	    o << i->first << ':' << i->second << '\n';
-	return o;
-    }
-
 }