Changeset 112 for trunk/src/game/PlayerDump.cpp

Timestamp:

11/19/08 13:37:14 (17 years ago)

Author:

yumileroy

Message:

[svn] * Merge CLI Commands with regular commands and give them level4 access. sec_console. Source mangos - thanks to ogeraisi for the amalgamated patch.
* Redid/Fixed/Added some lang strings.
* As usual remember this is a trunk rev so stability only guaranteed on northern countries of Mars and western parts of Pluto. No warranties outside the solar system, sorry :( . Check with your local government or dictator on regulations regarding export.

Original author: KingPin?
Date: 2008-10-26 13:32:42-05:00

Files:

• trunk/src/game/PlayerDump.cpp (modified) (23 diffs)

trunk/src/game/PlayerDump.cpp

@@ -27 +27 @@
 
 // Character Dump tables
-#define DUMP_TABLE_COUNT 20
+#define DUMP_TABLE_COUNT 19
 
 struct DumpTable
@@ -259 +259 @@
 
 // Writing - High-level functions
-bool PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tableFrom, char const*tableTo, DumpTableType type)
-{
-    if (!tableFrom || !tableTo)
-        return false;
-
+void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tableFrom, char const*tableTo, DumpTableType type)
+{
     GUIDs const* guids = NULL;
     char const* fieldname = NULL;
@@ -281 +278 @@
     // for guid set stop if set is empty
     if(guids && guids->empty())
-        return true;                                        // nothing to do
+        return;                                        // nothing to do
 
     // setup for guids case start position
@@ -299 +296 @@
         QueryResult *result = CharacterDatabase.PQuery("SELECT * FROM %s WHERE %s", tableFrom, wherestr.c_str());
         if(!result)
-            return false;
+            return;
 
         do
@@ -329 +326 @@
     }
     while(guids && guids_itr != guids->end());              // not set case iterate single time, set case iterate for all guids
-
-    return true;
 }
 
@@ -339 +334 @@
         DumpTable(dump, guid, dumpTables[i].name, dumpTables[i].name, dumpTables[i].type);
 
-    // TODO: Add instance/group/gifts..
+    // TODO: Add instance/group..
     // TODO: Add a dump level option to skip some non-important tables
 
@@ -345 +340 @@
 }
 
-bool PlayerDumpWriter::WriteDump(std::string file, uint32 guid)
+DumpReturn PlayerDumpWriter::WriteDump(std::string file, uint32 guid)
 {
     FILE *fout = fopen(file.c_str(), "w");
-    if (!fout) { sLog.outError("Failed to open file!\r\n"); return false; }
+    if (!fout)
+                return DUMP_FILE_OPEN_ERROR;
 
     std::string dump = GetDump(guid);
@@ -354 +350 @@
     fprintf(fout,"%s\n",dump.c_str());
     fclose(fout);
-    return true;
+    return DUMP_SUCCESS;
 }
 
 // Reading - High-level functions
-#define ROLLBACK {CharacterDatabase.RollbackTransaction(); fclose(fin); return false;}
-
-bool PlayerDumpReader::LoadDump(std::string file, uint32 account, std::string name, uint32 guid)
+#define ROLLBACK(DR) {CharacterDatabase.RollbackTransaction(); fclose(fin); return (DR);}
+
+DumpReturn PlayerDumpReader::LoadDump(std::string file, uint32 account, std::string name, uint32 guid)
 {
     // check character count
@@ -373 +369 @@
 
             if (charcount >= 10)
-            {
-                return false;
-            }
+                return DUMP_TOO_MANY_CHARS;
         }
     }
     FILE *fin = fopen(file.c_str(), "r");
-    if(!fin) return false;
+    if(!fin)
+                return DUMP_FILE_OPEN_ERROR;
 
     QueryResult * result = NULL;
@@ -435 +430 @@
         {
             if(feof(fin)) break;
-            sLog.outError("LoadPlayerDump: File read error!");
-            ROLLBACK;
+            ROLLBACK(DUMP_FILE_BROKEN);
         }
 
@@ -450 +444 @@
         {
             sLog.outError("LoadPlayerDump: Can't extract table name from line: '%s'!", line.c_str());
-            ROLLBACK;
+            ROLLBACK(DUMP_FILE_BROKEN);
         }
 
@@ -467 +461 @@
         {
             sLog.outError("LoadPlayerDump: Unknown table: '%s'!", tn.c_str());
-            ROLLBACK;
+            ROLLBACK(DUMP_FILE_BROKEN);
         }
 
