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/functionparser.cpp

@@ -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
@@ -34,10 +34,10 @@
  
 #include "functionparser.h"
 #include "core/log.h"
-#include "core/item.h"
 #include "core/error.h"
 #include "functions.h"
 #include "utf8/utf8.h"
+#include "models/item.h"
 
 
 
@@ -141,17 +141,26 @@ bool FunctionParser::CheckAddItem()
 {
 	// cur->request->dir_tab has at least one element
 	long parent_id = cur->request->dir_tab.back()->id;
-	Error status   = db->GetItem(parent_id, name, cur->request->item);
 	
-	if( status == WINIX_ERR_OK )
+	morm::Finder<Item> finder(model_connector);
+
+	finder.
+		select().
+		where().
+		eq(L"parent_id", parent_id).
+		eq(L"url", name).
+		get(cur->request->item);
+
+	//Error status   = db->GetItem(parent_id, name, cur->request->item);
+	//if( status == WINIX_ERR_OK )
+	if( cur->request->item.found() )
 	{
 		log << log3 << "FP: Item: id: " << cur->request->item.id << ", url: " << cur->request->item.url << logend;
 		cur->request->last_item = &cur->request->item;
 		cur->request->is_item   = true;
 		return true;
 	}
-
-	if( status == WINIX_ERR_NO_ITEM )
+	else
 	{
 		log << log3 << "FP: No Item: url: " << name << logend;
 		cur->request->status = WINIX_ERR_NO_ITEM;