Changed code in examples to compile with the new interface

Sebastiano Merlino · Sebastiano Merlino · commit accbad779d91 · 2013-01-20T12:35:12.000+01:00
diff --git a/examples/Test.cpp b/examples/Test.cpp
@@ -25,7 +25,7 @@ Test2::Test2() : http_resource()
 {
 }
 
-http_response Test::render_GET(const http_request& r)
+void Test::render_GET(const http_request& r, http_response** res)
 {
 /*	cout << r.get_version() << endl;
 	cout << r.get_requestor() << endl;
@@ -43,10 +43,10 @@ http_response Test::render_GET(const http_request& r)
     topics.push_back("prova");
     //return long_polling_receive_response("", 200, "", topics, 10, "keepalive\n");
     cout << r.get_querystring() << endl;
-    return http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");
+    *res = new http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");
 }
 
-http_response Test::render_POST(const http_request& r)
+void Test::render_POST(const http_request& r, http_response** res)
 {
 /*	fstream filestr;
 	filestr.open("test.txt", fstream::out | fstream::app);
@@ -59,16 +59,16 @@ http_response Test::render_POST(const http_request& r)
         cout << vv[i] << endl;
     }
 	return http_string_response("OK",200);*/
-	http_string_response s("OK",100);
-    s.set_header(http_utils::http_header_location, "B");
-    s.set_cookie("Ciccio", "Puppo");
-    s.set_cookie("Peppe", "Puppo");
-    cout << s.get_cookie("Ciccio") << endl;
-    return s;
+	http_string_response* s = new http_string_response("OK",100);
+    s->set_header(http_utils::http_header_location, "B");
+    s->set_cookie("Ciccio", "Puppo");
+    s->set_cookie("Peppe", "Puppo");
+    cout << s->get_cookie("Ciccio") << endl;
+    *res = s;
  //   return long_polling_send_response("<script type=\"text/javascript\">alert(\"ciao\")</script>\n", "prova");
 }
 
-http_response Test2::render_GET(const http_request& r)
+void Test2::render_GET(const http_request& r, http_response** res)
 {
 	cout << "D2" << endl;
     typedef std::map<std::string, std::string,
@@ -77,18 +77,18 @@ http_response Test2::render_GET(const http_request& r)
     r.get_cookies(c);
     for(c_type::const_iterator it = c.begin(); it != c.end(); ++it)
         cout << (*it).first << " -> " << (*it).second << endl;
-	return http_string_response("{\" var1 \" : \" "+r.get_arg("var1")+" \", \" var2 \" : \" "+r.get_arg("var2")+" \", \" var3 \" : \" "+r.get_arg("var3")+" \"}", 200);
+	*res = new http_string_response("{\" var1 \" : \" "+r.get_arg("var1")+" \", \" var2 \" : \" "+r.get_arg("var2")+" \", \" var3 \" : \" "+r.get_arg("var3")+" \"}", 200);
 }
 
