From 7a1bfd81f39daad6481f4b62079348fb01f979eb Mon Sep 17 00:00:00 2001 From: Andreev Gregory Date: Thu, 15 Aug 2024 11:53:44 +0300 Subject: [PATCH] nytl: quick fix --- src/http_server/new_york_transit_line/rendering.cpp | 4 ++-- src/http_server/nytl_tests/HypertextPages/c.txt | 12 ++---------- .../nytl_tests/HypertextPages/test.nytl.html | 9 +++++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/http_server/new_york_transit_line/rendering.cpp b/src/http_server/new_york_transit_line/rendering.cpp index cb1d5a0..3be9d53 100644 --- a/src/http_server/new_york_transit_line/rendering.cpp +++ b/src/http_server/new_york_transit_line/rendering.cpp @@ -300,10 +300,10 @@ namespace nytl { } uptr RFrame_OverArray::toMe(bool returned, RFrame_passed) { - if (returned && part.line_feed) - append("\n", result); if (it >= arr.size()) return NULL; + if (returned && part.line_feed) + append("\n", result); if (part.where_key_var > -1) { additional_json_wrapper.asInteger() = json::Integer((int64_t)it); saved_args_plus_iter[part.where_key_var] = {true, "", &additional_json_wrapper}; diff --git a/src/http_server/nytl_tests/HypertextPages/c.txt b/src/http_server/nytl_tests/HypertextPages/c.txt index a4a1f4d..69fdca1 100644 --- a/src/http_server/nytl_tests/HypertextPages/c.txt +++ b/src/http_server/nytl_tests/HypertextPages/c.txt @@ -1,12 +1,4 @@ -{% ELDEF cmain JSON cba %} AAA {% FOR _:val IN cba %} - TUTUTUTUTUTUTUTUN {% PUT jesccomp val %} - {% ENDFOR %} - AAA - {% FOR val IN cba[cba.k] %} - --> {% WRITE val %} - {% ENDFOR %} - AAA {% WRITE cba[cba.k][cba.i] %} AAA - -{% ENDELDEF %} + TUTUTUTUTUTUTUTUN {% PUT jesccomp val %} + {% ENDFOR %} \ No newline at end of file diff --git a/src/http_server/nytl_tests/HypertextPages/test.nytl.html b/src/http_server/nytl_tests/HypertextPages/test.nytl.html index 8be435a..a6f6f60 100644 --- a/src/http_server/nytl_tests/HypertextPages/test.nytl.html +++ b/src/http_server/nytl_tests/HypertextPages/test.nytl.html @@ -1,3 +1,8 @@ {% ELDEF main JSON cba %} - {% WRITE cba[cba.k][cba.i] %} -{% ENDELDEF %} \ No newline at end of file + AAA + {% FOR val IN cba.arr %} + --> {% WRITE val %} + {% ENDFOR %} + AAA + +{% ENDELDEF %}