Attachment #199647 for bug #224525

Lines 256-262 bgl_entry Babylon::readEntry() Link Here

(-)dictconv-0.2/src/babylon.cpp (-1 / +4 lines)
256	len = (unsigned char)block.data[pos++];	256	len = (unsigned char)block.data[pos++];
257		257
258	headword.reserve( len );	258	headword.reserve( len );
259	for(uint a=0;a<len;a++) headword += block.data[pos++];	259	for(uint a=0;a<len;a++)
		260	headword += block.data[pos++];
		261	if(headword.find('$') != std::string::npos)
		262	headword = headword.erase(headword.find_first_of('$'), headword.find_last_of('$'));
260	convertToUtf8( headword, SOURCE_CHARSET );	263	convertToUtf8( headword, SOURCE_CHARSET );
261		264
262	// Definition	265	// Definition

Lines 30-36 class DictdBuilder : public DictBuilder Link Here

(-)dictconv-0.2/src/dictdbuilder.h (-2 / +2 lines)
30		30
31	public:	31	public:
32	DictdBuilder( std::string filename );	32	DictdBuilder( std::string filename );
33	~DictdBuilder();	33	virtual ~DictdBuilder();
34		34
35	bool addHeadword( std::string word, std::string def, std::vector<std::string> alternates = std::vector<std::string>() );	35	bool addHeadword( std::string word, std::string def, std::vector<std::string> alternates = std::vector<std::string>() );
36	bool finish();	36	bool finish();
Lines 74-80 protected: Link Here
74	};	74	};
75		75
76	typedef unsigned int uint32;	76	typedef unsigned int uint32;
77	typedef std::map<std::string, entry> dictionary;	77	typedef std::multimap<std::string, entry> dictionary;
78		78
79	std::ofstream file;	79	std::ofstream file;
80	std::string m_idxfilename;	80	std::string m_idxfilename;

Lines 35-41 bool FreedictReader::convert() Link Here

(-)dictconv-0.2/src/freedictreader.cpp (-1 lines)
35	xmlDocPtr doc;	35	xmlDocPtr doc;
36	xmlNodePtr cur, temp, temp1;	36	xmlNodePtr cur, temp, temp1;
37	xmlChar *key;	37	xmlChar *key;
38	int a = 0;
39		38
40	// Parse the file	39	// Parse the file
41	doc = xmlParseFile( m_filename.c_str() );	40	doc = xmlParseFile( m_filename.c_str() );

Lines 74-80 public: Link Here

(-)dictconv-0.2/src/plaintextdictbuilder.h (-1 / +1 lines)
74	protected:	74	protected:
75		75
76	typedef unsigned int uint32;	76	typedef unsigned int uint32;
77	typedef std::map<std::string, std::string> dictionary;	77	typedef std::multimap<std::string, std::string> dictionary;
78		78
79	std::ofstream file;	79	std::ofstream file;
80	std::string m_filename;	80	std::string m_filename;

Lines 30-36 class StarDictBuilder : public DictBuild Link Here

(-)dictconv-0.2/src/stardictbuilder.h (-2 / +2 lines)
30		30
31	public:	31	public:
32	StarDictBuilder( std::string filename );	32	StarDictBuilder( std::string filename );
33	~StarDictBuilder();	33	virtual ~StarDictBuilder();
34		34
35	bool addHeadword( std::string word, std::string def, std::vector<std::string> alternates = std::vector<std::string>() );	35	bool addHeadword( std::string word, std::string def, std::vector<std::string> alternates = std::vector<std::string>() );
36	bool finish();	36	bool finish();
Lines 73-79 protected: Link Here
73	};	73	};
74		74
75	typedef unsigned int uint32;	75	typedef unsigned int uint32;
76	typedef std::map<std::string, entry> dictionary;	76	typedef std::multimap<std::string, entry> dictionary;
77		77
78	std::ofstream file;	78	std::ofstream file;
79	std::string m_ifofilename;	79	std::string m_ifofilename;

Return to bug 224525