-http_response Test::render_PUT(const http_request& r)
+void Test::render_PUT(const http_request& r, http_response** res)
 {
-	return http_string_response(r.get_content(), 200);
+	*res = new http_string_response(r.get_content(), 200);
 }
 
 int main()
 {
 //    signal(SIGINT, &signal_callback_handler);
-	webserver ws = create_webserver(8080).start_method(http_utils::INTERNAL_REMANAGED).max_threads(5);
+	webserver ws = create_webserver(8080).max_threads(5);
     ws_ptr = &ws;
 	Test dt = Test();
 	Test2 dt2 = Test2();
diff --git a/examples/Test.hpp b/examples/Test.hpp
@@ -4,18 +4,18 @@
 
 using namespace httpserver;
 
-class Test : virtual public http_resource {
+class Test : public http_resource<Test> {
 	public:
         Test();
-		virtual http_response render_GET(const http_request&);
-        virtual http_response render_PUT(const http_request&);
-        virtual http_response render_POST(const http_request&);
+		void render_GET(const http_request&, http_response**);
+        void render_PUT(const http_request&, http_response**);
+        void render_POST(const http_request&, http_response**);
 };
 
-class Test2 : virtual public http_resource {
+class Test2 : public http_resource<Test2> {
 	public:
         Test2();
-        virtual http_response render_GET(const http_request&);
+        void render_GET(const http_request&, http_response**);
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ Test2::Test2() : http_resource()`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`
`28`		`-http_response Test::render_GET(const http_request& r)`
	`28`	`+void Test::render_GET(const http_request& r, http_response** res)`
`29`	`29`	`{`
`30`	`30`	`/* cout << r.get_version() << endl;`
`31`	`31`	`cout << r.get_requestor() << endl;`
`@@ -43,10 +43,10 @@ http_response Test::render_GET(const http_request& r)`
`43`	`43`	`topics.push_back("prova");`
`44`	`44`	`//return long_polling_receive_response("", 200, "", topics, 10, "keepalive\n");`
`45`	`45`	`cout << r.get_querystring() << endl;`
`46`		`- return http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");`
	`46`	`+ *res = new http_file_response("/home/etr/progs/libhttpserver/test/noimg.png", 200, "image/png");`
`47`	`47`	`}`
`48`	`48`
`49`		`-http_response Test::render_POST(const http_request& r)`
	`49`	`+void Test::render_POST(const http_request& r, http_response** res)`
`50`	`50`	`{`
`51`	`51`	`/* fstream filestr;`
`52`	`52`	`filestr.open("test.txt", fstream::out \| fstream::app);`
`@@ -59,16 +59,16 @@ http_response Test::render_POST(const http_request& r)`
`59`	`59`	`cout << vv[i] << endl;`
`60`	`60`	`}`
`61`	`61`	`return http_string_response("OK",200);*/`
`62`		`- http_string_response s("OK",100);`
`63`		`- s.set_header(http_utils::http_header_location, "B");`
`64`		`- s.set_cookie("Ciccio", "Puppo");`
`65`		`- s.set_cookie("Peppe", "Puppo");`
`66`		`- cout << s.get_cookie("Ciccio") << endl;`
`67`		`- return s;`
	`62`	`+ http_string_response* s = new http_string_response("OK",100);`
	`63`	`+ s->set_header(http_utils::http_header_location, "B");`
	`64`	`+ s->set_cookie("Ciccio", "Puppo");`
	`65`	`+ s->set_cookie("Peppe", "Puppo");`
	`66`	`+ cout << s->get_cookie("Ciccio") << endl;`
	`67`	`+ *res = s;`
`68`	`68`	`// return long_polling_send_response("<script type=\"text/javascript\">alert(\"ciao\")</script>\n", "prova");`
`69`	`69`	`}`
`70`	`70`
`71`		`-http_response Test2::render_GET(const http_request& r)`
	`71`	`+void Test2::render_GET(const http_request& r, http_response** res)`
`72`	`72`	`{`
`73`	`73`	`cout << "D2" << endl;`
`74`	`74`	`typedef std::map<std::string, std::string,`
`@@ -77,18 +77,18 @@ http_response Test2::render_GET(const http_request& r)`
`77`	`77`	`r.get_cookies(c);`
`78`	`78`	`for(c_type::const_iterator it = c.begin(); it != c.end(); ++it)`
`79`	`79`	`cout << (it).first << " -> " << (it).second << endl;`
`80`		`- return http_string_response("{\" var1 \" : \" "+r.get_arg("var1")+" \", \" var2 \" : \" "+r.get_arg("var2")+" \", \" var3 \" : \" "+r.get_arg("var3")+" \"}", 200);`
	`80`	`+ *res = new http_string_response("{\" var1 \" : \" "+r.get_arg("var1")+" \", \" var2 \" : \" "+r.get_arg("var2")+" \", \" var3 \" : \" "+r.get_arg("var3")+" \"}", 200);`
`81`	`81`	`}`
`82`	`82`
`83`		`-http_response Test::render_PUT(const http_request& r)`
	`83`	`+void Test::render_PUT(const http_request& r, http_response** res)`
`84`	`84`	`{`
`85`		`- return http_string_response(r.get_content(), 200);`
	`85`	`+ *res = new http_string_response(r.get_content(), 200);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`int main()`
`89`	`89`	`{`
`90`	`90`	`// signal(SIGINT, &signal_callback_handler);`
`91`		`- webserver ws = create_webserver(8080).start_method(http_utils::INTERNAL_REMANAGED).max_threads(5);`
	`91`	`+ webserver ws = create_webserver(8080).max_threads(5);`
`92`	`92`	`ws_ptr = &ws;`
`93`	`93`	`Test dt = Test();`
`94`	`94`	`Test2 dt2 = Test2();`