Develop and Download Open Source Software

Browse CVS Repository

Diff of /malonnote/mnModel.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.3 by maloninc, Wed Aug 3 23:19:01 2005 UTC revision 1.5 by maloninc, Fri Aug 5 00:16:39 2005 UTC
# Line 54  WikiList* mnModel::search(const char* se Line 54  WikiList* mnModel::search(const char* se
54          if(codeSet == (iconv_t)-1) {          if(codeSet == (iconv_t)-1) {
55                  MN_FATAL_ERROR(wxT("failed iconv_open"));                  MN_FATAL_ERROR(wxT("failed iconv_open"));
56          }          }
57          iconv(codeSet, (const char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);          iconv(codeSet, (ICONV_CONST char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);
58          iconv_close(codeSet);          iconv_close(codeSet);
59    
60          dir = new wxDir(*wikiDataDir);          dir = new wxDir(*wikiDataDir);
# Line 63  WikiList* mnModel::search(const char* se Line 63  WikiList* mnModel::search(const char* se
63                  MN_FATAL_ERROR(wxT("wxDir has faild\n"));                  MN_FATAL_ERROR(wxT("wxDir has faild\n"));
64          return NULL;          return NULL;
65      }      }
66      bool cont = dir->GetFirst(fileName, wxEmptyString, wxDIR_FILES);      bool cont = dir->GetFirst(fileName, wxT("*.txt"), wxDIR_FILES);
67          while(cont){          while(cont){
68          fullPathName = *wikiDataDir + wxT("/") + *fileName;          fullPathName = *wikiDataDir + wxT("/") + *fileName;
69                  fp = fopen((const char*)fullPathName.mb_str(), "r");                  fp = fopen((const char*)fullPathName.mb_str(), "r");
# Line 118  void mnModel::modSearchStr(wxString* old Line 118  void mnModel::modSearchStr(wxString* old
118                  itemStr.sprintf(wxT("%s"), newStr->c_str());                  itemStr.sprintf(wxT("%s"), newStr->c_str());
119          }          }
120  }  }
121    const wxString* mnModel::getWikiDataDir()
122    {
123            return wikiDataDir;
124    }
125    
126  const wxArrayString* mnModel::getSearchStrList()  const wxArrayString* mnModel::getSearchStrList()
127  {  {
# Line 155  WikiData::WikiData(wxString* dataDir, co Line 159  WikiData::WikiData(wxString* dataDir, co
159          decodeStr = decode(file);          decodeStr = decode(file);
160          inbufSize = strlen(decodeStr);          inbufSize = strlen(decodeStr);
161          outbufSize = sizeof(outbuf);          outbufSize = sizeof(outbuf);
162          iconv(codeSet, (const char**)&decodeStr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);          iconv(codeSet, (ICONV_CONST char**)&decodeStr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);
163          subject  = new wxString((const char*)outbuf, conv);          subject  = new wxString((const char*)outbuf, conv);
164          iconv_close(codeSet);          iconv_close(codeSet);
165    
# Line 239  void WikiData::modSubject(wxString* newS Line 243  void WikiData::modSubject(wxString* newS
243          if(codeSet == (iconv_t)-1) {          if(codeSet == (iconv_t)-1) {
244                  MN_FATAL_ERROR(wxT("failed iconv_open"));                  MN_FATAL_ERROR(wxT("failed iconv_open"));
245          }          }
246          iconv(codeSet, (const char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);          iconv(codeSet, (ICONV_CONST char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);
247          iconv_close(codeSet);          iconv_close(codeSet);
248          subject  = new wxString(newSubject->c_str());          subject  = new wxString(newSubject->c_str());
249          fileName = new wxString(encode(outbuf), conv);          fileName = new wxString(encode(outbuf), conv);
# Line 303  const wxString* WikiData::getText() Line 307  const wxString* WikiData::getText()
307                  outbufPtr = outbuf;                  outbufPtr = outbuf;
308                  outbufSize = sizeof(outbuf);                  outbufSize = sizeof(outbuf);
309                  memset(outbuf, 0, outbufSize);                  memset(outbuf, 0, outbufSize);
310                  iconv(codeSet, (const char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);                  iconv(codeSet, (ICONV_CONST char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);
311                  tmpStr = new wxString((char*)outbuf, conv);                  tmpStr = new wxString((char*)outbuf, conv);
312                  *text += *tmpStr;                  *text += *tmpStr;
313                  delete tmpStr;                  delete tmpStr;
# Line 363  void WikiData::save() Line 367  void WikiData::save()
367          outbufPtr = outbuf;          outbufPtr = outbuf;
368          outbufSize = sizeof(outbuf);          outbufSize = sizeof(outbuf);
369          memset(outbuf, 0, outbufSize);          memset(outbuf, 0, outbufSize);
370          iconv(codeSet, (const char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);          iconv(codeSet, (ICONV_CONST char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);
371          fwrite(outbuf, sizeof(outbuf)-outbufSize, 1, fp);          fwrite(outbuf, sizeof(outbuf)-outbufSize, 1, fp);
372          fclose(fp);          fclose(fp);
373          iconv_close(codeSet);          iconv_close(codeSet);

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.5

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26