From 0f84548f783b8b1f03ac2a262af671a3d19f7ff1 Mon Sep 17 00:00:00 2001 From: Andreev Gregory Date: Thu, 15 Aug 2024 09:50:14 +0300 Subject: [PATCH] nytl: hot fix --- example/config.json | 6 +++++- src/http_server/new_york_transit_line/rendering.cpp | 2 +- .../HypertextPages/biba/boba/aboba.nytl.html | 7 ------- src/http_server/nytl_tests/HypertextPages/c.txt | 12 ++++++++++++ .../nytl_tests/HypertextPages/test.nytl.html | 8 +------- src/http_server/nytl_tests/test0.cpp | 2 ++ src/web_chat/main.cpp | 2 -- 7 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 src/http_server/nytl_tests/HypertextPages/biba/boba/aboba.nytl.html create mode 100644 src/http_server/nytl_tests/HypertextPages/c.txt diff --git a/example/config.json b/example/config.json index 3edafa7..712ed07 100644 --- a/example/config.json +++ b/example/config.json @@ -1,7 +1,7 @@ { "presentation": { "instance-identity": { - "top-title": "Вэб чат ИУ9" + "top-title": "Вэб чат от ИУ9" }, "phr": { "decl": { @@ -18,6 +18,10 @@ } }, "assets": "./assets", + "database": { + "type": "sqlite", + "file": "./iu9-ca-web-chat.db" + }, "limits": { "max-users": 100000, "max-rooms": 100000, diff --git a/src/http_server/new_york_transit_line/rendering.cpp b/src/http_server/new_york_transit_line/rendering.cpp index 3bcb089..cb1d5a0 100644 --- a/src/http_server/new_york_transit_line/rendering.cpp +++ b/src/http_server/new_york_transit_line/rendering.cpp @@ -27,7 +27,7 @@ namespace nytl { if (result.is_json) { const json::JSON& P = *result.JSON_subval; if (P.isArray() && what.isInteger()) { - const std::vector arr_p = P.asArray(); + const std::vector& arr_p = P.asArray(); int64_t ind_w = what.asInteger().get_int(); ASSERT(ind_w > 0 && ind_w < arr_p.size(), "Expression \"array[integer]\" caused out-of-bound situation"); result = LocalVarValue{true, "", &arr_p[ind_w]}; diff --git a/src/http_server/nytl_tests/HypertextPages/biba/boba/aboba.nytl.html b/src/http_server/nytl_tests/HypertextPages/biba/boba/aboba.nytl.html deleted file mode 100644 index 8a154da..0000000 --- a/src/http_server/nytl_tests/HypertextPages/biba/boba/aboba.nytl.html +++ /dev/null @@ -1,7 +0,0 @@ -{% ELDEF main %} - - CCC -DDD - - -{% ENDELDEF %} \ No newline at end of file diff --git a/src/http_server/nytl_tests/HypertextPages/c.txt b/src/http_server/nytl_tests/HypertextPages/c.txt new file mode 100644 index 0000000..a4a1f4d --- /dev/null +++ b/src/http_server/nytl_tests/HypertextPages/c.txt @@ -0,0 +1,12 @@ +{% 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 %} diff --git a/src/http_server/nytl_tests/HypertextPages/test.nytl.html b/src/http_server/nytl_tests/HypertextPages/test.nytl.html index 013fb7a..8be435a 100644 --- a/src/http_server/nytl_tests/HypertextPages/test.nytl.html +++ b/src/http_server/nytl_tests/HypertextPages/test.nytl.html @@ -1,9 +1,3 @@ - - {% ELDEF main JSON cba %} - AAA - {% FOR _:val IN cba %} - TUTUTUTUTUTUTUTUN {% PUT jesccomp val %} - {% ENDFOR %} - + {% WRITE cba[cba.k][cba.i] %} {% ENDELDEF %} \ No newline at end of file diff --git a/src/http_server/nytl_tests/test0.cpp b/src/http_server/nytl_tests/test0.cpp index 84b48ce..466bde6 100644 --- a/src/http_server/nytl_tests/test0.cpp +++ b/src/http_server/nytl_tests/test0.cpp @@ -17,6 +17,8 @@ int main(int argc, char** argv) { cba["arr"][0] = json::JSON("zero"); cba["arr"][1] = json::JSON("one"); cba["arr"][2] = json::JSON("two"); + cba["k"] = json::JSON("arr"); + cba["i"] = json::JSON(1l); // printf("DEBUG WAS: %p\n", &cba["boba"].g()); // printf("%s\n", json::generate_str(cba["boba"].g(), json::print_compact).c_str()); // return 0; diff --git a/src/web_chat/main.cpp b/src/web_chat/main.cpp index 24beccb..c14e7c3 100644 --- a/src/web_chat/main.cpp +++ b/src/web_chat/main.cpp @@ -10,8 +10,6 @@ #include #include -#include "../http_server/engine_engine_number_9/running_mainloop.h" - bool termination = false; void sigterm_action(int) {