tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

small refactoring 

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@619 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2010-07-05 15:21:06 +00:00
parent 50cb88c5ed
commit 262ba10443
5 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/functionparser.cpp
View File

@ -145,7 +145,12 @@ size_t i;
request.param_table.push_back(param);
log << log3 << "FP: Param: name=" << param.name << ", value=" << param.value << logend;
log << log3 << "FP: Param: name=" << param.name;
if( !param.value.empty() )
log << ", value=" << param.value;
log << logend;
}

18
templates/ls.cpp
View File

@ -9,6 +9,7 @@
#include "templates.h"
#include "../core/request.h"
#include "misc.h"
@ -25,21 +26,8 @@ void ls_ckeditor_funnum_browse(Info & i)
{
if( ls_ckeditor_reqid != request.id )
{
ls_ckeditor_reqid = request.id;
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request.get_table.empty() )
{
size_t last = request.get_table.size()-1;
if( !request.get_table[last].empty() )
{
const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}
ls_ckeditor_funnum = ckeditor_getparser.fun_num;
ls_ckeditor_reqid = request.id;
ls_ckeditor_funnum = ParseCKeditorFun();
}
i.out << ls_ckeditor_funnum;

43
templates/misc.cpp
View File

@ -36,13 +36,30 @@ void print_date_nice(Ezc::Info & i, const tm * ptm)
int ParseCKeditorFun()
{
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request.get_table.empty() )
{
size_t last = request.get_table.size()-1;
if( !request.get_table[last].empty() )
{
const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}
return ckeditor_getparser.fun_num;
}
// those functions from here are used in the second thread too
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const char * file, bool delete_white)
{
size_t i;
@ -79,28 +96,6 @@ size_t loc, pat;
}
int ParseCKeditorFun()
{
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request.get_table.empty() )
{
size_t last = request.get_table.size()-1;
if( !request.get_table[last].empty() )
{
const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}
return ckeditor_getparser.fun_num;
}
} // namespace TemplatesFunctions

3
templates/misc.h
View File

@ -24,9 +24,8 @@ namespace TemplatesFunctions
// table: [language][file]
typedef std::vector<std::vector<Ezc::Pattern> > Patterns;
void print_date_nice(Ezc::Info & i, const tm * ptm);
int ParseCKeditorFun();
// those functions from here are used in the second thread too

16
templates/upload.cpp
View File

@ -10,6 +10,7 @@
#include <ctime>
#include "templates.h"
#include "../core/request.h"
#include "misc.h"
namespace TemplatesFunctions
@ -25,20 +26,7 @@ void upload_ckeditor_funnum(Info & i)
if( upload_ckeditor_reqid != request.id )
{
upload_ckeditor_reqid = request.id;
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request.get_table.empty() )
{
size_t last = request.get_table.size()-1;
if( !request.get_table[last].empty() )
{
const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}
upload_fun_num = ckeditor_getparser.fun_num;
upload_fun_num = ParseCKeditorFun();
}
i.out << upload_fun_num;