- QueryReader use now a PacketReader (correction for packets from HTT…

…P POST messages)

MonaCore/include/Mona/QueryReader.h

@@ -29,10 +29,9 @@ namespace Mona {
 class QueryReader : public DataReader, public virtual Object {
 public:
 
-	QueryReader(const char* query) :  _query(query),_current(_query),_type(END) {}
+	QueryReader(PacketReader& packet) :  DataReader(packet),_type(END) {}
 
-	const char* query() const { return _query; }
-	void		reset() { _current = _query; _type = END; }
+	void		reset() { packet.reset(); _type = END; }
 
 private:
 	enum {
@@ -45,8 +44,6 @@ class QueryReader : public DataReader, public virtual Object {
 	void	writeValue(UInt8 type, DataWriter& writer);
 	UInt8   valueType();
 
-	const char* _query;
-	const char* _current;
 	std::string _property;
 	std::string _value;
 	Date		_date;

MonaCore/sources/HTTP/HTTPSession.cpp

@@ -114,7 +114,8 @@ void HTTPSession::receive(const shared_ptr<HTTPPacket>& pPacket) {
 		peer.properties().setString(it.first, it.second);
 
 	// Create parameters for onConnection or a GET onRead/onWrite/onMessage
-	QueryReader parameters(peer.query.c_str());
+	PacketReader query(BIN peer.query.data(), peer.query.size());
+	QueryReader parameters(query);
 
 	Exception ex;
 

MonaCore/sources/MIME.cpp

@@ -85,7 +85,7 @@ bool MIME::CreateDataReader(Type type,PacketReader& packet,const PoolBuffers& po
 			pReader.reset(new AMFReader(packet));
 			return true;
 		case QUERY:
-			pReader.reset(new QueryReader(STR packet.data()));
+			pReader.reset(new QueryReader(packet));
 			return true;
 	}
 	pReader.reset();

MonaCore/sources/QueryReader.cpp

@@ -38,12 +38,14 @@ UInt8 QueryReader::followingType() {
 			_value.assign(value);
 		} else
 			_value = std::move(key);
-		return false;
+		return false; // we just want the first following key
 	});
 
-	if (!_current || Util::UnpackQuery(_current, forEach) == 0)
+	if (!packet.available())
 		return END;
 
+	SCOPED_STRINGIFY(STR packet.current(),packet.available(), if (Util::UnpackQuery(STR packet.current(), forEach) == 0) return END;)
+
 	if (hasProperty)
 		_type = OBJECT;
 	else
@@ -54,29 +56,36 @@ UInt8 QueryReader::followingType() {
 
 
 bool QueryReader::readOne(UInt8 type, DataWriter& writer) {
-
+
+	const UInt8* cur = packet.current();
+	const UInt8* end = cur+packet.available();
 	if (type==OBJECT) {
 
 		// OBJECT
 		writer.beginObject();
 		do {
+			cur = packet.current();
 			writer.writePropertyName(_property.c_str());
 			writeValue(valueType(), writer);
+
 			// next!
-			_current = strchr(_current, '&');
+			while (cur<end && *cur != '&')
+				cur++;
+			packet.next(cur-packet.current() + (*cur=='&'));
+
 			_type = END;
-			if (_current) ++_current;
-		} while ((_type=followingType())==OBJECT);
+		} while (cur<end && (_type=followingType())==OBJECT);
 		writer.endObject();
 		return true;
 	}
 
 	writeValue(type, writer);
 
 	// next!
-	_current = strchr(_current, '&');
+	while (cur<end && *cur != '&')
+		cur++;
+	packet.next(cur-packet.current() + (*cur=='&'));
 	_type = END;
-	if (_current) ++_current;
 	return true;
 }
 

MonaServer/sources/LUAInvoker.cpp

@@ -315,14 +315,6 @@ int	LUAInvoker::ToXML(lua_State *pState) {
 	SCRIPT_CALLBACK_RETURN
 }
 
-int	LUAInvoker::FromQuery(lua_State *pState) {
-	SCRIPT_CALLBACK(Invoker, invoker)
-		ScriptWriter writer(pState);
-		QueryReader(SCRIPT_READ_STRING(String::Empty.c_str())).read(writer);
-	SCRIPT_CALLBACK_RETURN
-}
-
-
 int	LUAInvoker::AddToBlacklist(lua_State* pState) {
 	SCRIPT_CALLBACK(Invoker,invoker)	
 		while(SCRIPT_READ_AVAILABLE) {
@@ -445,7 +437,7 @@ int LUAInvoker::Get(lua_State *pState) {
 				SCRIPT_WRITE_FUNCTION(LUAInvoker::ToData<Mona::QueryWriter>)
 				SCRIPT_CALLBACK_FIX_INDEX
 			} else if (strcmp(name, "fromQuery") == 0) {
-				SCRIPT_WRITE_FUNCTION(LUAInvoker::FromQuery)
+				SCRIPT_WRITE_FUNCTION(LUAInvoker::FromData<Mona::QueryReader>)
 				SCRIPT_CALLBACK_FIX_INDEX
 			} else if (strcmp(name, "absolutePath") == 0) {
 				SCRIPT_WRITE_FUNCTION(LUAInvoker::AbsolutePath)

MonaServer/sources/LUAInvoker.h

@@ -129,7 +129,6 @@ class LUAInvoker {
 
 	static int	FromXML(lua_State *pState);
 	static int	ToXML(lua_State *pState);
-	static int	FromQuery(lua_State *pState);
 
 	static int	Time(lua_State *pState);
 	static int	ToAMF0(lua_State *pState);