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

winixd/functions/ls.cpp

@@ -61,22 +61,33 @@ void Ls::MakeGet()
 
 	if( !cur->request->is_item )
 	{
-		DbItemQuery iq;
+//		DbItemQuery iq;
+//
+//		iq.sel_content = false;
+//
+//		iq.WhereParentId(cur->request->dir_tab.back()->id);
+//		iq.WhereType(Item::dir, false);
 
-		iq.sel_content = false;
+		morm::Finder<Item> finder(model_connector);
 
-		iq.WhereParentId(cur->request->dir_tab.back()->id);
-		iq.WhereType(Item::dir, false);
+		finder.
+				select().
+				where().
+				eq(L"parent_id", cur->request->dir_tab.back()->id).
+				neq(L"type", static_cast<int>(Item::dir));
 
 		if( cur->request->IsParam(L"ckeditor_browse") )
 		{
-			iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
-			db->GetItems(cur->request->item_tab, iq);
-		}
-		else
-		{
-			db->GetItems(cur->request->item_tab, iq);
+			//iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
+			//db->GetItems(cur->request->item_tab, iq);
+			finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE);
 		}
+//		else
+//		{
+//			//db->GetItems(cur->request->item_tab, iq);
+//		}
+
+		finder.get_vector(cur->request->item_tab);
 	}
 }