Commit 8286b680 authored by Olivier Bertrand's avatar Olivier Bertrand

- Copy error message from G to g when using temporary storage for parsing.

  modified:   storage/connect/tabjson.cpp
parent 541d36f7
...@@ -688,8 +688,13 @@ int TDBJSN::ReadDB(PGLOBAL g) ...@@ -688,8 +688,13 @@ int TDBJSN::ReadDB(PGLOBAL g)
Fpos++; Fpos++;
M = 1; M = 1;
rc = RC_OK; rc = RC_OK;
} else if (Pretty != 1 || strcmp(To_Line, "]")) {
#if USE_G
strcpy(g->Message, G->Message);
#endif
rc = RC_FX;
} else } else
rc = (Pretty == 1 && !strcmp(To_Line, "]")) ? RC_EF : RC_FX; rc = RC_EF;
} // endif ReadDB } // endif ReadDB
...@@ -793,6 +798,9 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp) ...@@ -793,6 +798,9 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
int rc = TDBDOS::WriteDB(g); int rc = TDBDOS::WriteDB(g);
#if USE_G #if USE_G
if (rc == RC_FX)
strcpy(g->Message, G->Message);
PlugSubSet(G, G->Sarea, G->Sarea_Size); PlugSubSet(G, G->Sarea, G->Sarea_Size);
#endif #endif
Row->Clear(); Row->Clear();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment