[mapguide-commits] r7236 - in sandbox/adsk/2.5k: . Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: baertelchen
Date: 2012-11-27 07:29:57 -0800 (Tue, 27 Nov 2012)
New Revision: 7236

Modified:
   sandbox/adsk/2.5k/
   sandbox/adsk/2.5k/Common/CoordinateSystem/
   sandbox/adsk/2.5k/Common/CoordinateSystem/CoordSysCatalog.cpp
Log:
Merging /trunk/MgDev/Common/CoordinateSystem

Merging in revision 7235 from trunk. See original message below:

-------------------------------
+++ Revision: 7235 (/trunk/MgDev/Common/CoordinateSystem only)
-------------------------------
Author: baertelchen
Date: Dienstag, 27. November 2012 16:19:25
Message:
Fix MENTOR_USER_DICTIONARY_PATH env variable not honored in Windows (as part of RFC127)

This submission fixes a problem with the MENTOR_USER_DICTIONARY_PATH env variable not being honored under Windows.
The location for user coordinate system definitions defaults to [%APPLOCALDATA%\Autodesk\User Geospatial Coordinate Systems].

This can be overridden by the MENTOR_USER_DICTIONARY_PATH variable. For the #ifdef _WIN32 part of the CCoordinateSystemCatalog::GetDefaultUserDictionaryDir()
method, the string value read from the env variable never got applied, however. The method always returned an empty string in that case.

Note, that this basically had no affect for the server because there the user dictionary path got/can be initialized from the serverconfig.ini file.

Reviewed by Hugues.

----
Modified : /trunk/MgDev/Common/CoordinateSystem/CoordSysCatalog.cpp




Property changes on: sandbox/adsk/2.5k
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/rfc94:5099-5163
/trunk/MgDev:7190-7200,7207
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/rfc94:5099-5163
/trunk/MgDev:7190-7200,7207,7235


Property changes on: sandbox/adsk/2.5k/Common/CoordinateSystem
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/2.4/MgDev/Common/CoordinateSystem:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/rfc94/Common/CoordinateSystem:5099-5163
/trunk/MgDev/Common/CoordinateSystem:7190-7200,7207,7235

Modified: sandbox/adsk/2.5k/Common/CoordinateSystem/CoordSysCatalog.cpp
===================================================================
--- sandbox/adsk/2.5k/Common/CoordinateSystem/CoordSysCatalog.cpp	2012-11-27 15:19:25 UTC (rev 7235)
+++ sandbox/adsk/2.5k/Common/CoordinateSystem/CoordSysCatalog.cpp	2012-11-27 15:29:57 UTC (rev 7236)
@@ -414,6 +414,8 @@
             defaultUserDir += _T("\\Autodesk\\User Geospatial Coordinate Systems"); //NOXLATE
         }
     }
+    else
+        defaultUserDir = szPathVar;
 
     if (!defaultUserDir.empty() && L'\\' != defaultUserDir[defaultUserDir.length() - 1])
         defaultUserDir.append(L"\\");
@@ -436,7 +438,7 @@
         return L"";
 
 
-    return defaultUserDir.c_str();
+    return defaultUserDir;
 }
 
 void CCoordinateSystemCatalog::SetUserDictionaryDir(CREFSTRING sDirPath)