Item class has been moved to a new directory 'models', a new class has been added: ItemContent
and same fields from Item were moved to ItemContent Item - id - parent_id - type (file, dir, symlink) - url - subject - template (html template) - sort_index - content_id ItemContent - id - ref -> references (renamed) - user_id - modification_user_id - group_id - privileges - date_creation - date_modification - guest_name - link_to - link_redirect - file_path - file_fs - file_type - file_size - has_thumb -> file_has_thumb (renamed) - hash -> file_hash (renamed) - hash_type -> file_hash_type (renamed) - content -> content_raw (renamed) - content_type -> content_raw_type (renamed) - content_parsed - content_parsed_type - meta - ameta -> meta_admin (renamed) - modify_index (removed) WIP: #4
This commit is contained in:
122
winixd/db/db.h
122
winixd/db/db.h
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008-2018, Tomasz Sowa
|
||||
* Copyright (c) 2008-2021, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -43,7 +43,7 @@
|
||||
#include "dbbase.h"
|
||||
#include "dbitemquery.h"
|
||||
#include "dbitemcolumns.h"
|
||||
#include "core/item.h"
|
||||
//#include "core/item.h"
|
||||
#include "core/user.h"
|
||||
#include "core/group.h"
|
||||
#include "core/dircontainer.h"
|
||||
@@ -60,12 +60,12 @@ class Db : public DbBase
|
||||
{
|
||||
public:
|
||||
|
||||
// !! przerobic tak aby GetItem zwracalo wszystkie pozycja
|
||||
// !! GetFile tylko dla plikow
|
||||
// !! GetDir tylko dla katalogow
|
||||
// !! GetFile i GetDir beda uzywac GetItem
|
||||
|
||||
Db() : item_cols(*this)
|
||||
// Db() : item_cols(*this)
|
||||
// {
|
||||
// is_postgresql_smaller_than_10 = false;
|
||||
// }
|
||||
|
||||
Db()
|
||||
{
|
||||
is_postgresql_smaller_than_10 = false;
|
||||
}
|
||||
@@ -83,91 +83,91 @@ public:
|
||||
Error ChangeUserTimeZone(long user_id, size_t time_zone_id);
|
||||
Error RemoveUser(long user_id);
|
||||
|
||||
Error AddItem(Item & item);
|
||||
Error EditItemById(Item & item, bool with_url = true);
|
||||
Error EditItemByUrl(Item & item, bool with_url = true);
|
||||
//Error AddItem(Item & item);
|
||||
//Error EditItemById(Item & item, bool with_url = true);
|
||||
//Error EditItemByUrl(Item & item, bool with_url = true);
|
||||
|
||||
|
||||
|
||||
// !! nie zwracac zadnych kodow bledow?
|
||||
void GetItems(std::vector<Item> & item_tab, const DbItemQuery & item_query);
|
||||
void GetItems(std::vector<long> & item_tab, const DbItemQuery & item_query);
|
||||
Error GetItem(Item & item, const DbItemQuery & item_query);
|
||||
//void GetItems(std::vector<Item> & item_tab, const DbItemQuery & item_query);
|
||||
//void GetItems(std::vector<long> & item_tab, const DbItemQuery & item_query);
|
||||
//Error GetItem(Item & item, const DbItemQuery & item_query);
|
||||
|
||||
bool GetPriv(Item & item, long id);
|
||||
Error EditPrivById(Item & item, long id); // !! dlaczego tu nie ma const?
|
||||
Error EditParentUrlById(Item & item, long id);
|
||||
Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type
|
||||
Error EditHasThumbById(bool has_thumb, long id);
|
||||
Error EditMetaById(const PT::Space & meta, long id);
|
||||
Error EditAdminMetaById(const PT::Space & meta, long id);
|
||||
//bool GetPriv(Item & item, long id);
|
||||
//Error EditPrivById(Item & item, long id); // !! dlaczego tu nie ma const?
|
||||
//Error EditParentUrlById(Item & item, long id);
|
||||
//Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type
|
||||
//Error EditHasThumbById(bool has_thumb, long id);
|
||||
//Error EditMetaById(const PT::Space & meta, long id);
|
||||
//Error EditAdminMetaById(const PT::Space & meta, long id);
|
||||
|
||||
Error DelDirById(long id);
|
||||
Error DelFileById(long file_id);
|
||||
Error DelSymlinkById(long symlink_id);
|
||||
//Error DelDirById(long id);
|
||||
//Error DelFileById(long file_id);
|
||||
//Error DelSymlinkById(long symlink_id);
|
||||
|
||||
Error EditSubjectById(Item & item, long id);
|
||||
//Error EditSubjectById(Item & item, long id);
|
||||
|
||||
|
||||
Error DelItem(const Item & item);
|
||||
void GetDirs(DirContainer & dir_tab);
|
||||
//Error DelItem(const Item & item);
|
||||
//void GetDirs(DirContainer & dir_tab);
|
||||
void GetUsers(UGContainer<User> & user_tab);
|
||||
void GetGroups(UGContainer<Group> & group_tab);
|
||||
|
||||
// !! nowy interfejs
|
||||
long Size(long parent_id, Item::Type type = Item::none);
|
||||
//long Size(long parent_id, Item::Type type = Item::none);
|
||||
|
||||
Error GetItemById(long item_id, Item & item);
|
||||
Error GetItem(long parent_id, const std::wstring & url, Item & item);
|
||||
Error EditLinkItem(long id, const std::wstring & link_to, int link_redirect);
|
||||
Error EditTemplateItemById(long id, const std::wstring & new_html_template);
|
||||
//Error GetItemById(long item_id, Item & item);
|
||||
//Error GetItem(long parent_id, const std::wstring & url, Item & item);
|
||||
//Error EditLinkItem(long id, const std::wstring & link_to, int link_redirect);
|
||||
//Error EditTemplateItemById(long id, const std::wstring & new_html_template);
|
||||
|
||||
long GetItemId(long parent_id, const std::wstring & url, Item::Type type);
|
||||
long GetFileId(long parent_id, const std::wstring & url);
|
||||
long GetDirId(long parent_id, const std::wstring & url);
|
||||
//long GetItemId(long parent_id, const std::wstring & url, Item::Type type);
|
||||
//long GetFileId(long parent_id, const std::wstring & url);
|
||||
//long GetDirId(long parent_id, const std::wstring & url);
|
||||
|
||||
Error AddHardLink(Item & item);
|
||||
Error EditSortIndexItemById(long id, int sort_index);
|
||||
//Error AddHardLink(Item & item);
|
||||
//Error EditSortIndexItemById(long id, int sort_index);
|
||||
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
DbTextStream query, query_create_url;
|
||||
std::wstring temp_url;
|
||||
Item dir_temp;
|
||||
Item get_item_temp;
|
||||
std::wstring iq_id_list;
|
||||
DbItemColumns item_cols;
|
||||
//std::wstring temp_url;
|
||||
//Item dir_temp;
|
||||
//Item get_item_temp;
|
||||
//std::wstring iq_id_list;
|
||||
//DbItemColumns item_cols;
|
||||
|
||||
bool is_postgresql_smaller_than_10;
|
||||
std::wstring postgrsql_row_statement;
|
||||
|
||||
bool AddItemCreateUrlSubject(Item & item);
|
||||
//bool AddItemCreateUrlSubject(Item & item);
|
||||
|
||||
Error AddItemIntoContent(Item & item);
|
||||
Error AddItemIntoItem(Item & item);
|
||||
//Error AddItemIntoContent(Item & item);
|
||||
//Error AddItemIntoItem(Item & item);
|
||||
|
||||
Error EditItemInItem(Item & item, bool with_url);
|
||||
Error EditItemInContent(Item & item);
|
||||
Error EditItemGetIdsByUrl(Item & item);
|
||||
long GetContentId(long item_id);
|
||||
//Error EditItemInItem(Item & item, bool with_url);
|
||||
//Error EditItemInContent(Item & item);
|
||||
//Error EditItemGetIdsByUrl(Item & item);
|
||||
//long GetContentId(long item_id);
|
||||
|
||||
|
||||
Error DelItemDelItem(long item_id, int type);
|
||||
Error DelItemDelContent(long content_id);
|
||||
//Error DelItemDelItem(long item_id, int type);
|
||||
//Error DelItemDelContent(long content_id);
|
||||
|
||||
Error IncrementContentRef(long content_id);
|
||||
Error DecrementContentRef(long content_id);
|
||||
//Error IncrementContentRef(long content_id);
|
||||
//Error DecrementContentRef(long content_id);
|
||||
|
||||
void GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel);
|
||||
void GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query);
|
||||
void GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query);
|
||||
void GetItemsQueryOrder(bool sort_asc);
|
||||
void GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query);
|
||||
void GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query);
|
||||
PGresult * GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel = false);
|
||||
PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false);
|
||||
//void GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel);
|
||||
//void GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query);
|
||||
//void GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query);
|
||||
//void GetItemsQueryOrder(bool sort_asc);
|
||||
//void GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query);
|
||||
//void GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query);
|
||||
//PGresult * GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel = false);
|
||||
//PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false);
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user