changed the way how the request's answer is created,
now winix can return json, xml, csv from out_main_stream or from frames and json from models removed from Request: bool send_bin_stream bool return_json bool return_info_only pt::Space info bool page_generated bool out_main_stream_use_html_filter bool out_streams_use_html_filter added to Request: enum AnswerSource enum AnswerContainer AnswerSource answer_source AnswerContainer answer_container bool use_ezc_engine std::wstring frame bool send_all_frames bool use_html_filter added to Config: // the name of the url parameter for returning all frames, e.g. https://domain.tld/mydir/myfunction/allframes // default: allframes std::wstring request_all_frames_parameter; // the name of the root element when serializing request answer to xml // default: winix std::wstring xml_root; algorithm (the whole algorithm is described in core/request.h): at the beginning of a request winix sets answer_source to models answer_container to text use_ezc_engine to true next answer_container and use_ezc_engine can be changed in the following way: 1. winix will look for 'Accept' http header and depending on the header winix will set: (not implemented yet) Accept | answer_container | use_ezc_engine ------------------------------------|----------------- application/json | json | false application/xml | xml | false text/csv | csv | false 2. next answer_container is set depending on 'container' url parameter container | answer_container --------------------------------------------------------- not present | don't change the value text | text json | json xml | xml csv | csv use_ezc_engine is set depending on 'answer' url parameter: answer | use_ezc_engine --------------------------------- not present | don't change the value html | true data | false if 'answer' is html then we take into account two more parameters: frame: frame_name (empty default) - if set then winix returns this specific frame allframes: (if present then winix returns all frames)
This commit is contained in:
@@ -514,32 +514,20 @@ void Rm::RemoveDir()
|
||||
void Rm::Clear()
|
||||
{
|
||||
content_item_tab.clear();
|
||||
files.clear();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* !! IMPROVE ME what about a Content-Type header for javascript?
|
||||
*
|
||||
*/
|
||||
void Rm::CreateJSON(bool status)
|
||||
{
|
||||
using TemplatesFunctions::R;
|
||||
pt::WTextStream buf;
|
||||
pt::Space & file = files.add_empty_space();
|
||||
file.add(cur->request->item.url, status);
|
||||
|
||||
JSONescape(cur->request->item.url, buf);
|
||||
|
||||
auto & out = cur->request->out_main_stream;
|
||||
out << R("{\"files\": [{\"") << R(buf) << R("\": ");
|
||||
|
||||
if( status )
|
||||
out << R("true");
|
||||
else
|
||||
out << R("false");
|
||||
|
||||
out << R("}]}");
|
||||
|
||||
cur->request->page_generated = true;
|
||||
cur->request->out_main_stream_use_html_filter = false;
|
||||
cur->request->models.Add(L"files", files);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user