Win32: implement further UTF8 support

[xestiacalendar/.git] / source / libraries / CalendarDataStorage / CalendarDataStorage.cpp

diff --git a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
index 63c8a3e..5b24853 100644 (file)
--- a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
+++ b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
@@ -558,7 +558,7 @@ CDSCalendarResult CalendarDataStorage::AddCalendar(int accountID, string calenda
        
        resultCode = sqlite3_step(findHandle);
        
-       if (resultCode != SQLITE_DONE){
+       if (resultCode != SQLITE_ROW){
                return CDSCALENDAR_NOACCOUNT;
        }       
        
@@ -586,7 +586,8 @@ CDSCalendarResult CalendarDataStorage::AddCalendar(int accountID, string calenda
                return CDSCALENDAR_FAILED;
        }
        
-       resultCode = sqlite3_bind_text(statementHandle, 4, ((string)calendarColour).c_str(), -1, SQLITE_STATIC);
+       string calendarColourString = (string)calendarColour;
+       resultCode = sqlite3_bind_text(statementHandle, 4, calendarColourString.c_str(), -1, SQLITE_STATIC);
 
        if (resultCode != 0){
                return CDSCALENDAR_FAILED;
@@ -858,7 +859,8 @@ CDSCalendarResult CalendarDataStorage::UpdateCalendar(int calendarID, string cal
                return CDSCALENDAR_FAILED;
        }
 
-       resultCode = sqlite3_bind_text(statementHandle, 2, string(calendarColour).c_str(), -1, SQLITE_STATIC);
+       string calendarColourString = calendarColour;
+       resultCode = sqlite3_bind_text(statementHandle, 2, calendarColourString.c_str(), -1, SQLITE_STATIC);
        
        if (resultCode != 0){
                return CDSCALENDAR_FAILED;
@@ -984,9 +986,9 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
        
        // Load the event file.
        
-       CalendarEventObject eventData;
+       CalendarEventObject eventData;  
        CalendarObjectLoadResult eventLoadResult = eventData.LoadFile(filename);
-       
+
        // Check the result of the event file load.
        
        switch (eventLoadResult){
@@ -1848,11 +1850,11 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
        std::string sqlParameter = "UPDATE calendarentries SET entryname=(?2), entrydescription=(?3),"
        " entrystartyear=(?4), entrystartmonth=(?5), entrystartday=(?6), entrystarthour=(?7), entrystartminute=(?8), entrystartsecond=(?9),"
        " entryendyear=(?10), entryendmonth=(?11), entryendday=(?12), entryendhour=(?13), entryendminute=(?14), entryendsecond=(?15), "
-       " entrydurationweek=(?16), entrydurationday=(?17), entrydurationhour=(?18), entrydurationminute=(?19), entrydurationsecond=(?20), "
+       " entrydurationweek=(?16), entrydurationday=(?17), entrydurationhour=(?18), entrydurationminute=(?19), entrydurationsecond=(?20) "
        " WHERE id=(?1)";
        
        resultCode = sqlite3_prepare_v2(db, sqlParameter.c_str(), -1, &statementHandle, nullptr);
-
+       
        resultCode = sqlite3_bind_int(statementHandle, 1, eventID);
        
        if (resultCode != 0){
@@ -2621,85 +2623,72 @@ CDSCleanupResult CalendarDataStorage::Clear(){
        resultCode = sqlite3_prepare_v2(db, "DELETE FROM calendarentries", -    1, &statementHandle, nullptr);
        
        if (resultCode != 0){
-               cout << "Fail 1" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_step(statementHandle);
        
        if (resultCode != SQLITE_DONE){
-               cout << "Fail 2" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_prepare_v2(db, "DELETE FROM sqlite_sequence WHERE name='calendarentries';", -1, &statementHandle, nullptr);
        
        if (resultCode != 0){
-               cout << "Fail 3" << endl;
-               cout << sqlite3_errmsg(db) << endl;
                return CDSCLEANUP_FAILED;
        }
 
        resultCode = sqlite3_step(statementHandle);
        
        if (resultCode != SQLITE_DONE){
-               cout << "Fail 4" << endl;
                return CDSCLEANUP_FAILED;
        }
 
        resultCode = sqlite3_prepare_v2(db, "DELETE FROM calendars", -1, &statementHandle, nullptr);
        
        if (resultCode != 0){
-               cout << "Fail 5" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_step(statementHandle);
        
        if (resultCode != SQLITE_DONE){
-               cout << "Fail 6" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_prepare_v2(db, "DELETE FROM sqlite_sequence WHERE name='calendars';", -1, &statementHandle, nullptr);
        
        if (resultCode != 0){
-               cout << "Fail 7" << endl;
                return CDSCLEANUP_FAILED;
        }
 
        resultCode = sqlite3_step(statementHandle);
        
        if (resultCode != SQLITE_DONE){
-               cout << "Fail 8" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_prepare_v2(db, "DELETE FROM accounts", -1, &statementHandle, nullptr);
        
        if (resultCode != 0){
-               cout << "Fail 9" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_step(statementHandle);
        
        if (resultCode != SQLITE_DONE){
-               cout << "Fail 10" << endl;
                return CDSCLEANUP_FAILED;
        }
        
        resultCode = sqlite3_prepare_v2(db, "DELETE FROM sqlite_sequence WHERE name='accounts'", -1, &statementHandle, nullptr);
        
        if (resultCode != 0){
-               cout << "Fail 11" << endl;
                return CDSCLEANUP_FAILED;
        }
 
        resultCode = sqlite3_step(statementHandle);
        
        if (resultCode != SQLITE_DONE){
-               cout << "Fail 12" << endl;
                return CDSCLEANUP_FAILED;
        }