@@ -474 +468 @@
         {
             case DTT_CHAR_TABLE:
-                if(!changenth(line, 1, newguid)) ROLLBACK;
+                if(!changenth(line, 1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
 
             case DTT_CHARACTER:                             // character t.
             {
-                if(!changenth(line, 1, newguid)) ROLLBACK;
+                if(!changenth(line, 1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 // guid, data field:guid, items
-                if(!changenth(line, 2, chraccount)) ROLLBACK;
+                if(!changenth(line, 2, chraccount))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 std::string vals = getnth(line, 3);
-                if(!changetoknth(vals, OBJECT_FIELD_GUID+1, newguid)) ROLLBACK;
+                if(!changetoknth(vals, OBJECT_FIELD_GUID+1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 for(uint16 field = PLAYER_FIELD_INV_SLOT_HEAD; field < PLAYER_FARSIGHT; field++)
-                    if(!changetokGuid(vals, field+1, items, objmgr.m_hiItemGuid, true)) ROLLBACK;
-                if(!changenth(line, 3, vals.c_str())) ROLLBACK;
+                    if(!changetokGuid(vals, field+1, items, objmgr.m_hiItemGuid, true))
+                                                ROLLBACK(DUMP_FILE_BROKEN);
+
+                if(!changenth(line, 3, vals.c_str()))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 if (name == "")
                 {
@@ -499 +503 @@
                         delete result;
                                                             // rename on login: `at_login` field 30 in raw field list
-                        if(!changenth(line, 30, "1")) ROLLBACK;
+                        if(!changenth(line, 30, "1"))
+                                                        ROLLBACK(DUMP_FILE_BROKEN);
                     }
                 }
-                else if(!changenth(line, 4, name.c_str())) ROLLBACK;
+                else if(!changenth(line, 4, name.c_str()))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 break;
@@ -508 +514 @@
             case DTT_INVENTORY:                             // character_inventory t.
             {
-                if(!changenth(line, 1, newguid)) ROLLBACK;
+                if(!changenth(line, 1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 // bag, item
-                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid, true)) ROLLBACK;
-                if(!changeGuid(line, 4, items, objmgr.m_hiItemGuid)) ROLLBACK;
+                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid, true))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changeGuid(line, 4, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -518 +527 @@
             {
                 // item, owner, data field:item, owner guid
-                if(!changeGuid(line, 1, items, objmgr.m_hiItemGuid)) ROLLBACK;
-                if(!changenth(line, 2, newguid)) ROLLBACK;
+                if(!changeGuid(line, 1, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 2, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 std::string vals = getnth(line,3);
-                if(!changetokGuid(vals, OBJECT_FIELD_GUID+1, items, objmgr.m_hiItemGuid)) ROLLBACK;
-                if(!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid)) ROLLBACK;
-                if(!changenth(line, 3, vals.c_str())) ROLLBACK;
+                if(!changetokGuid(vals, OBJECT_FIELD_GUID+1, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 3, vals.c_str()))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -529 +544 @@
             {
                 // guid,item_guid,
-                if(!changenth(line, 1, newguid)) ROLLBACK;
-                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid)) ROLLBACK;
+                if(!changenth(line, 1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -552 +569 @@
 
                 // item, entry, owner, ...
-                if(!changenth(line, 1, newpetid)) ROLLBACK;
-                if(!changenth(line, 3, newguid)) ROLLBACK;
+                if(!changenth(line, 1, newpetid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 3, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 break;
@@ -563 +582 @@
                 // lookup currpetid and match to new inserted pet id
                 std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
-                if(petids_iter == petids.end()) ROLLBACK;   // couldn't find new inserted id
+                if(petids_iter == petids.end())             // couldn't find new inserted id
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 snprintf(newpetid, 20, "%d", petids_iter->second);
 
-                if(!changenth(line, 1, newpetid)) ROLLBACK;
+                if(!changenth(line, 1, newpetid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 break;
@@ -574 +595 @@
             {
                 // id,messageType,stationery,sender,receiver
-                if(!changeGuid(line, 1, mails, objmgr.m_mailid)) ROLLBACK;
-                if(!changenth(line, 5, newguid)) ROLLBACK;
+                if(!changeGuid(line, 1, mails, objmgr.m_mailid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 5, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -581 +604 @@
             {
                 // mail_id,item_guid,item_template,receiver
-                if(!changeGuid(line, 1, mails, objmgr.m_mailid)) ROLLBACK;
-                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid)) ROLLBACK;
-                if(!changenth(line, 4, newguid)) ROLLBACK;
+                if(!changeGuid(line, 1, mails, objmgr.m_mailid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 4, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -591 +617 @@
         }
 
-        if(!CharacterDatabase.Execute(line.c_str())) ROLLBACK;
+        if(!CharacterDatabase.Execute(line.c_str()))
+                        ROLLBACK(DUMP_FILE_BROKEN);
     }
 
@@ -604 +631 @@
     fclose(fin);
 
-    return true;
-}
+    return DUMP_SUCCESS;
+}