Changeset 359 for tools/dbc_export/DBCExport.pas

Timestamp:

Mar 5, 2010, 8:46:18 AM (15 years ago)

Author:

george

Message:

• Upraveno: V třída TSqlDatabase doplněn výběr kódování spojení, přidáno generování vyjímky při chybném dotazu.
• Opraveno: Objekty vracející metodou Query je nutno uvolňovat.

File:

• tools/dbc_export/DBCExport.pas (modified) (9 diffs)

tools/dbc_export/DBCExport.pas

@@ -7 +7 @@
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, CustApp
-  { you can add units after this },
+  Classes, SysUtils, CustApp,
   USqlDatabase, UDBC, Variants;
 
@@ -27 +26 @@
     IndexTable: array of integer;
     SQLquery: string;
-    CharSet: string;
     DisplayData: Boolean;
     constructor Create(TheOwner: TComponent); override;
@@ -37 +35 @@
     procedure ReplaceText;
     procedure CreateIndexTable(var DbRows: TDbRows);
-    function GetIDbyEntry(entry: integer; var DBRows: TDBRows): integer;
+    function GetIDbyEntry(Entry: Integer; var DBRows: TDBRows): Integer;
   end;
 
@@ -79 +77 @@
   end else Database.Hostname := 'localhost';
   if HasOption('a', 'Charset') then begin
-    Charset := GetOptionValue('a', 'Charset');
-  end else Charset := 'utf8';
+    Database.Encoding := GetOptionValue('a', 'Charset');
+  end else Database.Encoding := 'utf8';
   if HasOption('q', 'sql_query') then begin
     SQLquery := GetOptionValue('q', 'sql_query');
@@ -89 +87 @@
 begin
   ParseParameters;
-
   LoadDBC;
-
   ShowDBC;
-
   ReplaceText;
-
   SaveDBC;
-
-  // Stop program loop
-  Terminate;
+  Terminate;   // Stop program loop
 end;
 
@@ -128 +120 @@
   WriteLn('  -c --coltypedef  DBC column type definition string (u - uint32, s - string)');
   WriteLn('  -d --display     Display DBC data');
-  WriteLn('  -q --sql_query  SQL select when entry is ID first column in dbc file and text1,text2... is texts columns');
+  WriteLn('  -q --sql_query   SQL select when entry is ID first column in dbc file and text1,text2... is texts columns');
   // SELECT T.entry as entry,T.Text as text1 FROM (SELECT * FROM gametips WHERE (Complete = 1) AND ((Language = 1)) AND (User IN (459,670,602,462,1,400,638,592,624,610,769,331,131,704,2,499,641,660,578,337,304,277,208,613,768,754,590,606,26,618,739,503,601,607,585,596,765,320,547,687)) AND VersionStart <= 9947 AND VersionEnd >= 9947) AS T GROUP BY T.entry
 end;
@@ -165 +157 @@
           LastIndexStringColumns:=I;
         end;
-
-
     end else WriteLn('File ' + DBCFileName + ' not exists.');
   end;
@@ -180 +170 @@
 end;
 
-
-//function get data from database and replace text in dbc
+// Function get data from database and replace text in DBC
 procedure TDBCExport.ReplaceText;
 var
   DBRows : TDbRows;
-  Text: String;
-  X, Y, I,entry: Integer;
+  Text: string;
+  X, Y, I, Entry: Integer;
   IndexRowData: Integer;
 begin
   with DBC do begin
-    if (SQLquery <> '') then begin;
-
+    if (SQLquery <> '') then begin
       Database.Connect;
-//      Database.Query('CHARACTER SET '+CharSet);
-      Database.Query('SET NAMES '+CharSet);
       DBRows := Database.Query(SQLquery);
-      CharSet:=Database.Charset;
 
       CreateIndexTable(DBRows);
 
-
       for Y := 0 to Length(DBC.Cells) - 1 do begin
-        entry :=Cells[Y,0];
-        if (Length(IndexTable) > entry) then
-           IndexRowData:= IndexTable[entry]
-        else IndexRowData:= 0;
-
-         I := 1;
-
+        Entry := Cells[Y, 0];
+        if (Length(IndexTable) > Entry) then
+          IndexRowData := IndexTable[entry]
+        else IndexRowData := 0;
+
+        I := 1;
         if (IndexRowData <> 0) then begin
           for X := 1 to Length(ColumnTypeDefinition) do begin
             if ColumnTypeDefinition[X] = 's' then begin
-              Text:=DBRows.Data[IndexRowData-1].Values['text'+IntToStr(I)];
-              SetString(Y,X-1,Text);
-              I:=I+1;
-              if (LastIndexStringColumns = X) then
-                Break;
+              Text := DBRows.Data[IndexRowData - 1].Values['text' + IntToStr(I)];
+              SetString(Y, X - 1, Text);
+              I := I + 1;
+              if (LastIndexStringColumns = X) then Break;
             end;
           end;
         end;
-
       end;
-
-
-
+      DBRows.Destroy;
     end;
   end;
 end;
 
-//create table index = entry, value = Index-1 DBRows, notfound = 0
+// Create table index = entry, value = Index-1 DBRows, notfound = 0
 procedure TDBCExport.CreateIndexTable(var DbRows: TDbRows);
 var
- i: integer;
- Count,entry: integer;
+  I: Integer;
+  Count, Entry: Integer;
 begin
   try
-     Count:=DBRows.Count;
-     for i:=1 to Count do begin
-       entry:=StrToInt(DBRows.Data[i-1].Values['entry']);
-
-       if (i =127) then
-         SetLength(IndexTable,entry+1);
-
-       if (Length(IndexTable)-1 < entry) then
-         SetLength(IndexTable,entry+1);
-
-
-       IndexTable[entry]:=i;
-
+    Count := DBRows.Count;
+    for I := 1 to Count do begin
+      Entry := StrToInt(DBRows.Data[i - 1].Values['entry']);
+
+      if (I = 127) then SetLength(IndexTable, Entry + 1);
+
+      if (Length(IndexTable) - 1 < Entry) then
+         SetLength(IndexTable, Entry + 1);
+
+       IndexTable[Entry] := I;
     end;
   except
@@ -254 +230 @@
 end;
 
-function TDBCExport.GetIDbyEntry(entry: integer; var DBRows: TDBRows): integer;
-var
- i: integer;
- Count: integer;
+function TDBCExport.GetIDbyEntry(Entry: Integer; var DBRows: TDBRows): Integer;
+var
+  I: Integer;
 begin
   try
-     Count:=DBRows.Count;
-     for i:=0 to DBRows.Count - 1 do begin
-      if (StrToInt(DBRows.Data[i].Values['entry']) = entry) then begin
-        Result := i;
-        exit;
+    for I := 0 to DBRows.Count - 1 do begin
+      if (StrToInt(DBRows.Data[i].Values['entry']) = Entry) then begin
+        Result := I;
+        Exit;
       end;
     end;