tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

changed the way how the request's answer is created,

Browse Source 
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:
Tomasz Sowa
2021-10-13 01:27:14 +02:00
parent 3e46c5674c
commit d5ebb7ca12
42 changed files with 1085 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
winixd/plugins/group/Makefile.dep
View File

@@ -10,6 +10,12 @@ groupinfo.o: ../../../../pikotools/src/textstream/stream.h
groupinfo.o: ../../../../pikotools/src/utf8/utf8_templates.h
groupinfo.o: ../../../../pikotools/src/utf8/utf8_private.h
groupinfo.o: ../../../../pikotools/src/convert/baseparser.h
groupinfo.o: ../../../../pikotools/src/textstream/textstream.h
groupinfo.o: ../../../../pikotools/src/textstream/stream.h
groupinfo.o: ../../../../pikotools/src/space/space.h
groupinfo.o: ../../../../pikotools/src/date/date.h
groupinfo.o: ../../../../pikotools/src/membuffer/membuffer.h
groupinfo.o: ../../../../pikotools/src/textstream/types.h
groupinfo.o: ../../../../winix/winixd/core/winixrequest.h
groupinfo.o: ../../../../winix/winixd/core/winixsystem.h
groupinfo.o: ../../../../winix/winixd/core/system.h
@@ -22,12 +28,6 @@ groupinfo.o: ../../../../winix/winixd/core/config.h
groupinfo.o: ../../../../winix/winixd/core/log.h
groupinfo.o: ../../../../winix/winixd/core/logmanipulators.h
groupinfo.o: ../../../../pikotools/src/log/log.h
groupinfo.o: ../../../../pikotools/src/textstream/textstream.h
groupinfo.o: ../../../../pikotools/src/textstream/stream.h
groupinfo.o: ../../../../pikotools/src/space/space.h
groupinfo.o: ../../../../pikotools/src/date/date.h
groupinfo.o: ../../../../pikotools/src/membuffer/membuffer.h
groupinfo.o: ../../../../pikotools/src/textstream/types.h
groupinfo.o: ../../../../pikotools/src/log/filelog.h
groupinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
groupinfo.o: ../../../../morm/src/model.h
@@ -76,6 +76,7 @@ groupinfo.o: ../../../../pikotools/src/convert/patternreplacer.h
groupinfo.o: ../../../../pikotools/src/convert/strtoint.h
groupinfo.o: ../../../../pikotools/src/convert/text.h
groupinfo.o: ../../../../pikotools/src/convert/misc.h
groupinfo.o: ../../../../pikotools/src/utf8/utf8_stream.h
groupinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
groupinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
groupinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -145,6 +146,12 @@ groups.o: ../../../../pikotools/src/textstream/stream.h
groups.o: ../../../../pikotools/src/utf8/utf8_templates.h
groups.o: ../../../../pikotools/src/utf8/utf8_private.h
groups.o: ../../../../pikotools/src/convert/baseparser.h
groups.o: ../../../../pikotools/src/textstream/textstream.h
groups.o: ../../../../pikotools/src/textstream/stream.h
groups.o: ../../../../pikotools/src/space/space.h
groups.o: ../../../../pikotools/src/date/date.h
groups.o: ../../../../pikotools/src/membuffer/membuffer.h
groups.o: ../../../../pikotools/src/textstream/types.h
groups.o: ../../../../winix/winixd/core/winixrequest.h
groups.o: ../../../../winix/winixd/core/winixsystem.h
groups.o: ../../../../winix/winixd/core/system.h
@@ -157,12 +164,6 @@ groups.o: ../../../../winix/winixd/core/config.h
groups.o: ../../../../winix/winixd/core/log.h
groups.o: ../../../../winix/winixd/core/logmanipulators.h
groups.o: ../../../../pikotools/src/log/log.h
groups.o: ../../../../pikotools/src/textstream/textstream.h
groups.o: ../../../../pikotools/src/textstream/stream.h
groups.o: ../../../../pikotools/src/space/space.h
groups.o: ../../../../pikotools/src/date/date.h
groups.o: ../../../../pikotools/src/membuffer/membuffer.h
groups.o: ../../../../pikotools/src/textstream/types.h
groups.o: ../../../../pikotools/src/log/filelog.h ../../../../morm/src/morm.h
groups.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
groups.o: ../../../../morm/src/modelconnector.h
@@ -206,12 +207,13 @@ groups.o: ../../../../winix/winixd/templates/locale.h
groups.o: ../../../../pikotools/src/convert/patternreplacer.h
groups.o: ../../../../pikotools/src/convert/strtoint.h
groups.o: ../../../../pikotools/src/convert/text.h
groups.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
groups.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
groups.o: ../../../../ezc/src/item.h ../../../../ezc/src/cache.h
groups.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
groups.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
groups.o: ../../../../ezc/src/outstreams.h
groups.o: ../../../../pikotools/src/convert/misc.h
groups.o: ../../../../pikotools/src/utf8/utf8_stream.h
groups.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
groups.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
groups.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
groups.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
groups.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
groups.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
groups.o: ../../../../ezc/src/patternparser.h
groups.o: ../../../../winix/winixd/templates/htmltextstream.h
@@ -337,12 +339,13 @@ init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../pikotools/src/convert/patternreplacer.h
init.o: ../../../../pikotools/src/convert/strtoint.h
init.o: ../../../../pikotools/src/convert/text.h
init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
init.o: ../../../../ezc/src/item.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../pikotools/src/convert/misc.h
init.o: ../../../../pikotools/src/utf8/utf8_stream.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
@@ -468,12 +471,13 @@ templates.o: ../../../../pikotools/src/log/filelog.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../pikotools/src/convert/misc.h
templates.o: ../../../../pikotools/src/convert/text.h
templates.o: ../../../../pikotools/src/textstream/types.h
templates.o: ../../../../pikotools/src/utf8/utf8_stream.h
templates.o: ../../../../winix/winixd/templates/patterncacher.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/src/space/spaceparser.h
templates.o: ../../../../pikotools/src/space/space.h
templates.o: ../../../../pikotools/src/textstream/types.h
templates.o: ../../../../pikotools/src/convert/baseparser.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h