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 167 by alloc, Tue Apr 3 02:59:20 2007 UTC vs.
Revision 248 by alloc, Mon Nov 26 11:02:28 2007 UTC

#	Line 238 | Line 238 | begin
238		for i := 0 to High(DatHeader.OSIdent) do
239		case Connection.DataOS of
240		DOS_WIN: DatHeader.OSIdent[i] := HeaderOSIdentWin[i];
241	<	DOS_MAC: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
241	>	DOS_MAC, DOS_WINDEMO: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
242		DOS_MACBETA: DatHeader.OSIdent[i] := HeaderOSIdentMacBeta[i];
243		end;
244		for i := 0 to High(DatHeader.GlobalIdent) do
#	Line 279 | Line 279 | begin
279		begin
280		case Connection.DataOS of
281		DOS_WIN:     ExtensionsHeader[i].Ident := FileTypes[j].IdentWin;
282	<	DOS_WINDEMO: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
282	>	DOS_WINDEMO:
283	>	if FileTypes[j].Extension = 'SNDD' then
284	>	ExtensionsHeader[i].Ident := FileTypes[j].IdentWin
285	>	else
286	>	ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
287		DOS_MAC:     ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
288		DOS_MACBETA: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
289		end;
#	Line 491 | Line 495 | const
495		begin
496		DeleteFile(target);
497		end;
498	<	end;
498	>	end;
499
500
501
#	Line 589 | Line 593 | begin
593		Query.SQL.Text := 'CREATE INDEX idtargetid ON linkmap (target_id);';
594		Query.ExecSQL;
595		Query.SQL.Text :=
596	<	'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
597	<	'src_link_offset INTEGER, sep BOOLEAN, size INTEGER, ' +
596	>	'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, name STRING(32), src_id INTEGER, ' +
597	>	'src_link_offset INTEGER, sep BOOLEAN, type STRING(8), size INTEGER, ' +
598		'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib);';
599		//    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
600		Query.ExecSQL;
601		Query.SQL.Text := 'CREATE INDEX idsrcid ON rawmap (src_id);';
602		Query.ExecSQL;
603	+	Query.SQL.Text := 'CREATE INDEX idtype ON rawmap (type);';
604	+	Query.ExecSQL;
605		Query.SQL.Text :=
606		'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
607		'name STRING(128), contenttype INTEGER, size INTEGER, ' +
#	Line 632 | Line 638 | begin
638		DoStep('Writing .dat-fileslist');
639		Application.ProcessMessages;
640
635	–	TAccess_OniArchive(Connection).UnloadWhenUnused := False;
636	–
641		FileTime := Time;
642		Database.StartTransaction;
643		for FileID := 0 to Connection.GetFileCount - 1 do
#	Line 662 | Line 666 | begin
666		Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, tempdata);
667		mimecoder      := TStringFormat_MIME64.Create;
668		Query.SQL.Text :=
669	<	'INSERT INTO rawmap (src_id,src_link_offset,sep,size,data) VALUES (' +
669	>	'INSERT INTO rawmap (name,src_id,src_link_offset,sep,type,size,data) VALUES (' +
670	>	'"' + RawLinks[i].Name + '", ' +
671		IntToStr(FileID) + ', ' + IntToStr(RawLinks[i].SrcOffset) + ',' +
672		BoolToStr(RawLinks[i].LocSep) + ', ' +
673	+	'"' + RawLinks[i].RawType + '", ' +
674		IntToStr(RawLinks[i].RawSize) + ', ' +
675		'MimeToBin("' + MimeCoder.StrTo(@tempdata[0], RawLinks[i].RawSize) + '") );';
676		Query.ExecSQL;
#	Line 673 | Line 679 | begin
679		else
680		begin
681		Query.SQL.Text :=
682	<	'INSERT INTO rawmap (src_id,src_link_offset,sep,size) VALUES (' +
682	>	'INSERT INTO rawmap (name,src_id,src_link_offset,sep,type,size) VALUES (' +
683	>	'"' + RawLinks[i].Name + '", ' +
684		IntToStr(FileID) + ', ' + IntToStr(RawLinks[i].SrcOffset) + ', ' +
685	<	BoolToStr(RawLinks[i].LocSep) + ', 0);';
685	>	BoolToStr(RawLinks[i].LocSep) + ', ' +
686	>	'"' + RawLinks[i].RawType + '", ' +
687	>	'0);';
688		Query.ExecSQL;
689		end;
690		end;
#	Line 731 | Line 740 | begin
740		btn_abortok.Default := True;
741
742		converting := False;
734	–	TAccess_OniArchive(Connection).UnloadWhenUnused := True;
743
744		Query.Close;
745		Query.Free;

Diff Legend

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