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

changed organization of static files

Browse Source 
removed: item.auth item.auth_path
added:   item.file_path, item.file_fs, item.file_type
now the path to a static file is a relative path
added: thumbnails (not finished yet)
fixed: db didn't correctly return the number of deleted items /DelItem() method/




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@696 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-12-10 21:07:01 +00:00
parent 9b29cce1a4
commit 36c8822e6c
41 changed files with 435 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/dir.cpp
View File

@@ -253,8 +253,9 @@ void dir_tab_link(Info & i)
}
static Item dir_last_default_item;
static size_t dir_last_default_item_reqid = 0;
static Item dir_last_default_item;
static size_t dir_last_default_item_reqid = 0;
static std::wstring dir_last_path;
@@ -264,7 +265,6 @@ void dir_last_default_item_init()
return;
dir_last_default_item_reqid = request->id;
dir_last_default_item.Clear();
if( request->dir_tab.empty() )
@@ -275,13 +275,9 @@ void dir_last_default_item_init()
if( default_item == -1 )
return;
std::vector<Item> item_tab; // !! tymczasowo, nie bedzie tego po zmianie interfejsu dla Db
db->GetItem(item_tab, default_item);
if( item_tab.empty() )
return;
dir_last_default_item = item_tab[0];
// !! tutaj nie musimy odczytywac wszystkiego (contentu itp)
if( db->GetItemById(default_item, dir_last_default_item) != WINIX_ERR_OK )
dir_last_default_item.Clear();
}
@@ -289,12 +285,10 @@ void dir_last_default_item_init()
void dir_last_default_item_dir(Info & i)
{
dir_last_default_item_init();
std::wstring path;
if( dir_last_default_item.parent_id != -1 )
if( system->dirs.MakePath(dir_last_default_item.parent_id, path) )
i.out << path;
if( system->dirs.MakePath(dir_last_default_item.parent_id, dir_last_path) )
i.out << dir_last_path;
}

6
templates/doc.cpp
View File

@@ -56,12 +56,6 @@ void doc_base_url(Info & i)
}
void doc_base_url_auth(Info & i)
{
i.out << config->base_url_auth;
}
void doc_base_url_static(Info & i)
{
i.out << config->base_url_static;

17
templates/item.cpp
View File

@@ -169,15 +169,15 @@ void item_link(Info & i)
void item_auth_is_none(Info & i)
void item_filetype_is_none(Info & i)
{
i.res = request->item.auth == Item::auth_none;
i.res = request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
}
void item_auth_is_image(Info & i)
void item_filetype_is_image(Info & i)
{
i.res = request->item.auth == Item::auth_image;
i.res = request->item.file_type == WINIX_ITEM_FILETYPE_IMAGE;
}
@@ -407,15 +407,6 @@ void item_tab_link(Info & i)
}
void item_tab_link_auth(Info & i)
{
if( item_index < request->item_tab.size() )
{
i.out << config->base_url_auth;
item_tab_dir(i);
item_tab_url(i);
}
}
void item_tab_can_read(Info & i)

4
templates/stat.cpp
View File

@@ -19,14 +19,14 @@ namespace TemplatesFunctions
void stat_item_type_is_file(Info & i)
{
i.res = request->is_item && request->item.auth == Item::auth_none;
i.res = request->is_item && request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
}
void stat_item_type_is_static_file(Info & i)
{
i.res = request->is_item && request->item.auth != Item::auth_none;
i.res = request->is_item && request->item.file_type != WINIX_ITEM_FILETYPE_NONE;
}

6
templates/templates.cpp
View File

@@ -186,7 +186,6 @@ void Templates::CreateFunctions()
*/
ezc_functions.Insert("doc_title", doc_title);
ezc_functions.Insert("doc_base_url", doc_base_url);
ezc_functions.Insert("doc_base_url_auth", doc_base_url_auth);
ezc_functions.Insert("doc_base_url_static", doc_base_url_static);
ezc_functions.Insert("doc_base_url_common", doc_base_url_common);
ezc_functions.Insert("doc_current_url", doc_current_url);
@@ -209,8 +208,8 @@ void Templates::CreateFunctions()
ezc_functions.Insert("item_url", item_url);
ezc_functions.Insert("item_url_is", item_url_is);
ezc_functions.Insert("item_link", item_link);
ezc_functions.Insert("item_auth_is_none", item_auth_is_none);
ezc_functions.Insert("item_auth_is_image", item_auth_is_image);
ezc_functions.Insert("item_filetype_is_none", item_filetype_is_none);
ezc_functions.Insert("item_filetype_is_image", item_filetype_is_image);
ezc_functions.Insert("item_can_read", item_can_read);
ezc_functions.Insert("item_can_write", item_can_write);
@@ -240,7 +239,6 @@ void Templates::CreateFunctions()
ezc_functions.Insert("item_tab_dir", item_tab_dir);
ezc_functions.Insert("item_tab_url", item_tab_url);
ezc_functions.Insert("item_tab_link", item_tab_link);
ezc_functions.Insert("item_tab_link_auth", item_tab_link_auth);
ezc_functions.Insert("item_tab_can_read", item_tab_can_read);
ezc_functions.Insert("item_tab_can_write", item_tab_can_write);
ezc_functions.Insert("item_tab_user", item_tab_user);

6
templates/templates.h
View File

@@ -116,7 +116,6 @@ namespace TemplatesFunctions
*/
void doc_title(Info & i);
void doc_base_url(Info & i);
void doc_base_url_auth(Info & i);
void doc_base_url_static(Info & i);
void doc_base_url_common(Info & i);
void doc_current_url(Info & i);
@@ -141,8 +140,8 @@ namespace TemplatesFunctions
void item_url(Info & i);
void item_url_is(Info & i);
void item_link(Info & i);
void item_auth_is_none(Info & i);
void item_auth_is_image(Info & i);
void item_filetype_is_none(Info & i);
void item_filetype_is_image(Info & i);
void item_can_read(Info & i);
void item_can_write(Info & i);
void item_can_remove(Info & i);
@@ -171,7 +170,6 @@ namespace TemplatesFunctions
void item_tab_dir(Info & i);
void item_tab_url(Info & i);
void item_tab_link(Info & i);
void item_tab_link_auth(Info & i);
void item_tab_can_read(Info & i);
void item_tab_can_write(Info & i);
void item_tab_user(Info & i);