[fdo-commits] r692 - in branches/3.2.x/Utilities/OWS: Inc/OWS Src

[svn_fdo at osgeo.org]

Author: romicadascalescu
Date: 2007-01-30 18:03:01 -0500 (Tue, 30 Jan 2007)
New Revision: 692

Modified:
   branches/3.2.x/Utilities/OWS/Inc/OWS/FdoOwsOgcFilterSerializer.h
   branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcFilterSerializer.cpp
   branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcGeometrySerializer.cpp
Log:
Fixed WMS externalizes invalid SRS (lowercase values)

Modified: branches/3.2.x/Utilities/OWS/Inc/OWS/FdoOwsOgcFilterSerializer.h
===================================================================
--- branches/3.2.x/Utilities/OWS/Inc/OWS/FdoOwsOgcFilterSerializer.h	2007-01-29 23:49:00 UTC (rev 691)
+++ branches/3.2.x/Utilities/OWS/Inc/OWS/FdoOwsOgcFilterSerializer.h	2007-01-30 23:03:01 UTC (rev 692)
@@ -88,7 +88,7 @@
 	FDOOWS_API void SetXmlWriter (FdoXmlWriter* writer) { mWriter = writer; }
 	FDOOWS_API FdoXmlWriter* GetXmlWriter () { return mWriter; }
 	
-	FDOOWS_API void SetSrsName (FdoString* srsName) { mSrsName = srsName; }
+    FDOOWS_API void SetSrsName (FdoString* srsName) { mSrsName = srsName; mSrsName = mSrsName.Upper();}
 	FDOOWS_API FdoString* GetSrsName () { return mSrsName; }
 
 	FDOOWS_API void SetPrefix (FdoString* propPrefix) { mPrefix = propPrefix; }

Modified: branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcFilterSerializer.cpp
===================================================================
--- branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcFilterSerializer.cpp	2007-01-29 23:49:00 UTC (rev 691)
+++ branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcFilterSerializer.cpp	2007-01-30 23:03:01 UTC (rev 692)
@@ -43,7 +43,8 @@
 {
 	FdoPtr<FdoOwsOgcFilterSerializer> serializer = FdoOwsOgcFilterSerializer::Create ();
 	serializer->SetXmlWriter (writer);
-	serializer->SetSrsName (srsName);
+    FdoStringP srsNameTmp = srsName;
+    serializer->SetSrsName (srsNameTmp.Upper());
 	serializer->SetPrefix (prefix);
 
 	serializer->Serialize (filter);

Modified: branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcGeometrySerializer.cpp
===================================================================
--- branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcGeometrySerializer.cpp	2007-01-29 23:49:00 UTC (rev 691)
+++ branches/3.2.x/Utilities/OWS/Src/FdoOwsOgcGeometrySerializer.cpp	2007-01-30 23:03:01 UTC (rev 692)
@@ -144,7 +144,8 @@
 void FdoOwsOgcGeometrySerializer::SerializePolygon(FdoIPolygon* polygon, FdoXmlWriter* writer, FdoString* srsName)
 {
 	writer->WriteStartElement(FdoOwsGlobals::gml_Polygon);
-	writer->WriteAttribute(FdoOwsGlobals::srsName, srsName);
+    FdoStringP srsNameTmp = srsName;
+    writer->WriteAttribute(FdoOwsGlobals::srsName, srsNameTmp.Upper());
 
 	// serialzie the exterior ring
 	FdoPtr<FdoILinearRing> outer = polygon->GetExteriorRing();
@@ -166,7 +167,8 @@
 void FdoOwsOgcGeometrySerializer::SerializeMultiPoint(FdoIMultiPoint* multiPoint, FdoXmlWriter* writer, FdoString* srsName)
 {
 	writer->WriteStartElement(FdoOwsGlobals::gml_MultiPoint);
-	writer->WriteAttribute(FdoOwsGlobals::srsName, srsName);
+    FdoStringP srsNameTmp = srsName;
+	writer->WriteAttribute(FdoOwsGlobals::srsName, srsNameTmp.Upper());
 	
 	writer->WriteStartElement(FdoOwsGlobals::gml_pointMember);
 	FdoInt32 cntPoint = multiPoint->GetCount();