Revised debugging in JSONToSimpl classes; added new JsonToSimplPortalFileMaster to read portal system/template files and merge; copied merge code in from Essentials and reworked (note that Essentials does not yet use this merge code); added 'global' object to the top-level objects that are merged

This commit is contained in:
Heath Volmer
2018-05-23 12:11:20 -06:00
parent 494b8b09e1
commit 14c4a9dd6b
9 changed files with 414 additions and 19 deletions

View File

@@ -39,7 +39,7 @@ namespace PepperDash.Core
/// </summary>
static bool ExcludeAllMode;
static bool ExcludeNoKeyMessages;
//static bool ExcludeNoKeyMessages;
static Dictionary<string, object> IncludedExcludedKeys;
@@ -141,14 +141,14 @@ namespace PepperDash.Core
IncludedExcludedKeys.Clear();
ExcludeAllMode = true;
}
else if (lkey == "+nokey")
{
ExcludeNoKeyMessages = false;
}
else if (lkey == "-nokey")
{
ExcludeNoKeyMessages = true;
}
//else if (lkey == "+nokey")
//{
// ExcludeNoKeyMessages = false;
//}
//else if (lkey == "-nokey")
//{
// ExcludeNoKeyMessages = true;
//}
else
{
string key = null; ;