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.24 by maloninc, Fri Sep 16 04:12:58 2005 UTC revision 1.26 by maloninc, Fri Oct 7 10:19:46 2005 UTC
# Line 65  bool mnModel::makeSearchToken(const char Line 65  bool mnModel::makeSearchToken(const char
65                  tokenList[i] = (char*)malloc(strlen(token)+1);                  tokenList[i] = (char*)malloc(strlen(token)+1);
66                  snprintf(tokenList[i], strlen(token)+1, "%s", token);                  snprintf(tokenList[i], strlen(token)+1, "%s", token);
67                  i++;                  i++;
68                    if(i >= MAX_TOKEN) break;
69          }          }
70          return true;          return true;
71  }  }
# Line 114  WikiList* mnModel::search(const char* se Line 115  WikiList* mnModel::search(const char* se
115          WikiData*   wikiData;          WikiData*   wikiData;
116      WikiList*   list = new WikiList();      WikiList*   list = new WikiList();
117      wxString*   fileName = new wxString();      wxString*   fileName = new wxString();
118          char*       tokenList[32];          char*       tokenList[MAX_TOKEN];
119    
120          memset(tokenList, 0, sizeof(char*)*32);          memset(tokenList, 0, sizeof(char*)*MAX_TOKEN);
121          if( makeSearchToken(searchStr, tokenList) == false) return list;          if( makeSearchToken(searchStr, tokenList) == false) return list;
122    
123          dir = new wxDir(*wikiDataDir);          dir = new wxDir(*wikiDataDir);
# Line 513  const wxString* WikiData::getOldSubject( Line 514  const wxString* WikiData::getOldSubject(
514          return oldSubject;          return oldSubject;
515  }  }
516    
517    void WikiData::setOldSubjectFromCurrent()
518    {
519            oldSubject = new wxString(*subject);
520    }
521    
522  void WikiData::modSubject(wxString* newSubject)  void WikiData::modSubject(wxString* newSubject)
523  {  {
524          wxCSConv    conv(wxT(CODE_SET_SYSTEM));          wxCSConv    conv(wxT(CODE_SET_SYSTEM));
# Line 673  void WikiData::save() Line 679  void WikiData::save()
679          outbufSize = sizeof(outbuf);          outbufSize = sizeof(outbuf);
680          memset(outbuf, 0, outbufSize);          memset(outbuf, 0, outbufSize);
681          iconv(codeSet, (ICONV_CONST char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);          iconv(codeSet, (ICONV_CONST char**)&inbufPtr, (size_t*)&inbufSize, &outbufPtr, (size_t*)&outbufSize);
682            if(inbufSize != 0) { // iconv error
683                    wxMessageBox(wxT("Fail to save, because this memo include KISHU-IZON-MOJI.\nPlease remove KISHU-IZON-MOJI, and try again"), wxT("Fail to save"), wxOK|wxICON_WARNING);
684            }
685          fwrite(outbuf, sizeof(outbuf)-outbufSize, 1, fp);          fwrite(outbuf, sizeof(outbuf)-outbufSize, 1, fp);
686          fclose(fp);          fclose(fp);
687          iconv_close(codeSet);          iconv_close(codeSet);

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.26

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