ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Helper/LevelDB.pas

Comparing oup/current/Helper/LevelDB.pas (file contents):
Revision 133 by alloc, Wed Mar 28 02:23:44 2007 UTC vs.
Revision 136 by alloc, Thu Mar 29 14:20:25 2007 UTC

#	Line 356 | Line 356 | begin
356		rawsum := rawsum + (tempticks2 - tempticks1);
357		end
358		else
359	<	FilesHeader[i].DataAddr := 0;
359	>	FilesHeader[FileID].DataAddr := 0;
360		if Length(fileinfo.Name) > 0 then
361		begin
362	<	FilesHeader[i].NameAddr := Stream_Names.Size;
362	>	FilesHeader[FileID].NameAddr := Stream_Names.Size;
363		temps := fileinfo.Extension + fileinfo.Name + Chr(0);
364		Stream_Names.Write(temps[1], Length(temps));
365		end
366		else
367	<	FilesHeader[i].NameAddr := 0;
368	<	FilesHeader[i].FileSize := fileinfo.Size;
369	<	FilesHeader[i].FileType := fileinfo.FileType;
367	>	FilesHeader[FileID].NameAddr := 0;
368	>	FilesHeader[FileID].FileSize := fileinfo.Size;
369	>	FilesHeader[FileID].FileType := fileinfo.FileType;
370
371		if ((FileID mod 10) = 0) and (FileID >= 100) then
372		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
#	Line 448 | Line 448 | begin
448
449
450		procedure TForm_LevelDB.CreateDatabase(Source, target: String);
451	+	var
452	+	DataBase:  TABSDatabase;
453		{
454		var
455		DataBase:    TABSDatabase;
#	Line 509 | Line 511 | begin
511		absolutebegintime := Time;
512
513		DataBase := TABSDatabase.Create(Self);
514	+	}
515	+	DataBase.MaxConnections := 1;
516	+	DataBase.PageSize := 8112;
517	+	DataBase.PageCountInExtent := 8;
518	+	{
519		DataBase.DatabaseName := 'OLDB';
520		DataBase.DatabaseFileName := target;
521		DataBase.CreateDatabase;
#	Line 522 | Line 529 | begin
529		Query := TABSQuery.Create(Self);
530		Query.DatabaseName := 'OLDB';
531		Query.SQL.Text :=
532	<	'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), value STRING(128) );';
532	>	'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), ' +
533	>	'value STRING(128) );';
534		Query.ExecSQL;
535		Query.SQL.Text :=
536	<	'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, target_id INTEGER );';
536	>	'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
537	>	'src_link_offset INTEGER, target_id INTEGER,  INDEX idsrcid src_id, ' +
538	>	'INDEX iddestid target_id);';
539		Query.ExecSQL;
540		Query.SQL.Text :=
541	<	'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, sep BOOLEAN, size INTEGER, data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
541	>	'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
542	>	'src_link_offset INTEGER, sep BOOLEAN, size INTEGER, ' +
543	>	'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib, ' +
544	>	'INDEX idsrcid src_id);';
545		//    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
546		Query.ExecSQL;
547		Query.SQL.Text :=
548	<	'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
548	>	'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
549	>	'name STRING(128), contenttype INTEGER, size INTEGER, ' +
550	>	'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
551		//    Query.SQL.Text:='CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
552		Query.ExecSQL;
553	<	Query.SQL.Text :=
554	<	'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
555	<	Query.ExecSQL;
553	>	//  Query.SQL.Text :=
554	>	//    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
555	>	//  Query.ExecSQL;
556
557		Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("dbversion","' +
558		dbversion + '");';
#	Line 546 | Line 561 | begin
561		for i := 0 to High(OniDataConnection.LevelInfo.Ident) do
562		Data[i] := OniDataConnection.LevelInfo.Ident[i];
563		temps := CreateHexString(Data, True);
564	<	Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("ident","' + temps + '");';
565	<	Query.ExecSQL;
564	>	//  Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("ident","' + temps + '");';
565	>	//  Query.ExecSQL;
566		Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("lvl","' +
567		IntToStr(OniDataConnection.LevelInfo.LevelNumber) + '");';
568		Query.ExecSQL;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)