[mapguide-commits] r9388 - in trunk/MgDev: . Web/src/WebSupport

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-05-07 07:56:10 -0700 (Mon, 07 May 2018)
New Revision: 9388

Modified:
   trunk/MgDev/
   trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp
Log:
Merged revision(s) 9387 from branches/3.1/MgDev:
#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
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2018-05-07 14:51:36 UTC (rev 9387)
+++ trunk/MgDev	2018-05-07 14:56:10 UTC (rev 9388)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
 /branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
 /branches/3.0/MgDev:8658,8705,8710
-/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329,9377-9378,9382
+/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329,9377-9378,9382,9387
 /sandbox/VC140:8684-8759
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
Modified: trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp
===================================================================
--- trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp	2018-05-07 14:51:36 UTC (rev 9387)
+++ trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp	2018-05-07 14:56:10 UTC (rev 9388)
@@ -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();