Changeset 18 for trunk/tmdmcreator

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

Location:

trunk/tmdmcreator/src

Files:

• main.cpp (modified) (1 diff)
• tmdmcopier.cpp (modified) (2 diffs)
• tmdmcreator.cpp (modified) (2 diffs)
• tmdmprocessor.cpp (modified) (4 diffs)
• tmdmprocessor.h (modified) (4 diffs)

trunk/tmdmcreator/src/main.cpp

@@ -83 +83 @@
     bool bVerbose = parser.Found("verbose");
     bool bToolMap = parser.Found("toolmap");
-    if (parser.Found("overwrite")) {
+    if (parser.Found("overwrite") && wxFileExists(parser.GetParam(3))) {
         wxRemoveFile(parser.GetParam(3));
     }

trunk/tmdmcreator/src/tmdmcopier.cpp

@@ -26 +26 @@
 
 TmDmCopier::~TmDmCopier() {
+    m_File->Flush();
     wxDELETE(m_File);
 }
@@ -49 +50 @@
 
 bool TmDmCopier::CopyFrom(const wxString & text) {
+    m_File->SeekEnd();
     if (m_File->Write(text) == false) {
         m_Errors.Add(wxString::Format(_("Writing to: %s failed!"), m_File->GetName()));

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;

trunk/tmdmcreator/src/tmdmprocessor.cpp

@@ -61 +61 @@
 
 
-bool TmDmProcessorSimple::ProcessBlock(int blockstart) {
-    wxString mySQLCols = wxEmptyString;
-    wxString mySQLTxt = wxEmptyString;
+bool TmDmProcessorSimple::ProcessBlock(int blockstart, const wxString & tablename) {
+    wxArrayString mySQLCols;
+    TmDmCopier myCopier(m_FileDst);
     
     wxFileInputStream input(m_FileSrc.GetFullPath());
@@ -69 +69 @@
     long myLineIndex = 0;
     while(input.IsOk() && !input.Eof() ){
+        wxString myRow = text.ReadLine();
         if (myLineIndex <= blockstart) {
             myLineIndex++;
@@ -74 +75 @@
         }
         
-        wxString myRow = text.ReadLine();
+        if (myLineIndex == blockstart+1) {
+            mySQLCols = wxStringTokenize(myRow, _T("\t"), wxTOKEN_RET_EMPTY);
+            myLineIndex++;
+            continue;
+        }
         
-        // HERE !!! 
+        wxArrayString myValues = wxStringTokenize(myRow, _T("\t"), wxTOKEN_RET_EMPTY_ALL);
+        bool bEmpty = true;
+        for (unsigned int i = 0; i< myValues.GetCount(); i++) {
+            if (myValues[i] != wxEmptyString) {
+                bEmpty = false;
+                break;
+            }
+        }
+        if (bEmpty == true) {
+            // ok empty line found
+            return true;
+        }
         
-        
-        
+        // write insert sentence
+        wxString myInsert = wxString::Format(_T("INSERT INTO `%s` ("), tablename);
+        for (unsigned int i = 0; i< mySQLCols.GetCount(); i++) {
+            myInsert.Append(wxString::Format(_T("%s,"), mySQLCols.Item(i)));
+        }
+        myInsert.RemoveLast();
+        myInsert.Append(_T(") VALUES ("));
+        for (unsigned int i = 0; i< mySQLCols.GetCount(); i++) {
+            myInsert.Append(wxString::Format(_T("\"%s\","), myValues.Item(i)));
+        }
+        myInsert.RemoveLast();
+        myInsert.Append(_T(");\n"));
+        myCopier.CopyFrom(myInsert);
         myLineIndex++;
     }
-    return wxNOT_FOUND;
-
-    
-    
-    
     return false;
 }
@@ -104 +126 @@
 }
 
-bool TmDmProcessorAttributs::ProcessBlock(int blockstart) {
+bool TmDmProcessorAttributs::ProcessBlock(int blockstart, const wxString & tablename) {
     return false;
 }

trunk/tmdmcreator/src/tmdmprocessor.h

@@ -24 +24 @@
 #include <wx/wfstream.h>
 #include <wx/txtstrm.h>
+#include <wx/tokenzr.h>
 
 
@@ -37 +38 @@
     
     int FindBlock(const wxString & blockname);
-    virtual bool ProcessBlock(int blockstart) = 0;
+    virtual bool ProcessBlock(int blockstart, const wxString & tablename) = 0;
 };
 
@@ -51 +52 @@
     virtual ~TmDmProcessorSimple();
     
-    virtual bool ProcessBlock(int blockstart);
+    virtual bool ProcessBlock(int blockstart, const wxString & tablename);
 };
 
@@ -65 +66 @@
     virtual ~TmDmProcessorAttributs();
     
-    virtual bool ProcessBlock(int blockstart);
+    virtual bool ProcessBlock(int blockstart, const wxString & tablename);
 };
 #endif