Changeset 2306

Timestamp:

03/09/10 13:44:09 (5 months ago)

Author:

JO94

Message:

added dumping to debug KML file when network links loaded

Location:

FalconView/trunk/public/fvw_core/GeodataDataSources

Files:

• KMLNetworkLinkResource.cpp (modified) (1 diff)
• LibkmlDataSource.cpp (modified) (1 diff)
• LibkmlDataSource.h (modified) (2 diffs)

FalconView/trunk/public/fvw_core/GeodataDataSources/KMLNetworkLinkResource.cpp

@@ -21 +21 @@
       WriteToLogFile(_bstr_t(msg.c_str()));
    }
+
+   CLibkmlDataSource::MaybeDumpKML(kml_data);
 
    std::string errors;

FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.cpp

@@ -591 +591 @@
       if (s_dumpFile.length() > 0)
       {
-         // dump kml to a file
-         std::ofstream f(s_dumpFile.c_str(), std::ios::app);
-         f << kml << "\n\n********\n\n";
-         f.close();
+         std::string todump = kml;
+
+         // if this is KMZ, unpack it
+         if (kmlengine::KmzFile::IsKmz(kml))
+         {
+            kmlengine::KmzFilePtr kmz_file = kmlengine::KmzFile::OpenFromString(kml);
+            ASSERT(kmz_file);
+            bool b = kmz_file->ReadKml(&todump);
+            ASSERT(b);
+         }
+
+           // make sure only one person writing to the file at a time
+           HANDLE h = ::CreateMutexW(NULL, false, L"MaybeDumpKMLSem");
+         if (h == NULL)
+         {
+            //DWORD rc = GetLastError();
+            ASSERT(0);
+         }
+           DWORD d = ::WaitForSingleObject(h, INFINITE);
+           _ASSERT(d == WAIT_OBJECT_0);
+
+         try
+         {
+            // dump kml to a file
+            std::ofstream f(s_dumpFile.c_str(), std::ios::app);
+            f << todump << "\n\n********\n\n";
+            f.close();
+         }
+         catch (...) { } // rare exception to rule about ignoring exceptions
+
+         // release mutex
+         ::ReleaseMutex(h);
+           ::CloseHandle(h);
       }
    }

FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.h

@@ -130 +130 @@
    static kmldom::GeometryPtr WrapGeometryInGeometry(IGeometry* geometry, kmldom::KmlFactory* factory);
    static kmldom::PlacemarkPtr WrapFeatureInPlacemark(IFeature* feature, kmldom::KmlFactory* factory);
+   static void MaybeDumpKML(std::string& kml);
 
    static void FireDataSourceChanged(LONG sourceHandle);
@@ -219 +220 @@
    static BOOL s_bEnvironmentTested;
    static std::string s_dumpFile;
-   static void MaybeDumpKML(std::string& kml);
 };