Browse Source

Merge branch '778'

mcoccia 11 years ago
parent
commit
ef28f72003
3 changed files with 27 additions and 12 deletions
  1. 9 4
      cpoll_cppsp/www/db
  2. 9 4
      cpoll_cppsp/www/db_pg_async
  3. 9 4
      cpoll_cppsp/www/db_pg_threadpool

+ 9 - 4
cpoll_cppsp/www/db

@@ -128,13 +128,18 @@ void efdCB(eventfd_t efdVal) {
 void waitCB(eventfd_t efdVal) {
 void waitCB(eventfd_t efdVal) {
 	this->doInit();
 	this->doInit();
 }
 }
-
-%>[<%
+%><%
+if (queries>1) {
+	%>[<%
+}
 for (int i=0;i<queries;i++){
 for (int i=0;i<queries;i++){
 	if(i>0) output.write(',');
 	if(i>0) output.write(',');
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
 }
 }
-
+if (queries>1) {
+	%>]<%
+}
+%><%
 response->headers["Content-Type"]="application/json";
 response->headers["Content-Type"]="application/json";
 response->headers["Server"]="cppsp/0.2";
 response->headers["Server"]="cppsp/0.2";
-%>]
+%>

+ 9 - 4
cpoll_cppsp/www/db_pg_async

@@ -107,13 +107,18 @@ void evtIn(int) {
 	PQclear(res);
 	PQclear(res);
 	beginGetItems();
 	beginGetItems();
 }
 }
-
-%>[<%
+%><%
+if(queries>1) {
+	%>[<%
+}
 for (int i=0;i<queries;i++){
 for (int i=0;i<queries;i++){
 	if(i>0) output.write(',');
 	if(i>0) output.write(',');
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
 }
 }
-
+if(queries>1) {
+        %>]<%
+}
+%><%
 response->headers["Content-Type"]="application/json";
 response->headers["Content-Type"]="application/json";
 response->headers["Server"]="cppsp/0.2";
 response->headers["Server"]="cppsp/0.2";
-%>]
+%>

+ 9 - 4
cpoll_cppsp/www/db_pg_threadpool

@@ -94,13 +94,18 @@ void efdCB(eventfd_t efdVal) {
 void waitCB(eventfd_t efdVal) {
 void waitCB(eventfd_t efdVal) {
 	this->doInit();
 	this->doInit();
 }
 }
-
-%>[<%
+%><%
+if(queries>1) {
+	%>[<%
+}
 for (int i=0;i<queries;i++){
 for (int i=0;i<queries;i++){
 	if(i>0) output.write(',');
 	if(i>0) output.write(',');
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
 }
 }
-
+if(queries>1) {
+        %>]<%
+}
+%><%
 response->headers["Content-Type"]="application/json";
 response->headers["Content-Type"]="application/json";
 response->headers["Server"]="cppsp/0.2";
 response->headers["Server"]="cppsp/0.2";
-%>]
+%>