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

Timestamp:

02/22/13 13:30:00 (11 years ago)

Author:

lucsch

Message:

• Preliminary code for processing user_content.txt. Processing thematic_layers is now working
• Corrected base_structure and user_structure.sql

File:

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

trunk/tmdmcreator/src/tmdmcreator.cpp

@@ -94 +94 @@
     errorsmsg.Clear();
     // Copy structure
-    TmDmCopier myCopier(m_FileNameOutSQL);
-    if (myCopier.CopyFrom(m_FileNameBaseSQL) == false) {
-        errorsmsg.Add(wxString::Format(_("Copying: %s failed!"), m_FileNameBaseSQL.GetFullPath()));
-        return false;
+    { // needed to destroy the copier before processing layers
+        TmDmCopier myCopier(m_FileNameOutSQL);
+        if (myCopier.CopyFrom(m_FileNameBaseSQL) == false) {
+            errorsmsg.Add(wxString::Format(_("Copying: %s failed!"), m_FileNameBaseSQL.GetFullPath()));
+            return false;
+        }
+        
+        if (myCopier.CopyFrom(m_FileNameUserSQL) == false) {
+            errorsmsg.Add(wxString::Format(_("Copying: %s failed!"), m_FileNameUserSQL.GetFullPath()));
+            return false;
+        }
     }
-    
-    if (myCopier.CopyFrom(m_FileNameUserSQL) == false) {
-        errorsmsg.Add(wxString::Format(_("Copying: %s failed!"), m_FileNameUserSQL.GetFullPath()));
-        return false;
-    }
-    
+
     // Process layers
     TmDmProcessorSimple myLayerProc(m_FileNameUserContent, m_FileNameOutSQL);
@@ -112 +114 @@
         return false;
     }
-    if (myLayerProc.ProcessBlock(myThematicLayersStart)==false) {
+    if (myLayerProc.ProcessBlock(myThematicLayersStart, _T("thematic_layers"))==false) {
         errorsmsg.Add(wxString::Format(_("Processing 'thematic_layers' failed in %s"), m_FileNameUserContent.GetFullPath()));
         return false;