Changeset 10774 for lang/c

Timestamp:

04/30/08 03:41:40 (7 months ago)

Author:

gyuque

Message:

imported changes at 3/8

Location:

lang/c/zm2/branch-20080306

Files:

• KeywordDic.cpp (modified) (4 diffs)
• zm2.cpp (modified) (2 diffs)

lang/c/zm2/branch-20080306/KeywordDic.cpp

@@ -70 +70 @@
 
         if (fp == NULL)
+        {
+                _tcprintf(_T("** �L�[���[�h�t�@�C�����ǂݍ��߂܂������\n"));
                 return false;
+        }
 
         for(;;)
@@ -122 +125 @@
         size_t outpos = 0;
         bool skipped = false;
+        size_t kwlen;
+
         for(;*wb;wb++,p1++)
         {
@@ -134 +139 @@
                                 if (_tcsstr(p1, itList->w.c_str()) == p1)
                                 {
-                                        p1 += itList->len-1;
-                                        wb += itList->len-1;
+                                        kwlen = itList->len;
+
+                                        if (kwlen >= 2)
+                                                outbuf[outpos++] = *p1;
+
+                                        p1 += kwlen-1;
+                                        wb += kwlen-1;
                                 
                                         skipped = true;
@@ -158 +168 @@
 
         outbuf[outpos] = _T('\0');
-
         return true;
 }

lang/c/zm2/branch-20080306/zm2.cpp

@@ -234 +234 @@
 {
         KeywordDic* kdic = new KeywordDic();
-        kdic->load(_T("tokyo1.kwd.csv"));
-        kdic->load(_T("station2.kwd.csv"));
-        kdic->load(_T("other.kwd.csv"));
-        kdic->load(_T("dpt.kwd.csv"));
+        kdic->load(_T("geoname.csv"));
+        kdic->load(_T("station.csv"));
+        kdic->load(_T("global.csv"));
+        kdic->load(_T("dpt.csv"));
 
         return kdic;
@@ -245 +245 @@
 {
         KeywordDic* kdic = new KeywordDic();
-        kdic->load(_T("building.kwd.csv"));
+        kdic->load(_T("building.csv"));
 
         return kdic;