Changeset 17 for trunk/tmdmcreator/src/tmdmcreator.cpp

Timestamp:

02/21/13 17:14:39 (11 years ago)

Author:

lucsch

Message:

Preliminary code for processing user_content.txt

File:

• trunk/tmdmcreator/src/tmdmcreator.cpp (modified) (3 diffs)

trunk/tmdmcreator/src/tmdmcreator.cpp

@@ -17 +17 @@
 #include "tmdmcreator.h"
 #include "tmdmcopier.h"
+#include "tmdmprocessor.h"
 
 TmDmCreator::TmDmCreator() {
@@ -92 +93 @@
 bool TmDmCreator::ProcessFiles(wxArrayString & errorsmsg) {
     errorsmsg.Clear();
-    // Copy structure to out
+    // Copy structure
     TmDmCopier myCopier(m_FileNameOutSQL);
     if (myCopier.CopyFrom(m_FileNameBaseSQL) == false) {
@@ -104 +105 @@
     }
     
-    
-    
+    // Process layers
+    TmDmProcessorSimple myLayerProc(m_FileNameUserContent, m_FileNameOutSQL);
+    int myThematicLayersStart = myLayerProc.FindBlock(_T("thematic_layers"));
+    if (myThematicLayersStart == wxNOT_FOUND) {
+        errorsmsg.Add(wxString::Format(_("'thematic_layers' field not found in %s"), m_FileNameUserContent.GetFullPath()));
+        return false;
+    }
+    if (myLayerProc.ProcessBlock(myThematicLayersStart)==false) {
+        errorsmsg.Add(wxString::Format(_("Processing 'thematic_layers' failed in %s"), m_FileNameUserContent.GetFullPath()));
+        return false;
+    }
     return true;
 }