2000-09-18 16:07:07 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* $RCSfile: merge.cxx,v $
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* $Revision: 1.21 $
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* last change: $Author: rt $ $Date: 2005-09-09 15:02:02 $
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* The Contents of this file are made available subject to
|
|
|
|
* the terms of GNU Lesser General Public License Version 2.1.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* GNU Lesser General Public License Version 2.1
|
|
|
|
* =============================================
|
|
|
|
* Copyright 2005 by Sun Microsystems, Inc.
|
|
|
|
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License version 2.1, as published by the Free Software Foundation.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2005-09-09 14:02:02 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
|
|
* MA 02111-1307 USA
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
|
|
|
************************************************************************/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <tools/fsys.hxx>
|
|
|
|
#include "export.hxx"
|
2001-04-25 09:17:04 +00:00
|
|
|
#include "utf8conv.hxx"
|
2004-11-18 07:17:30 +00:00
|
|
|
#include <iostream>
|
|
|
|
|
|
|
|
using namespace std;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2002-08-15 10:13:17 +00:00
|
|
|
extern void ConvertHalfwitdhToFullwidth( String& rString );
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
//
|
|
|
|
// class PFormEntrys
|
|
|
|
//
|
|
|
|
|
2004-11-18 07:17:30 +00:00
|
|
|
ByteString PFormEntrys::Dump(){
|
|
|
|
ByteString sRet( "PFormEntrys\n" );
|
|
|
|
//sRet.Append( Export::DumpMap( ByteString("sText") , sText ) );
|
|
|
|
//sRet.Append("\n");
|
|
|
|
ByteString a("sText");
|
|
|
|
if ( sText.size() ) Export::DumpMap( a , sText );
|
|
|
|
return sRet;
|
|
|
|
}
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
BOOL PFormEntrys::GetText( ByteString &rReturn,
|
2004-06-25 11:42:13 +00:00
|
|
|
//USHORT nTyp, USHORT nLangIndex, BOOL bDel )
|
|
|
|
USHORT nTyp, const ByteString &nLangIndex, BOOL bDel )
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
2004-11-18 07:17:30 +00:00
|
|
|
//printf("DBG: PFormEntrys::GetText(nId=%s)\n",nLangIndex.GetBuffer() );
|
|
|
|
|
|
|
|
// DEBUG******************
|
|
|
|
//ByteStringHashMap::const_iterator idbg;
|
|
|
|
//std::cout << "HASHKEYS : \n";
|
|
|
|
//for( idbg = sText.begin() ; idbg != sText.end(); ++idbg )
|
|
|
|
// std::cout << (idbg->first).GetBuffer() << "\n";
|
|
|
|
//std::cout << "\n\n";
|
|
|
|
// DEBUG******************
|
|
|
|
|
|
|
|
|
2004-08-30 16:31:38 +00:00
|
|
|
BOOL bReturn;
|
2000-09-18 16:07:07 +00:00
|
|
|
switch ( nTyp ) {
|
|
|
|
case STRING_TYP_TEXT :
|
|
|
|
rReturn = sText[ nLangIndex ];
|
|
|
|
if ( bDel )
|
|
|
|
sText[ nLangIndex ] = "";
|
|
|
|
bReturn = bTextFirst[ nLangIndex ];
|
|
|
|
bTextFirst[ nLangIndex ] = FALSE;
|
|
|
|
break;
|
|
|
|
case STRING_TYP_HELPTEXT :
|
|
|
|
rReturn = sHelpText;
|
|
|
|
break;
|
|
|
|
case STRING_TYP_QUICKHELPTEXT :
|
|
|
|
rReturn = sQuickHelpText[ nLangIndex ];
|
|
|
|
if ( bDel )
|
|
|
|
sQuickHelpText[ nLangIndex ] = "";
|
|
|
|
bReturn = bQuickHelpTextFirst[ nLangIndex ];
|
|
|
|
bQuickHelpTextFirst[ nLangIndex ] = FALSE;
|
|
|
|
break;
|
|
|
|
case STRING_TYP_TITLE :
|
|
|
|
rReturn = sTitle[ nLangIndex ];
|
|
|
|
if ( bDel )
|
|
|
|
sTitle[ nLangIndex ] = "";
|
|
|
|
bReturn = bTitleFirst[ nLangIndex ];
|
|
|
|
bTitleFirst[ nLangIndex ] = FALSE;
|
|
|
|
break;
|
|
|
|
}
|
2004-06-25 11:42:13 +00:00
|
|
|
//printf("Returning '%s'\n",rReturn.GetBuffer());
|
2000-09-18 16:07:07 +00:00
|
|
|
return bReturn;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// class MergeData
|
|
|
|
//
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
MergeData::~MergeData()
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2004-06-25 11:42:13 +00:00
|
|
|
PFormEntrys* MergeData::GetPFormEntrys( ResData *pResData )
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
2004-06-25 11:42:13 +00:00
|
|
|
// if( pResData->sPForm.Len() && aMap.find( pResData->sPForm ) != aMap.end() ){
|
|
|
|
if( aMap.find( ByteString("HACK") ) != aMap.end() ){
|
|
|
|
return aMap[ ByteString("HACK") ];
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void MergeData::Insert( const ByteString& rPFO , PFormEntrys* pfEntrys ){
|
|
|
|
// aMap.insert( PFormEntrysHashMap::value_type( rPFO , pfEntrys ) );
|
|
|
|
aMap.insert( PFormEntrysHashMap::value_type( ByteString("HACK") , pfEntrys ) );
|
|
|
|
|
|
|
|
}
|
2004-11-18 07:17:30 +00:00
|
|
|
ByteString MergeData::Dump(){
|
|
|
|
ByteString sRet( "MergeData\n" );
|
|
|
|
/* sRet.Append("sTyp = ");
|
|
|
|
sRet.Append(sTyp);
|
|
|
|
sRet.Append("\n");
|
|
|
|
sRet.Append("sGid=");
|
|
|
|
sRet.Append(sGID);
|
|
|
|
sRet.Append("\n");
|
|
|
|
sRet.Append("sLid=");
|
|
|
|
sRet.Append(sLID);
|
|
|
|
sRet.Append("\n");*/
|
|
|
|
|
|
|
|
printf("MergeData sTyp = %s , sGid = %s , sLid =%s\n",sTyp.GetBuffer(),sGID.GetBuffer(),sLID.GetBuffer());
|
|
|
|
|
|
|
|
PFormEntrysHashMap::const_iterator idbg;
|
|
|
|
for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){
|
|
|
|
/* sRet.Append( "aMap[" );
|
|
|
|
sRet.Append( idbg->first );
|
|
|
|
sRet.Append( "]= " );
|
|
|
|
sRet.Append( ( (PFormEntrys*)(idbg->second) )->Dump() );
|
|
|
|
sRet.Append("\n");*/
|
|
|
|
printf("aMap[ %s ] = " ,idbg->first.GetBuffer());
|
|
|
|
( (PFormEntrys*)(idbg->second) )->Dump();
|
|
|
|
printf("\n") ;
|
|
|
|
}
|
|
|
|
//sRet.Append("\n");
|
|
|
|
printf("\n") ;
|
|
|
|
return sRet;
|
|
|
|
}
|
2004-06-25 11:42:13 +00:00
|
|
|
|
|
|
|
PFormEntrys* MergeData::GetPFObject( const ByteString& rPFO ){
|
|
|
|
if( aMap.find( ByteString("HACK") ) != aMap.end() ){
|
|
|
|
// if( aMap.find( rPFO ) != aMap.end() ){
|
|
|
|
return aMap[ rPFO ];
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
return 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
PFormEntrys *MergeData::InsertEntry( const ByteString &rPForm )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
2004-06-25 11:42:13 +00:00
|
|
|
PFormEntrys* pFEntrys = new PFormEntrys( rPForm );
|
|
|
|
aMap.insert( PFormEntrysHashMap::value_type( rPForm , pFEntrys ) );
|
|
|
|
return pFEntrys;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
BOOL MergeData::operator==( ResData *pData )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
|
|
|
return (( pData->sId == sLID ) &&
|
|
|
|
( pData->sGId == sGID ) &&
|
|
|
|
( ByteString( pData->sResTyp ).ToUpperAscii() ==
|
|
|
|
ByteString( sTyp ).ToUpperAscii()));
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// class MergeDataFile
|
|
|
|
//
|
|
|
|
|
2001-03-30 08:27:32 +00:00
|
|
|
#define FFORMAT_UNKNOWN 0x0000
|
|
|
|
#define FFORMAT_NEW 0x0001
|
|
|
|
#define FFORMAT_OLD 0x0002
|
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
/*void MergeDataFile::Quote( ByteString& sText ){
|
|
|
|
for( int x=0; x < sText.Len(); x++ ){
|
|
|
|
if( sText.GetChar( x ) == '\"' ){
|
|
|
|
if( x > 1 && sText.GetChar( x-1) != '\\' ){
|
|
|
|
sText.Insert('\\', x);
|
|
|
|
x++;
|
|
|
|
}else{
|
|
|
|
sText.Insert('\\',0);
|
|
|
|
x++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}*/
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
2004-06-25 11:42:13 +00:00
|
|
|
MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFile ,BOOL bErrLog,
|
2001-04-25 09:17:04 +00:00
|
|
|
CharSet aCharSet, BOOL bUTF8 )
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
: bErrorLog( bErrLog )
|
|
|
|
{
|
|
|
|
SvFileStream aInputStream( String( rFileName, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ );
|
|
|
|
aInputStream.SetStreamCharSet( aCharSet );
|
|
|
|
ByteString sLine;
|
|
|
|
|
|
|
|
ByteString sTYP;
|
|
|
|
ByteString sGID;
|
|
|
|
ByteString sLID;
|
|
|
|
ByteString sPFO;
|
2004-06-25 11:42:13 +00:00
|
|
|
ByteString nLANG;
|
2000-09-18 16:07:07 +00:00
|
|
|
ByteString sTEXT;
|
|
|
|
ByteString sQHTEXT;
|
|
|
|
ByteString sTITLE;
|
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
if( !aInputStream.IsOpen() ) {
|
|
|
|
printf("ERROR : Can't open %s\n", rFileName.GetBuffer());
|
|
|
|
exit( -1 );
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
while ( !aInputStream.IsEof()) {
|
|
|
|
aInputStream.ReadLine( sLine );
|
|
|
|
sLine = sLine.Convert( RTL_TEXTENCODING_MS_1252, aCharSet );
|
2001-03-30 08:27:32 +00:00
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
if ( sLine.GetTokenCount( '\t' ) == 15 ) {
|
2005-09-05 10:21:10 +00:00
|
|
|
// Skip all wrong filenames
|
|
|
|
ByteString filename = sLine.GetToken( 1 , '\t' );
|
|
|
|
filename = filename.Copy( filename.SearchCharBackward( "\\" )+1 , filename.Len() );
|
|
|
|
|
|
|
|
if( filename.Equals( sFile ) )
|
|
|
|
{
|
2004-06-25 11:42:13 +00:00
|
|
|
sTYP = sLine.GetToken( 3, '\t' );
|
|
|
|
sGID = sLine.GetToken( 4, '\t' );
|
|
|
|
sLID = sLine.GetToken( 5, '\t' );
|
|
|
|
sPFO = sLine.GetToken( 7, '\t' );
|
|
|
|
sPFO = ByteString("HACK");
|
|
|
|
nLANG = sLine.GetToken( 9, '\t' );
|
|
|
|
|
|
|
|
sTEXT = sLine.GetToken( 10, '\t' );
|
|
|
|
// printf("%s\n",sTEXT.GetBuffer());
|
|
|
|
// Quote( sTEXT );
|
|
|
|
// printf("%s\n",sTEXT.GetBuffer());
|
|
|
|
|
|
|
|
sQHTEXT = sLine.GetToken( 12, '\t' );
|
|
|
|
sTITLE = sLine.GetToken( 13, '\t' );
|
|
|
|
|
|
|
|
nLANG.EraseLeadingAndTrailingChars();
|
2004-11-26 19:44:36 +00:00
|
|
|
if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){
|
2004-06-25 11:42:13 +00:00
|
|
|
InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE );
|
|
|
|
if( nLANG.Len() > 0 ){
|
|
|
|
bool bFound = false;
|
|
|
|
for( int x = 0; x < aLanguages.size(); x++ ){
|
|
|
|
if( aLanguages[ x ].Equals( nLANG ) )
|
|
|
|
bFound = true;
|
|
|
|
}
|
2005-09-05 10:21:10 +00:00
|
|
|
// Remember read languages for -l all switch
|
2004-06-25 11:42:13 +00:00
|
|
|
if( !bFound ) aLanguages.push_back( nLANG );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-03-30 08:27:32 +00:00
|
|
|
}
|
|
|
|
else if ( sLine.GetTokenCount( '\t' ) == 10 ){
|
2005-09-05 10:21:10 +00:00
|
|
|
printf("ERROR: File format is obsolete and no longer supported!\n");
|
2001-03-30 08:27:32 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
aInputStream.Close();
|
|
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
MergeDataFile::~MergeDataFile()
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
void MergeDataFile::WriteErrorLog( const ByteString &rFileName )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
2005-09-05 10:21:10 +00:00
|
|
|
// DEAD
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2005-09-05 10:21:10 +00:00
|
|
|
|
2004-11-18 07:17:30 +00:00
|
|
|
ByteString MergeDataFile::Dump(){
|
|
|
|
ByteString sRet( "MergeDataFile\n" );
|
|
|
|
|
|
|
|
//sRet.Append( Export::DumpMap( "aLanguageSet" , aLanguageSet ) );
|
|
|
|
//sRet.Append( Export::DumpMap( "aLanguages" , aLanguages ) );
|
|
|
|
printf("MergeDataFile\n");
|
|
|
|
MergeDataHashMap::const_iterator idbg;
|
|
|
|
for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){
|
|
|
|
/*sRet.Append( "aMap[" );
|
|
|
|
sRet.Append( idbg->first );
|
|
|
|
sRet.Append( "]= " );
|
|
|
|
sRet.Append( ((MergeData*) (idbg->second))->Dump() );
|
|
|
|
sRet.Append("\n");*/
|
|
|
|
|
|
|
|
printf("aMap[ %s ] = ",idbg->first.GetBuffer());
|
|
|
|
((MergeData*) (idbg->second))->Dump();
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
//sRet.Append("\n");
|
|
|
|
return sRet;
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
void MergeDataFile::WriteError( const ByteString &rLine )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
|
|
|
if ( bErrorLog ) {
|
|
|
|
if ( !aErrLog.IsOpen())
|
|
|
|
aErrLog.Open( String( sErrorLog, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_WRITE | STREAM_TRUNC );
|
|
|
|
aErrLog.WriteLine( rLine );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
fprintf( stderr, "%s\n", rLine.GetBuffer());
|
|
|
|
}
|
2004-06-25 11:42:13 +00:00
|
|
|
std::vector<ByteString> MergeDataFile::GetLanguages(){
|
|
|
|
return aLanguages;
|
|
|
|
}
|
2004-11-18 07:17:30 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
MergeData *MergeDataFile::GetMergeData( ResData *pResData )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
|
|
|
ByteString sOldG = pResData->sGId;
|
|
|
|
ByteString sOldL = pResData->sId;
|
|
|
|
ByteString sGID = pResData->sGId;
|
|
|
|
ByteString sLID;
|
|
|
|
if ( !sGID.Len())
|
|
|
|
sGID = pResData->sId;
|
|
|
|
else
|
|
|
|
sLID = pResData->sId;
|
|
|
|
pResData->sGId = sGID;
|
|
|
|
pResData->sId = sLID;
|
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
ByteString sKey = CreateKey( pResData->sResTyp , pResData->sGId , pResData->sId );
|
|
|
|
|
2004-11-18 07:17:30 +00:00
|
|
|
//printf("DBG: Searching [%s]\n",sKey.GetBuffer());
|
2004-06-25 11:42:13 +00:00
|
|
|
if( aMap.find( sKey ) != aMap.end() ){
|
|
|
|
pResData->sGId = sOldG;
|
|
|
|
pResData->sId = sOldL;
|
2004-11-18 07:17:30 +00:00
|
|
|
//printf("DBG: Found[%s]\n",sKey.GetBuffer());
|
2004-06-25 11:42:13 +00:00
|
|
|
return aMap[ sKey ];
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
pResData->sGId = sOldG;
|
|
|
|
pResData->sId = sOldL;
|
2004-11-18 07:17:30 +00:00
|
|
|
//printf("DBG: Found[%s]\n",sKey.GetBuffer());
|
2000-09-18 16:07:07 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-11-18 07:17:30 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
|
|
|
// search for requested PFormEntrys
|
|
|
|
MergeData *pData = GetMergeData( pResData );
|
|
|
|
if ( pData )
|
|
|
|
return pData->GetPFormEntrys( pResData );
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
void MergeDataFile::InsertEntry(
|
|
|
|
const ByteString &rTYP, const ByteString &rGID,
|
|
|
|
const ByteString &rLID, const ByteString &rPFO,
|
2004-06-25 11:42:13 +00:00
|
|
|
const ByteString &nLANG, const ByteString &rTEXT,
|
2000-09-18 16:07:07 +00:00
|
|
|
const ByteString &rQHTEXT, const ByteString &rTITLE )
|
|
|
|
/*****************************************************************************/
|
|
|
|
{
|
2004-08-30 16:31:38 +00:00
|
|
|
MergeData *pData;
|
2000-09-18 16:07:07 +00:00
|
|
|
BOOL bFound = FALSE;
|
|
|
|
|
|
|
|
// search for MergeData
|
2004-06-25 11:42:13 +00:00
|
|
|
ByteString sKey = CreateKey( rTYP , rGID , rLID );
|
2004-11-18 07:17:30 +00:00
|
|
|
ByteString sKey2;
|
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
if( aMap.find( sKey ) != aMap.end() ){
|
|
|
|
pData = aMap[ sKey ];
|
|
|
|
}else{
|
2000-09-18 16:07:07 +00:00
|
|
|
pData = new MergeData( rTYP, rGID, rLID );
|
2004-06-25 11:42:13 +00:00
|
|
|
aMap.insert( MergeDataHashMap::value_type( CreateKey( rTYP , rGID , rLID ) , pData ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bFound = FALSE;
|
2004-06-25 11:42:13 +00:00
|
|
|
PFormEntrys *pFEntrys = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
// search for PFormEntrys
|
|
|
|
|
2004-06-25 11:42:13 +00:00
|
|
|
pFEntrys = pData->GetPFObject( rPFO );
|
|
|
|
if( !pFEntrys ){
|
2000-09-18 16:07:07 +00:00
|
|
|
// create new PFormEntrys, cause no one exists with current properties
|
|
|
|
pFEntrys = new PFormEntrys( rPFO );
|
2004-06-25 11:42:13 +00:00
|
|
|
pData->Insert( rPFO , pFEntrys );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// finaly insert the cur string
|
2004-11-18 07:17:30 +00:00
|
|
|
|
|
|
|
// if( rTYP.EqualsIgnoreCaseAscii("PairedList") ){
|
|
|
|
// sKey2 = CreateKey( rTYP , rGID , rLID );
|
|
|
|
|
|
|
|
/* sKey2.Append( '-' );
|
|
|
|
sKey2.Append( nLANG );
|
|
|
|
sKey2.ToUpperAscii();*/
|
|
|
|
//pFEntrys->InsertEntry( rLID , rTEXT, rQHTEXT, rTITLE );
|
|
|
|
// pFEntrys->InsertEntry( sKey2 , rTEXT, rQHTEXT, rTITLE );
|
|
|
|
// }
|
|
|
|
// else
|
|
|
|
pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
|
|
|
|
|
|
|
|
//printf("DBG: MergeDataFile::Insert[%s]=( sKey=%s,rTEXT=%s,%s,%s)\n",sKey2.GetBuffer(),nLANG.GetBuffer(),rTEXT.GetBuffer(),rQHTEXT.GetBuffer(),rTITLE.GetBuffer());
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2004-06-25 11:42:13 +00:00
|
|
|
ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID ){
|
|
|
|
ByteString sKey( rTYP );
|
|
|
|
sKey.Append( '-' );
|
|
|
|
sKey.Append( rGID );
|
|
|
|
sKey.Append( '-' );
|
|
|
|
sKey.Append( rLID );
|
|
|
|
return sKey.ToUpperAscii();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2004-06-25 11:42:13 +00:00
|
|
|
|
|
|
|
|