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

removed some thread and ticket information from request

Browse Source 
they are in FunThread and FunTicket classes now
added funtion FunUptime (I forgot about it)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@631 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-10 20:43:38 +00:00
parent 76897b8a83
commit 9901c63ede
79 changed files with 1219 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
functions/functionparser.cpp
View File

@@ -17,7 +17,7 @@
void FunctionParser::SkipEmptyString(const char * msg)
{
for( ; get_index != get_table_len && request->get_table[get_index].empty() ; ++get_index )
for( ; get_index != get_tab_len && request->get_tab[get_index].empty() ; ++get_index )
log << log3 << msg << logend;
}
@@ -38,7 +38,7 @@ void FunctionParser::ParseDirectories()
while( true )
{
request->dir_table.push_back( pdir );
request->dir_tab.push_back( pdir );
log << log3 << "FP: Directory: ";
if( pdir->parent_id == -1 )
@@ -48,10 +48,10 @@ void FunctionParser::ParseDirectories()
SkipEmptyString("FP: Directory: skipped empty string");
if( get_index == get_table_len )
if( get_index == get_tab_len )
break;
pdir = system->dirs.GetDir(request->get_table[get_index], pdir->id);
pdir = system->dirs.GetDir(request->get_tab[get_index], pdir->id);
if( !pdir )
break;
@@ -66,12 +66,12 @@ void FunctionParser::ParseItem()
{
SkipEmptyString("FP: Item: skipped empty string");
if( get_index == get_table_len )
if( get_index == get_tab_len )
return;
// request->dir_table has at least one element
long parent_id = request->dir_table.back()->id;
const std::string & url = request->get_table[get_index];
// request->dir_tab has at least one element
long parent_id = request->dir_tab.back()->id;
const std::string & url = request->get_tab[get_index];
request->status = db->GetItem(parent_id, url, request->item);
@@ -100,16 +100,16 @@ void FunctionParser::ParseFunction()
{
SkipEmptyString("FP: Function: skipped empty string");
if( get_index == get_table_len )
if( get_index == get_tab_len )
return;
request->pfunction = functions->Find(request->get_table[get_index]);
request->function = functions->Find(request->get_tab[get_index]);
if( request->pfunction )
if( request->function )
{
++get_index;
log << log3 << "FP: Function: " << request->pfunction->fun.url << logend;
log << log3 << "FP: Function: " << request->function->fun.url << logend;
}
}
@@ -140,7 +140,7 @@ size_t i;
param.value = par.substr(i+1);
}
request->param_table.push_back(param);
request->param_tab.push_back(param);
log << log3 << "FP: Param: name=" << param.name;
@@ -158,10 +158,10 @@ void FunctionParser::ParseParams()
{
SkipEmptyString("FP: Params: skipped empty string");
if( get_index == get_table_len )
if( get_index == get_tab_len )
break;
ParseParams(request->get_table[get_index]);
ParseParams(request->get_tab[get_index]);
}
}
@@ -177,8 +177,8 @@ void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions,
request->status = WINIX_ERR_OK;
get_index = 0;
get_table_len = request->get_table.size();
request->pfunction = 0;
get_tab_len = request->get_tab.size();
request->function = 0;
request->is_item = false;
ParseDirectories();
@@ -188,7 +188,7 @@ void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions,
ParseFunction();
if( !request->pfunction )
if( !request->function )
{
ParseItem();
@@ -197,10 +197,10 @@ void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions,
ParseFunction();
if( !request->pfunction && get_index != get_table_len )
if( !request->function && get_index != get_tab_len )
{
request->status = WINIX_ERR_NO_FUNCTION;
log << log3 << "FP: Parse: unknown function: \"" << request->get_table[get_index] << "\"" << logend;
log << log3 << "FP: Parse: unknown function: \"" << request->get_tab[get_index] << "\"" << logend;
return;
}
}