[mapguide-commits] r9387 - branches/3.1/MgDev/Web/src/WebSupport

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-05-07 07:51:36 -0700 (Mon, 07 May 2018)
New Revision: 9387

Modified:
   branches/3.1/MgDev/Web/src/WebSupport/InitializeWebTier.cpp
Log:
#2780: Support MentorUserDictionaryPath in webconfig.ini as well. This is needed for the web tier to pick up any user dictionaries that the server tier only currently is aware of, as it supports this property in serverconfig.ini

Modified: branches/3.1/MgDev/Web/src/WebSupport/InitializeWebTier.cpp
===================================================================
--- branches/3.1/MgDev/Web/src/WebSupport/InitializeWebTier.cpp	2018-05-03 14:13:19 UTC (rev 9386)
+++ branches/3.1/MgDev/Web/src/WebSupport/InitializeWebTier.cpp	2018-05-07 14:51:36 UTC (rev 9387)
@@ -76,6 +76,9 @@
     STRING mentorDictPath;
     config->GetStringValue(MgConfigProperties::GeneralPropertiesSection, MgConfigProperties::GeneralPropertyMentorDictionaryPath, mentorDictPath, MgConfigProperties::DefaultGeneralPropertyMentorDictionaryPath);
 
+    STRING mentorUserDictPath;
+    config->GetStringValue(MgConfigProperties::GeneralPropertiesSection, MgConfigProperties::GeneralPropertyMentorUserDictionaryPath, mentorUserDictPath, MgConfigProperties::DefaultGeneralPropertyMentorUserDictionaryPath);
+
     //Check catalog
     if (NULL == csCatalog.p)
     {
@@ -88,6 +91,12 @@
         MgFileUtil::AppendSlashToEndOfPath(mentorDictPath);
         csCatalog->SetDictionaryDir(mentorDictPath);
     }
+
+    if (!mentorUserDictPath.empty())
+    {
+        MgFileUtil::AppendSlashToEndOfPath(mentorUserDictPath);
+        csCatalog->SetUserDictionaryDir(mentorUserDictPath);
+    }
     
     //Check lib status
     LibraryStatus status = csCatalog->GetLibraryStatus();