Subversion Repositories spk

Rev

Rev 152 | Rev 158 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 152 Rev 155
Line 702... Line 702...
702 
		delete pBaseFile;
 702 
		delete pBaseFile;
703 
}
 703 
}
704 
 
 704 
 
705 
void AppendFile ( CyString sfile, CyString type, CyString addfile )
 705 
void AppendFile ( CyString sfile, CyString type, CyString addfile )
706 
{
 706 
{
707 
	int t = GetFileTypeFromString(type);
 707 
	int t = GetFileTypeFromString(type.ToString());
708 
	if ( t == -1 )
 708 
	if ( t == -1 )
709 
	{
 709 
	{
710 
		printf ( "The file type \"%s\" is invalid\n", type.c_str() );
 710 
		printf ( "The file type \"%s\" is invalid\n", type.c_str() );
711 
		return;
 711 
		return;
712 
	}
 712 
	}
Line 736... Line 736...
736 
 
 736 
 
737 
	MyProgress progress(0);
 737 
	MyProgress progress(0);
738 
 
 738 
 
739 
	printf ( "Adding file %s to package\n\t>", addfile.c_str() );
 739 
	printf ( "Adding file %s to package\n\t>", addfile.c_str() );
740 
 
 740 
 
741 
	if ( pBaseFile->AppendFile ( addfile, t, 0, NullString, &progress ) )
 741 
	if ( pBaseFile->appendFile(addfile.ToString(), t, 0, false, Utils::String::Null(), &progress))
742 
	{
 742 
	{
743 
		progress.PrintDone();
 743 
		progress.PrintDone();
744 
		printf ( "< (Done)\n" );
 744 
		printf ( "< (Done)\n" );
745 
 
 745 
 
746 
		pBaseFile->WriteFile ( sfile );
 746 
		pBaseFile->WriteFile ( sfile );
Line 762... Line 762...
762 
	if ( addfile.Empty() )
 762 
	if ( addfile.Empty() )
763 
	{
 763 
	{
764 
		printf ( "Error: Remove filename is invalid\n" );
 764 
		printf ( "Error: Remove filename is invalid\n" );
765 
		return;
 765 
		return;
766 
	}
 766 
	}
767 
	int t = GetFileTypeFromString(type);
 767 
	int t = GetFileTypeFromString(type.ToString());
768 
	if ( t == -1 )
 768 
	if ( t == -1 )
769 
	{
 769 
	{
770 
		printf ( "The file type \"%s\" is invalid\n", type.c_str() );
 770 
		printf ( "The file type \"%s\" is invalid\n", type.c_str() );
771 
		return;
 771 
		return;
772 
	}
 772 
	}