mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- yhook: allow multiple json objects

Browse Source
This commit is contained in:
svenhoefer
2016-02-23 14:24:19 +01:00
parent 3fd3f2ba1f
commit e89d0433ad
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/yhttpd_core/yhook.cpp
View File

@@ -495,7 +495,7 @@ std::string CyhookHandler::outArrayItem(std::string _key, std::string _content,
return result; return result;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
std::string CyhookHandler::outCollection(std::string _key, std::string _content) { std::string CyhookHandler::outCollection(std::string _key, std::string _content, bool _next) {
std::string result = ""; std::string result = "";
switch (outType) { switch (outType) {
case xml: case xml:
@@ -506,6 +506,8 @@ std::string CyhookHandler::outCollection(std::string _key, std::string _content)
case json: case json:
//TODO: json check //TODO: json check
result = outIndent() + "\"" + _key + "\": {" + _content + "}"; result = outIndent() + "\"" + _key + "\": {" + _content + "}";
if(_next)
result += ",";
result += "\n"; result += "\n";
break; break;
default: default:

2
src/nhttpd/yhttpd_core/yhook.h
View File

@@ -208,7 +208,7 @@ public:
std::string outPair(std::string _key, std::string _content, bool _next); std::string outPair(std::string _key, std::string _content, bool _next);
std::string outArray(std::string _key, std::string _content); std::string outArray(std::string _key, std::string _content);
std::string outArrayItem(std::string _key, std::string _content, bool _next); std::string outArrayItem(std::string _key, std::string _content, bool _next);
std::string outCollection(std::string _key,std::string _content); std::string outCollection(std::string _key,std::string _content, bool _next = false);
std::string outValue(std::string _content); std::string outValue(std::string _content);
std::string outNext(); std::string outNext();
friend class CyParser; friend class CyParser;