From 1932532416a6fedfd0e2567e0c76974e2092c620 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 2 May 2025 15:07:28 +0200 Subject: [PATCH] Bug fixes, tests --- src/plugins/streamers/maly/db_plugin/dbMALY.cc | 2 +- .../maly/unit_tests/dbMALYReaderTests.cc | 1 + testdata/maly/maly_test10_lm_au.oas | Bin 0 -> 1705 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 testdata/maly/maly_test10_lm_au.oas diff --git a/src/plugins/streamers/maly/db_plugin/dbMALY.cc b/src/plugins/streamers/maly/db_plugin/dbMALY.cc index 385e217fa..372b91f2d 100644 --- a/src/plugins/streamers/maly/db_plugin/dbMALY.cc +++ b/src/plugins/streamers/maly/db_plugin/dbMALY.cc @@ -163,7 +163,7 @@ public: virtual tl::XMLElementBase *xml_reader_options_element () const { - return new db::ReaderOptionsXMLElement ("mag", + return new db::ReaderOptionsXMLElement ("maly", tl::make_member (&db::MALYReaderOptions::dbu, "dbu") + tl::make_member (&db::MALYReaderOptions::layer_map, "layer-map") + tl::make_member (&db::MALYReaderOptions::create_other_layers, "create-other-layers") diff --git a/src/plugins/streamers/maly/unit_tests/dbMALYReaderTests.cc b/src/plugins/streamers/maly/unit_tests/dbMALYReaderTests.cc index 438613561..95a6ff447 100644 --- a/src/plugins/streamers/maly/unit_tests/dbMALYReaderTests.cc +++ b/src/plugins/streamers/maly/unit_tests/dbMALYReaderTests.cc @@ -134,6 +134,7 @@ TEST(2_Errors) TEST(10_BasicLayout) { run_test (_this, tl::testdata (), "MALY_test10.maly", "maly_test10_au.oas"); + run_test (_this, tl::testdata (), "MALY_test10.maly", "maly_test10_lm_au.oas", "A: 10, B: 11, C: 12, D: 13"); } TEST(11_Titles) diff --git a/testdata/maly/maly_test10_lm_au.oas b/testdata/maly/maly_test10_lm_au.oas new file mode 100644 index 0000000000000000000000000000000000000000..5d495f5b1ab34757a7892a6949e138bc9fae5b11 GIT binary patch literal 1705 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKC?n3q!6L)YEF;ds&!EJR>XUoMnybM;fb~F; z;|1o9>4KX(8~>b$4qRRSKbqrK6n{_8gJqftG@5`%@xvym(W8jq$Rpw=2WI8a52Z(s3cqMp6MU{CFBEr0aynLd{ z+z1gKUM^mCQDrWK2rDl$ue9I~nS--mBTkX~ybKF^*%ls>10rsQ4Kv&% zcqIjYND)>hYQf0y;CJzYHU5oTB^G`+1L|LJNDjmXGJ4s72Jnh2F?hKM|4}R~5aSmx zG}dm|{=g%%W6aM(<^JjA-Oyr8(XmirPtmaf5kK4--a zRIw=sh;%UUiU|G?#c&c2hRcNne+Uy+Muf`+pf0aKcX>OhF6R~e!H3}_ZVZ=mD>1k` z3I91*Tp-4Q2&pG_=7*c&wzalDY3P`pc$mkWGmzV@k9~i)_?nOTceFNs*ew~5bWqV! zK>EasROVM~47{8WhaW6Oclc~l9nL2BgB`=+To?{#5&XeQSQ!yP&IEON4Z6#_Np-oH z5`(K1FxgoaD*iwAEmNn5=L~F zoL=RJhdj%gpNBH=@&ol-3jb0&bl}K223GdvxhYl*N1E(g#OBO9xZ}YD8D-|r&B+&e z=Y~4nXStDnmZfp}w}P*|<@v^DIa3)JcsYc=^D;0oY+-De{f?<&(icX-zub+TRSX;q z%q?$ra5qg@$S?GqlYQ1q5O`@1QV3MU%c#U)Zy@~Z*fFrJy_@eFn)>`Yr17J9>B7xj zjT0Mx9^9Cr;Qc~U80z4K5-S84co_r_hzTCx7d*frcmQa^AEt|pt`m0iF$Rjb#vV6S zsp<{Vz1LqPCzWg@#HD4glGW*=Z|C6Rt++^#v$I2EiqgLWciXKmueE)BCzNNY&1PGP zZ8fJeZ{?}Udge?L`F>`dwaLa~o|DqnJuk12Q2EucU7>k@8uyIb7J>iU*B=luOwW;c z|LFeK4d*x~O?x*_Wu4c7*;V