[patch] patch for conversion bug

dictconv-0.2-fixes.diff (text/plain), 3.12 KB, created by sergio cerlesi on 2009-07-30 12:28:19 UTC

diff -rupN dictconv-0.2/src/babylon.cpp dictconv-0.2.1/src/babylon.cpp
--- dictconv-0.2/src/babylon.cpp	2007-03-02 16:43:00.000000000 +0100
+++ dictconv-0.2.1/src/babylon.cpp	2007-07-01 13:53:27.000000000 +0200
@@ -256,7 +256,10 @@ bgl_entry Babylon::readEntry()
         len = (unsigned char)block.data[pos++];
 
         headword.reserve( len );
-        for(uint a=0;a<len;a++) headword += block.data[pos++];
+        for(uint a=0;a<len;a++)
+            headword += block.data[pos++];
+        if(headword.find('$') != std::string::npos)
+            headword = headword.erase(headword.find_first_of('$'), headword.find_last_of('$'));
         convertToUtf8( headword, SOURCE_CHARSET );
 
         // Definition
diff -rupN dictconv-0.2/src/dictdbuilder.h dictconv-0.2.1/src/dictdbuilder.h
--- dictconv-0.2/src/dictdbuilder.h	2007-02-25 15:33:33.000000000 +0100
+++ dictconv-0.2.1/src/dictdbuilder.h	2007-07-01 14:44:24.000000000 +0200
@@ -30,7 +30,7 @@ class DictdBuilder : public DictBuilder
 
 public:
   DictdBuilder( std::string filename );
-  ~DictdBuilder();
+  virtual ~DictdBuilder();
 
   bool addHeadword( std::string word, std::string def, std::vector<std::string> alternates = std::vector<std::string>() );
   bool finish();
@@ -74,7 +74,7 @@ protected:
   };
 
   typedef unsigned int uint32;
-  typedef std::map<std::string, entry> dictionary;
+  typedef std::multimap<std::string, entry> dictionary;
 
   std::ofstream file;
   std::string m_idxfilename;
diff -rupN dictconv-0.2/src/freedictreader.cpp dictconv-0.2.1/src/freedictreader.cpp
--- dictconv-0.2/src/freedictreader.cpp	2007-02-25 23:31:57.000000000 +0100
+++ dictconv-0.2.1/src/freedictreader.cpp	2007-07-01 14:51:15.000000000 +0200
@@ -35,7 +35,6 @@ bool FreedictReader::convert()
   xmlDocPtr doc;
   xmlNodePtr cur, temp, temp1;
   xmlChar *key;
-  int a = 0;
 
   // Parse the file
   doc = xmlParseFile( m_filename.c_str() );
diff -rupN dictconv-0.2/src/plaintextdictbuilder.h dictconv-0.2.1/src/plaintextdictbuilder.h
--- dictconv-0.2/src/plaintextdictbuilder.h	2007-02-19 18:22:48.000000000 +0100
+++ dictconv-0.2.1/src/plaintextdictbuilder.h	2007-07-01 14:36:25.000000000 +0200
@@ -74,7 +74,7 @@ public:
 protected:
 
   typedef unsigned int uint32;
-  typedef std::map<std::string, std::string> dictionary;
+  typedef std::multimap<std::string, std::string> dictionary;
 
   std::ofstream file;
   std::string m_filename;
diff -rupN dictconv-0.2/src/stardictbuilder.h dictconv-0.2.1/src/stardictbuilder.h
--- dictconv-0.2/src/stardictbuilder.h	2007-02-17 15:48:04.000000000 +0100
+++ dictconv-0.2.1/src/stardictbuilder.h	2007-07-01 14:42:01.000000000 +0200
@@ -30,7 +30,7 @@ class StarDictBuilder : public DictBuild
 
 public:
   StarDictBuilder( std::string filename );
-  ~StarDictBuilder();
+  virtual ~StarDictBuilder();
 
   bool addHeadword( std::string word, std::string def, std::vector<std::string> alternates = std::vector<std::string>() );
   bool finish();
@@ -73,7 +73,7 @@ protected:
   };
 
   typedef unsigned int uint32;
-  typedef std::map<std::string, entry> dictionary;
+  typedef std::multimap<std::string, entry> dictionary;
 
   std::ofstream file;
   std::string m_ifofilename;