Changeset 414 for tools/dbc_export/UDBC.pas

Timestamp:

Apr 3, 2010, 9:31:48 PM (15 years ago)

Author:

george

Message:

• Opraveno: Ve vytvářeném DBC souboru nebyla vůbec přepočtena nová velikost bloku řetězců.

File:

• tools/dbc_export/UDBC.pas (modified) (2 diffs)

tools/dbc_export/UDBC.pas

@@ -85 +85 @@
 procedure TDBC.SaveToFile(FileName: string);
 var
-  Signature: Cardinal;
-  Row, Col: Integer;
-  Offset: Integer;
+  Row, Col: Cardinal;
+  Offset: Cardinal;
   StringList: array of string;
 begin
@@ -103 +102 @@
     Offset := 1;
     // Write cells
-    for Row := 0 to RecordCount - 1 do
+    for Row := 0 to RecordCount - 1 do begin
       for Col := 0 to FieldCount - 1 do begin
         if VarIsStr(Cells[Row, Col]) then begin
+          //System.Write(IntToStr(Offset) + ': "' + Cells[Row, Col] + '", ');
           WriteDWord(Offset);
           Offset := Offset + Length(Cells[Row, Col]) + 1;
           SetLength(StringList, Length(StringList) + 1);
           StringList[High(StringList)] := Cells[Row, Col];
-        end else WriteDWord(Cells[Row, Col]);
+        end else begin
+          //System.Write(IntToStr(Cells[Row, Col]) + ', ');
+          WriteDWord(Cells[Row, Col]);
+        end;
       end;
+      //WriteLn;
+    end;
 
     // Write strings
+    Offset := 1;
     WriteByte(0);
     for Row := 0 to Length(StringList) - 1 do begin
+      //WriteLn('Id: ' + IntToStr(Row) + ', Offset: ' + IntToStr(Offset) + ', "' + StringList[Row] + '"');
       for Col := 1 to Length(StringList[Row]) do
         WriteByte(Ord(StringList[Row][Col]));
-        WriteByte(0);
+      WriteByte(0);
+      Offset := Offset + Length(StringList[Row]) + 1;
     end;
+
+    // Update string block size
+    StringBlockSize := Offset;
+    Seek(16, soFromBeginning);
+    WriteDWord(StringBlockSize);
   end;
 end;