added: new winix function: "sort"

sorting items in a directory (Item::sort_index is used) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@754 e52654a7-88a9-db11-a3e9-0013d4bc506e
2011-08-02 00:10:45 +00:00
parent 4d87359aca
commit 3b2a1c3f25
34 changed files with 703 additions and 272 deletions
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -59,7 +59,7 @@ dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 dir.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-dir.o: ../functions/specialdefault.h ../functions/stat.h
+dir.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
 dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 dir.o: ../functions/who.h ../functions/vim.h
@@ -331,10 +331,10 @@ priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h
 priv.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
 priv.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
 priv.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
-priv.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h
-priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
-priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
-priv.o: ../functions/who.h ../functions/vim.h
+priv.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
+priv.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
+priv.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h
 rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -443,10 +443,11 @@ sys.o: ../functions/last.h ../functions/login.h ../functions/logout.h
 sys.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
 sys.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
 sys.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
-sys.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h
-sys.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
-sys.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
-sys.o: ../functions/who.h ../functions/vim.h ../templates/templates.h
+sys.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
+sys.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+sys.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
+sys.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
+sys.o: ../templates/templates.h
 template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
 template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -513,11 +514,11 @@ templates.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 templates.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 templates.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 templates.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-templates.o: ../functions/specialdefault.h ../functions/stat.h
-templates.o: ../functions/subject.h ../functions/template.h
-templates.o: ../functions/tinymce.h ../functions/uname.h
-templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
-templates.o: ../functions/vim.h ../templates/templates.h
+templates.o: ../functions/sort.h ../functions/specialdefault.h
+templates.o: ../functions/stat.h ../functions/subject.h
+templates.o: ../functions/template.h ../functions/tinymce.h
+templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
+templates.o: ../functions/who.h ../functions/vim.h ../templates/templates.h
 upload.o: ../core/request.h templates.h ../../ezc/src/ezc.h
 upload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 upload.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
@@ -655,8 +656,8 @@ winix.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 winix.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 winix.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-winix.o: ../functions/specialdefault.h ../functions/stat.h
-winix.o: ../functions/subject.h ../functions/template.h
+winix.o: ../functions/sort.h ../functions/specialdefault.h
+winix.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 winix.o: ../templates/templates.h ../core/misc.h
--- a/templates/item.cpp
+++ b/templates/item.cpp
@@ -359,6 +359,10 @@ void item_file_size(Info & i)
 	i.res = cur->request->item.file_size;
 }

+void item_sort(Info & i)
+{
+	i.out << cur->request->item.sort_index;
+}



@@ -372,6 +376,12 @@ void item_tab(Info & i)
 }


+void item_tab_index(Info & i)
+{
+	i.out << item_index;
+}
+
+
 void item_tab_id(Info & i)
 {
 	if( item_index < cur->request->item_tab.size() )
@@ -690,6 +700,11 @@ void item_tab_file_size(Info & i)
 		i.out << cur->request->item_tab[item_index].file_size;
 }

+void item_tab_sort(Info & i)
+{
+	if( item_index < cur->request->item_tab.size() )
+		i.out << cur->request->item_tab[item_index].sort_index;
+}

 void item_tab_has_next(Info & i)
 {
--- a/templates/templates.cpp
+++ b/templates/templates.cpp
@@ -261,8 +261,10 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("item_link_to",               item_link_to);
 	ezc_functions.Insert("item_is_link_redirect",      item_is_link_redirect);
 	ezc_functions.Insert("item_file_size",             item_file_size);
+	ezc_functions.Insert("item_sort",                  item_sort);

 	ezc_functions.Insert("item_tab",                   item_tab);
+	ezc_functions.Insert("item_tab_index",             item_tab_index);
 	ezc_functions.Insert("item_tab_id",                item_tab_id);
 	ezc_functions.Insert("item_tab_subject",           item_tab_subject);
 	ezc_functions.Insert("item_tab_subject_noescape",  item_tab_subject_noescape);
@@ -297,6 +299,7 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("item_tab_link_to",           item_tab_link_to);
 	ezc_functions.Insert("item_tab_is_link_redirect",  item_tab_is_link_redirect);
 	ezc_functions.Insert("item_tab_file_size",         item_tab_file_size);
+	ezc_functions.Insert("item_tab_sort",              item_tab_sort);
 	ezc_functions.Insert("item_tab_has_next",          item_tab_has_next);
 	
 		
--- a/templates/templates.h
+++ b/templates/templates.h
@@ -190,8 +190,10 @@ namespace TemplatesFunctions
 	void item_link_to(Info & i);
 	void item_is_link_redirect(Info & i);
 	void item_file_size(Info & i);
+	void item_sort(Info & i);

 	void item_tab(Info & i);
+	void item_tab_index(Info & i);
 	void item_tab_id(Info & i);
 	void item_tab_subject(Info & i);
 	void item_tab_subject_noescape(Info & i);
@@ -226,6 +228,7 @@ namespace TemplatesFunctions
 	void item_tab_link_to(Info & i);
 	void item_tab_is_link_redirect(Info & i);
 	void item_tab_file_size(Info & i);
+	void item_tab_sort(Info & i);
 	void item_tab_has_next(Info & i);


--- a/templates/winix.cpp
+++ b/templates/winix.cpp
@@ -209,7 +209,8 @@ void winix_show_content_in_full_window(Info & i)
 				 cur->request->function == &functions->fun_tinymce		||
 				 cur->request->function == &functions->fun_nicedit		||
 				 cur->request->function == &functions->fun_vim			||
-				 cur->request->function == &functions->fun_emacs );
+				 cur->request->function == &functions->fun_emacs		||
+				 cur->request->function == &functions->fun_upload );
 }