added: to templates: an interface for getting information from Space

miscspace.h, miscspace.cpp
changed: plugin ticket
         now as a config we use a PT::Space struct
         (not finished yet, only 'integer', 'select' and 'progress' are done)


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@794 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2012-01-16 10:12:38 +00:00
parent b2d3ca9543
commit 424618de38
33 changed files with 1102 additions and 1164 deletions

View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* Copyright (c) 2010-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -43,6 +43,24 @@ return is;
}
void TDb::SetTicketColumns(PGresult * r)
{
cfileid = AssertColumn(r, "file_id");
cparam = AssertColumn(r, "param");
cintv = AssertColumn(r, "intv");
cdecv = AssertColumn(r, "decv");
}
void TDb::ReadTicketPar(PGresult * r, Ticket::TicketParam & par, int row)
{
par.Clear();
par.param = AssertValueInt(r, row, cparam);
par.intv = AssertValueLong(r, row, cintv);
AssertValueWide(r, row, cdecv, par.decv); // !! temporarily
}
Error TDb::GetTicket(long file_id, Ticket & ticket)
{
PGresult * r = 0;
@@ -53,33 +71,26 @@ Error TDb::GetTicket(long file_id, Ticket & ticket)
{
// they should be sorted by param (they are used in a binary search later)
query.Clear();
query << R("select file_id, param, int_value, str_value from plugins.ticket "
query << R("select file_id, param, intv, decv from plugins.ticket "
"where ticket.file_id=") << file_id << R(" order by param asc;");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
SetTicketColumns(r);
int rows = Rows(r);
if( rows == 0 )
throw Error(WINIX_ERR_NO_TICKET);
Ticket::TicketParam par;
ticket.file_id = file_id;
int cparam = AssertColumn(r, "param");
int cintvalue = AssertColumn(r, "int_value");
int cstrvalue = AssertColumn(r, "str_value");
if( rows == 0 )
throw Error(WINIX_ERR_NO_TICKET); // !! do we need this kind or error?
// !! mozna dodac uzycie ticket.par_tab.reserve()
if( ticket.par_tab.capacity() < ticket.par_tab.size() + rows )
ticket.par_tab.reserve(ticket.par_tab.size() + rows);
for(int i=0 ; i<rows ; ++i)
{
par.param = AssertValueInt(r, i, cparam);
par.int_value = AssertValueLong(r, i, cintvalue);
AssertValueWide(r, i, cstrvalue, par.str_value);
ticket.par_tab.push_back(par);
ReadTicketPar(r, tic_par, i);
ticket.par_tab.push_back(tic_par);
}
}
catch(const Error & e)
@@ -97,11 +108,13 @@ return status;
Error TDb::GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket> & ticket_tab)
Error TDb::GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket> & ticket_tab, bool clear_tab)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
ticket_tab.clear();
if( clear_tab )
ticket_tab.clear();
if( file_id_tab.empty() )
return status;
@@ -111,40 +124,30 @@ Error TDb::GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket>
// ticket_tab must be sorted by file_id (they are used in a binary search later)
// and items in a ticket should be sorted by param (they are used in a binary search later too)
query.Clear();
CreateIdList(file_id_tab, file_list);
query << R("select file_id, param, int_value, str_value from plugins.ticket "
"where ticket.file_id in ") << R(file_list) << R(" order by file_id, param;");
// !! moze dodac operator <<(std::vector(long)) do query?
query << R("select file_id, param, intv, decv from plugins.ticket "
"where ticket.file_id in ") << file_id_tab << R(" order by file_id, param;");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
SetTicketColumns(r);
int rows = Rows(r);
Ticket::TicketParam par;
int cfile_id = AssertColumn(r, "file_id");
int cparam = AssertColumn(r, "param");
int cintvalue = AssertColumn(r, "int_value");
int cstrvalue = AssertColumn(r, "str_value");
long last_file_id = -1;
empty_ticket.Clear();
for(int i=0 ; i<rows ; ++i)
{
long file_id = AssertValueLong(r, i, cfile_id);
long file_id = AssertValueLong(r, i, cfileid);
if( i==0 || last_file_id != file_id )
{
ticket_tab.push_back(Ticket());
ticket_tab.push_back(empty_ticket);
ticket_tab.back().file_id = file_id;
last_file_id = file_id;
}
par.param = AssertValueInt(r, i, cparam);
par.int_value = AssertValueLong(r, i, cintvalue);
AssertValueWide(r, i, cstrvalue, par.str_value);
ticket_tab.back().par_tab.push_back(par);
ReadTicketPar(r, tic_par, i);
ticket_tab.back().par_tab.push_back(tic_par);
}
}
catch(const Error & e)
@@ -153,7 +156,6 @@ Error TDb::GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket>
}
ClearResult(r);
file_list.clear();
return status;
}
@@ -171,11 +173,11 @@ Error TDb::AddTicket(const Ticket & ticket)
for(size_t i=0 ; i<ticket.par_tab.size() ; ++i)
{
query.Clear();
query << R("insert into plugins.ticket (file_id, param, int_value, str_value) values (")
query << R("insert into plugins.ticket (file_id, param, intv) values (")
<< ticket.file_id
<< ticket.par_tab[i].param
<< ticket.par_tab[i].int_value
<< ticket.par_tab[i].str_value
<< ticket.par_tab[i].intv
//<< ticket.par_tab[i].decv
<< R(");");
r = AssertQuery(query);