methods eq() from finder can have now a table name
This commit is contained in:
parent
6d07535dad
commit
4df10de6b7
|
@ -61,6 +61,7 @@ bool ImgCrop::HasAccess()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ImgCrop::GetDirContent()
|
void ImgCrop::GetDirContent()
|
||||||
{
|
{
|
||||||
// iq.sel_type = Item::file;
|
// iq.sel_type = Item::file;
|
||||||
|
@ -76,7 +77,7 @@ void ImgCrop::GetDirContent()
|
||||||
where().
|
where().
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE).
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_IMAGE).
|
||||||
get_vector();
|
get_vector();
|
||||||
|
|
||||||
//db->GetItems(cur->request->item_tab, iq);
|
//db->GetItems(cur->request->item_tab, iq);
|
||||||
|
|
|
@ -80,7 +80,7 @@ void Ls::MakeGet()
|
||||||
{
|
{
|
||||||
//iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
|
//iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
|
||||||
//db->GetItems(cur->request->item_tab, iq);
|
//db->GetItems(cur->request->item_tab, iq);
|
||||||
finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE);
|
finder.eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_IMAGE);
|
||||||
}
|
}
|
||||||
// else
|
// else
|
||||||
// {
|
// {
|
||||||
|
|
|
@ -362,7 +362,7 @@ void Upload::MakeGet()
|
||||||
where().
|
where().
|
||||||
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
neq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
|
neq(L"content", L"file_type", WINIX_ITEM_FILETYPE_NONE).
|
||||||
get_vector(cur->request->item_tab);
|
get_vector(cur->request->item_tab);
|
||||||
|
|
||||||
//db->GetItems(cur->request->item_tab, query);
|
//db->GetItems(cur->request->item_tab, query);
|
||||||
|
|
|
@ -315,7 +315,7 @@ void ExportInfo::SendAllFilesFromDir(long dir_id)
|
||||||
where().
|
where().
|
||||||
eq(L"parent_id", dir_id).
|
eq(L"parent_id", dir_id).
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_NONE).
|
||||||
get_vector(dir_items);
|
get_vector(dir_items);
|
||||||
|
|
||||||
//db->GetItems(dir_items, iq_dir);
|
//db->GetItems(dir_items, iq_dir);
|
||||||
|
|
|
@ -105,7 +105,7 @@ void FunExport::ExportDir(const Item & dir, bool static_files_too)
|
||||||
if( !static_files_too )
|
if( !static_files_too )
|
||||||
{
|
{
|
||||||
//iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
|
//iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
|
||||||
finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE);
|
finder.eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
finder.get_vector(dir_items);
|
finder.get_vector(dir_items);
|
||||||
|
|
|
@ -98,7 +98,7 @@ void Gallery::MakeGetDir()
|
||||||
select().
|
select().
|
||||||
where().
|
where().
|
||||||
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE).
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_IMAGE).
|
||||||
get_vector(gallery_info->item_tab);
|
get_vector(gallery_info->item_tab);
|
||||||
|
|
||||||
//db->GetItems(gallery_info->item_tab, iq);
|
//db->GetItems(gallery_info->item_tab, iq);
|
||||||
|
|
|
@ -130,7 +130,7 @@ void read_from_db(long dir_id, int param, bool with_meta)
|
||||||
|
|
||||||
finder.
|
finder.
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE);
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_IMAGE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if( param == WINIX_PL_MENU_PARAM_DIRS )
|
if( param == WINIX_PL_MENU_PARAM_DIRS )
|
||||||
|
|
|
@ -99,7 +99,7 @@ void FunThread::PrepareThread(long file_id)
|
||||||
where().
|
where().
|
||||||
in(L"id", id_tab).
|
in(L"id", id_tab).
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_NONE).
|
||||||
get_vector();
|
get_vector();
|
||||||
|
|
||||||
if( system->mounts.pmount->IsArg(thread_info->mount_par_thread, L"sort_desc") )
|
if( system->mounts.pmount->IsArg(thread_info->mount_par_thread, L"sort_desc") )
|
||||||
|
|
|
@ -120,7 +120,7 @@ void ShowThreads::ReadFiles()
|
||||||
where().
|
where().
|
||||||
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
eq(L"parent_id", cur->request->dir_tab.back()->id).
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_NONE).
|
||||||
get_vector();
|
get_vector();
|
||||||
|
|
||||||
//db->GetItems(thread_info->item_tab, iq);
|
//db->GetItems(thread_info->item_tab, iq);
|
||||||
|
|
|
@ -122,7 +122,7 @@ void ShowTickets::ReadFiles(long dir_id)
|
||||||
where().
|
where().
|
||||||
eq(L"parent_id", dir_id).
|
eq(L"parent_id", dir_id).
|
||||||
eq(L"type", static_cast<int>(Item::file)).
|
eq(L"type", static_cast<int>(Item::file)).
|
||||||
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
|
eq(L"content", L"file_type", WINIX_ITEM_FILETYPE_NONE).
|
||||||
get_vector(ticket_info->item_tab);
|
get_vector(ticket_info->item_tab);
|
||||||
|
|
||||||
//db->GetItems(ticket_info->item_tab, iq);
|
//db->GetItems(ticket_info->item_tab, iq);
|
||||||
|
|
Loading…
Reference in New Issue