fixed: meta and admin meta information were not saved in memory (in system.dirs)

when 'meta' winix function was used
added: to DbItemsQuery
       sort_index_asc and sort_index_date
       different sort type can be made by 'index' and by 'date'
		     



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1013 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2015-06-16 02:37:07 +00:00
parent f54df8d600
commit 632b49ab90
8 changed files with 34 additions and 16 deletions

View File

@@ -869,6 +869,15 @@ void Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query)
}
void Db::GetItemsQueryOrder(bool sort_asc)
{
if( sort_asc )
query << R(" asc");
else
query << R(" desc");
}
void Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query)
{
if( iq.sel_sort_index || iq.sel_date )
@@ -876,7 +885,10 @@ void Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query)
query << R(" order by");
if( iq.sel_sort_index )
{
query << R(" sort_index");
GetItemsQueryOrder(iq.sort_index_asc);
}
if( iq.sel_date )
{
@@ -884,12 +896,8 @@ void Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query)
query << R(",");
query << R(" item.date_creation");
GetItemsQueryOrder(iq.sort_date_asc);
}
if( iq.sort_asc )
query << R(" asc");
else
query << R(" desc");
}
}