add support for serializing to xml

winixd/core/app.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2022, Tomasz Sowa
+ * Copyright (c) 2010-2023, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -768,9 +768,6 @@ void App::ProcessRequest()
 {
 	try
 	{
-		cur.request->set_connector(model_connector);
-		model_connector.set_winix_request(cur.request);
-
 		system.load_avg.StartRequest(cur.request);
 		log << log2 << config.log_delimiter << logend;
 
@@ -852,6 +849,9 @@ bool App::InitializeRequestForFastCGI(Request & request)
 
 void App::SetRequestDependency(Request & request)
 {
+	request.set_json_connector(&json_connector);
+	request.set_xml_connector(&xml_connector);
+
 	request.SetConfig(&config);
 	request.SetTemplates(&templates);
 	request.SetCompress(&compress);
@@ -918,6 +918,12 @@ void App::Start()
 		cur.request = &system.req_tab.back(); // cur.request could have been changed by the job (we have at least one object in req_tab)
 		cur.session = session_manager.GetTmpSession();
 		cur.mount   = system.mounts.GetEmptyMount();
+
+		model_connector.set_flat_connector(json_connector);
+		model_connector.set_winix_request(cur.request);
+		xml_connector.set_putting_doctype(false);
+		xml_connector.set_putting_root_element(false);
+
 		cur.request->session = cur.session;
 		cur.request->mount = cur.mount;
 		cur.request->run_state = Request::RunState::normal_run;
@@ -949,6 +955,7 @@ void App::Start()
 		if( do_process_request )
 		{
 			ProcessRequest();
+			model_connector.set_flat_connector(json_connector); // the flat connector could have been changed
 
 			if( cur.request->run_state == Request::RunState::assigned_to_job )
 			{

winixd/core/app.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2022, Tomasz Sowa
+ * Copyright (c) 2010-2023, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -146,6 +146,7 @@ private:
 
 	WinixModelConnector model_connector; // main thread model connector, each thread has its own connector
 	morm::JSONConnector json_connector;
+	morm::XMLConnector xml_connector;
 	morm::PostgreSQLConnector postgresql_connector;
 
 	// objects for main thread

winixd/core/job.cpp

@@ -359,7 +359,7 @@ void Job::DoRequestContinuationJob(JobTask & job_task, size_t priority)
 
 	if( cur->request->run_state != Request::RunState::assigned_to_job )
 	{
-		cur->request->FinishRequest(); // jak cur->request->function bedzie null to nie zadzialaja funkcje templajtowe
+		cur->request->FinishRequest(); // if cur->request->function were null then templates functions would not work
 		load_avg->StopRequest(cur->request);
 		cur->request->Clear();
 		cur->request->run_state = Request::RunState::finished;

winixd/core/request.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2022, Tomasz Sowa
+ * Copyright (c) 2008-2023, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,9 @@ Request::Request()
 	plugin = nullptr;
 	mounts = nullptr;
 
+	json_connector = nullptr;
+	xml_connector = nullptr;
+
 	// set function to nullptr because is used in Clear()
 	function = nullptr;
 }
@@ -111,6 +114,18 @@ void Request::SetMounts(Mounts * mounts)
 }
 
 
+void Request::set_json_connector(morm::JSONConnector * json_connector)
+{
+	this->json_connector = json_connector;
+}
+
+
+void Request::set_xml_connector(morm::XMLConnector * xml_connector)
+{
+	this->xml_connector = xml_connector;
+}
+
+
 
 void Request::ClearOutputStreams()
 {
@@ -933,7 +948,7 @@ void Request::PrepareJsonAnswer()
 
 void Request::PrepareXmlAnswer()
 {
-	output_8bit << '<';
+	output_8bit << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><";
 	pt::esc_to_xml(config->xml_root, output_8bit);
 	output_8bit << '>';
 
@@ -982,8 +997,10 @@ void Request::PrepareContenerizedAnswer()
 	if( send_all_frames || !send_frames.empty() )
 	{
 		PutSeparatorIfNeeded(put_separator);
-		SerializeFieldJson(config->ezc_frames_field.c_str());
+		SerializeField(config->ezc_frames_field.c_str());
-		output_8bit << "{";
+
+		if( container_type == Request::ContainerType::container_json )
+			output_8bit << '{';
 
 		if( send_all_frames )
 		{
@@ -995,7 +1012,10 @@ void Request::PrepareContenerizedAnswer()
 			SerializeSpecificFrames();
 		}
 
-		output_8bit << "}";
+		if( container_type == Request::ContainerType::container_json )
+			output_8bit << '}';
+
+		SerializeClosingField(config->ezc_frames_field.c_str());
 		put_separator = true;
 	}
 }
@@ -1008,14 +1028,14 @@ void Request::PutSeparatorIfNeeded(bool put_separator)
 		switch( container_type )
 		{
 		case Request::ContainerType::container_json:
-			output_8bit << ",";
+			output_8bit << ',';
 			break;
 
 		case Request::ContainerType::container_xml:
 			break;
 
 		case Request::ContainerType::container_csv:
-			output_8bit << ";";
+			output_8bit << ';';
 			break;
 
 		case Request::ContainerType::container_raw:
@@ -1026,6 +1046,50 @@ void Request::PutSeparatorIfNeeded(bool put_separator)
 }
 
 
+void Request::SerializeField(const wchar_t * field_name)
+{
+	switch( container_type )
+	{
+	case Request::ContainerType::container_json:
+		SerializeFieldJson(field_name);
+		break;
+
+	case Request::ContainerType::container_xml:
+		SerializeFieldXml(field_name);
+		break;
+
+	case Request::ContainerType::container_csv:
+		SerializeFieldCsv(field_name);
+		break;
+
+	case Request::ContainerType::container_raw:
+	default:
+		break;
+	}
+}
+
+
+void Request::SerializeClosingField(const wchar_t * field_name)
+{
+	switch( container_type )
+	{
+	case Request::ContainerType::container_json:
+		break;
+
+	case Request::ContainerType::container_xml:
+		SerializeClosingFieldXml(field_name);
+		break;
+
+	case Request::ContainerType::container_csv:
+		break;
+
+	case Request::ContainerType::container_raw:
+	default:
+		break;
+	}
+}
+
+
 void Request::SerializeFieldJson(const wchar_t * field_name)
 {
 	if( field_name )
@@ -1037,6 +1101,33 @@ void Request::SerializeFieldJson(const wchar_t * field_name)
 }
 
 
+void Request::SerializeFieldXml(const wchar_t * field_name)
+{
+	if( field_name )
+	{
+		output_8bit << '<';
+		pt::esc_to_xml(field_name, output_8bit);
+		output_8bit << '>';
+	}
+}
+
+
+void Request::SerializeClosingFieldXml(const wchar_t * field_name)
+{
+	if( field_name )
+	{
+		output_8bit << "</";
+		pt::esc_to_xml(field_name, output_8bit);
+		output_8bit << '>';
+	}
+}
+
+
+void Request::SerializeFieldCsv(const wchar_t * field_name)
+{
+	// IMPLEMENTME
+}
+
 
 void Request::SerializeStream(const pt::WTextStream & input_stream, const wchar_t * field_name)
 {
@@ -1141,10 +1232,7 @@ void Request::SerializeAllFrames()
 
 	for( ; i != out_streams.streams_map.end() ; ++i)
 	{
-		if( container_type == Request::ContainerType::container_json && !is_first )
+		PutSeparatorIfNeeded(!is_first);
-		{
-			output_8bit << ',';
-		}
 
 		if( container_type == Request::ContainerType::container_xml && i->first.empty() )
 		{
@@ -1175,11 +1263,7 @@ void Request::SerializeSpecificFrames()
 
 		if( i != out_streams.streams_map.end() )
 		{
-			if( container_type == Request::ContainerType::container_json && !is_first )
+			PutSeparatorIfNeeded(!is_first);
-			{
-				output_8bit << ',';
-			}
-
 			SerializeStream(i->second->get_buffer(), frame.c_str());
 			is_first = false;
 		}
@@ -1204,10 +1288,7 @@ void Request::SerializeModels()
 
 	for( ; i != models_map.end() ; ++i)
 	{
-		if( container_type == Request::ContainerType::container_json && !is_first )
+		PutSeparatorIfNeeded(!is_first);
-		{
-			output_8bit << ',';
-		}
 
 		if( container_type == Request::ContainerType::container_xml && i->first.empty() )
 		{
@@ -1303,13 +1384,60 @@ void Request::SerializeModelJson(morm::Wrapper & wrapper, const wchar_t * field_
 
 void Request::SerializeModelXml(morm::Wrapper & wrapper, const wchar_t * field_name)
 {
-	// 	IMPROVEME
+	SerializeFieldXml(field_name);
-	Log * plog = get_logger();
 
-	if( plog )
+	if( wrapper.model )
 	{
-		(*plog) << log2 << "Request: serializing models to xml not implemented yet" << logend;
+		serialized_model.clear();
+		wrapper.model->set_connector(model_connector);
+		model_connector->set_flat_connector(*xml_connector);
+		wrapper.model->to_text(serialized_model);
+		model_connector->set_flat_connector(*json_connector);
+		output_8bit << serialized_model;
 	}
+
+	if( wrapper.date )
+	{
+		output_8bit << "<date>";
+		wrapper.date->SerializeISO(output_8bit);
+		output_8bit << "</date>";
+	}
+
+	if( wrapper.space_wrapper )
+	{
+		serialized_model.clear();
+		wrapper.space_wrapper->get_space()->serialize_to_json_stream(serialized_model, false);
+		pt::TextStream::iterator i = serialized_model.begin();
+
+		for( ; i != serialized_model.end() ; ++i)
+		{
+			pt::esc_to_xml(*i, output_8bit);
+		}
+	}
+
+	if( wrapper.model_container_wrapper )
+	{
+		wrapper.model_container_wrapper->set_iterator_at_first_model();
+		size_t index = 0;
+
+		while( wrapper.model_container_wrapper->is_iterator_correct() )
+		{
+			output_8bit << "<item index=\"" << index << "\">";
+			morm::Model * model = wrapper.model_container_wrapper->get_model();
+			serialized_model.clear();
+			model->set_connector(model_connector);
+			model_connector->set_flat_connector(*xml_connector);
+			model->to_text(serialized_model);
+			model_connector->set_flat_connector(*json_connector);
+			output_8bit << serialized_model;
+
+			wrapper.model_container_wrapper->increment_iterator();
+			output_8bit << "</item>";
+			index += 1;
+		}
+	}
+
+	SerializeClosingFieldXml(field_name);
 }
 
 

winixd/core/request.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2022, Tomasz Sowa
+ * Copyright (c) 2008-2023, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -457,6 +457,8 @@ public:
 	void SetPlugin(Plugin * plugin);
 	void SetMounts(Mounts * mounts);
 
+	void set_json_connector(morm::JSONConnector * json_connector);
+	void set_xml_connector(morm::XMLConnector * xml_connector);
 
 	void fields();
 
@@ -544,6 +546,9 @@ private:
 	Plugin * plugin;
 	Mounts * mounts;
 
+	morm::JSONConnector * json_connector;
+	morm::XMLConnector * xml_connector;
+
 	BinaryPage output_8bit;
 	BinaryPage compressed_output;
 	pt::WTextStream output_tmp_filtered_stream;
@@ -578,7 +583,12 @@ private:
 	void PrepareCsvAnswer();
 	void PrepareContenerizedAnswer();
 	void PutSeparatorIfNeeded(bool put_separator);
+	void SerializeField(const wchar_t * field_name);
+	void SerializeClosingField(const wchar_t * field_name);
 	void SerializeFieldJson(const wchar_t * field_name);
+	void SerializeFieldXml(const wchar_t * field_name);
+	void SerializeClosingFieldXml(const wchar_t * field_name);
+	void SerializeFieldCsv(const wchar_t * field_name);
 	void SerializeStream(const pt::WTextStream & input_stream, const wchar_t * field_name);
 	void SerializeStreamJson(const pt::WTextStream & input_stream, const wchar_t * field_name);
 	void SerializeStreamXml(const pt::WTextStream & input_stream, const wchar_t * field_name);

winixd/plugins/export/Makefile.dep

@@ -54,9 +54,11 @@
 ./edb.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./edb.o: ../../../../morm/src/postgresqlexpression.h
+./edb.o: ../../../../morm/src/xmlexpression.h
 ./edb.o: ../../../../morm/src/jsonconnector.h
 ./edb.o: ../../../../morm/src/postgresqlconnector.h
 ./edb.o: ../../../../morm/src/postgresqlqueryresult.h
+./edb.o: ../../../../morm/src/xmlconnector.h
 ./edb.o: ../../../../morm/src/transaction.h
 ./edb.o: ../../../../winix/winixd/core/log.h
 ./edb.o: ../../../../winix/winixd/core/synchro.h
@@ -157,9 +159,11 @@
 ./exportinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./exportinfo.o: ../../../../morm/src/jsonexpression.h
 ./exportinfo.o: ../../../../morm/src/postgresqlexpression.h
+./exportinfo.o: ../../../../morm/src/xmlexpression.h
 ./exportinfo.o: ../../../../morm/src/jsonconnector.h
 ./exportinfo.o: ../../../../morm/src/postgresqlconnector.h
 ./exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h
+./exportinfo.o: ../../../../morm/src/xmlconnector.h
 ./exportinfo.o: ../../../../morm/src/transaction.h
 ./exportinfo.o: ../../../../winix/winixd/core/synchro.h
 ./exportinfo.o: ../../../../winix/winixd/core/filelog.h
@@ -324,9 +328,11 @@
 ./funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./funexport.o: ../../../../morm/src/jsonexpression.h
 ./funexport.o: ../../../../morm/src/postgresqlexpression.h
+./funexport.o: ../../../../morm/src/xmlexpression.h
 ./funexport.o: ../../../../morm/src/jsonconnector.h
 ./funexport.o: ../../../../morm/src/postgresqlconnector.h
 ./funexport.o: ../../../../morm/src/postgresqlqueryresult.h
+./funexport.o: ../../../../morm/src/xmlconnector.h
 ./funexport.o: ../../../../morm/src/transaction.h
 ./funexport.o: ../../../../winix/winixd/core/log.h
 ./funexport.o: ../../../../winix/winixd/core/synchro.h
@@ -467,9 +473,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
 ./init.o: ../../../../winix/winixd/core/filelog.h

winixd/plugins/gallery/Makefile.dep

@@ -60,9 +60,11 @@
 ./gallery.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./gallery.o: ../../../../morm/src/jsonexpression.h
 ./gallery.o: ../../../../morm/src/postgresqlexpression.h
+./gallery.o: ../../../../morm/src/xmlexpression.h
 ./gallery.o: ../../../../morm/src/jsonconnector.h
 ./gallery.o: ../../../../morm/src/postgresqlconnector.h
 ./gallery.o: ../../../../morm/src/postgresqlqueryresult.h
+./gallery.o: ../../../../morm/src/xmlconnector.h
 ./gallery.o: ../../../../morm/src/transaction.h
 ./gallery.o: ../../../../winix/winixd/core/log.h
 ./gallery.o: ../../../../winix/winixd/core/synchro.h
@@ -202,9 +204,11 @@
 ./galleryinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./galleryinfo.o: ../../../../morm/src/jsonexpression.h
 ./galleryinfo.o: ../../../../morm/src/postgresqlexpression.h
+./galleryinfo.o: ../../../../morm/src/xmlexpression.h
 ./galleryinfo.o: ../../../../morm/src/jsonconnector.h
 ./galleryinfo.o: ../../../../morm/src/postgresqlconnector.h
 ./galleryinfo.o: ../../../../morm/src/postgresqlqueryresult.h
+./galleryinfo.o: ../../../../morm/src/xmlconnector.h
 ./galleryinfo.o: ../../../../morm/src/transaction.h
 ./galleryinfo.o: ../../../../winix/winixd/core/synchro.h
 ./galleryinfo.o: ../../../../winix/winixd/core/filelog.h
@@ -276,9 +280,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/log.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
@@ -472,9 +478,11 @@
 ./templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/log.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h

winixd/plugins/group/Makefile.dep

@@ -134,8 +134,10 @@
 #	finder.h
 #	jsonexpression.h
 #	postgresqlexpression.h
+#	xmlexpression.h
 #	jsonconnector.h
 #	postgresqlconnector.h
+#	xmlconnector.h
 #	modelconnector.h
 #	clearer.h
 #	transaction.h
@@ -245,6 +247,9 @@
 ./groupinfo.o: ../../../../morm/src/postgresqlexpression.h
 # ../../../../morm/src/postgresqlexpression.h includes:
 #	dbexpression.h
+./groupinfo.o: ../../../../morm/src/xmlexpression.h
+# ../../../../morm/src/xmlexpression.h includes:
+#	flatexpression.h
 ./groupinfo.o: ../../../../morm/src/jsonconnector.h
 # ../../../../morm/src/jsonconnector.h includes:
 #	flatconnector.h
@@ -255,6 +260,9 @@
 ./groupinfo.o: ../../../../morm/src/postgresqlqueryresult.h
 # ../../../../morm/src/postgresqlqueryresult.h includes:
 #	queryresult.h
+./groupinfo.o: ../../../../morm/src/xmlconnector.h
+# ../../../../morm/src/xmlconnector.h includes:
+#	flatconnector.h
 ./groupinfo.o: ../../../../morm/src/transaction.h
 # ../../../../morm/src/transaction.h includes:
 #	log/log.h
@@ -685,9 +693,11 @@
 ./groups.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./groups.o: ../../../../morm/src/jsonexpression.h
 ./groups.o: ../../../../morm/src/postgresqlexpression.h
+./groups.o: ../../../../morm/src/xmlexpression.h
 ./groups.o: ../../../../morm/src/jsonconnector.h
 ./groups.o: ../../../../morm/src/postgresqlconnector.h
 ./groups.o: ../../../../morm/src/postgresqlqueryresult.h
+./groups.o: ../../../../morm/src/xmlconnector.h
 ./groups.o: ../../../../morm/src/transaction.h
 ./groups.o: ../../../../winix/winixd/core/log.h
 ./groups.o: ../../../../winix/winixd/core/synchro.h
@@ -823,9 +833,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
 ./init.o: ../../../../winix/winixd/core/filelog.h
@@ -1204,9 +1216,11 @@
 ./templates.o: ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/log.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h

winixd/plugins/mailregister/Makefile.dep

@@ -65,9 +65,11 @@
 ./funregistermail.o: ../../../../morm/src/cursor.h
 ./funregistermail.o: ../../../../morm/src/jsonexpression.h
 ./funregistermail.o: ../../../../morm/src/postgresqlexpression.h
+./funregistermail.o: ../../../../morm/src/xmlexpression.h
 ./funregistermail.o: ../../../../morm/src/jsonconnector.h
 ./funregistermail.o: ../../../../morm/src/postgresqlconnector.h
 ./funregistermail.o: ../../../../morm/src/postgresqlqueryresult.h
+./funregistermail.o: ../../../../morm/src/xmlconnector.h
 ./funregistermail.o: ../../../../morm/src/transaction.h
 ./funregistermail.o: ../../../../winix/winixd/core/log.h
 ./funregistermail.o: ../../../../winix/winixd/core/synchro.h
@@ -224,9 +226,11 @@
 ./funregistermail_showusers.o: ../../../../morm/src/cursor.h
 ./funregistermail_showusers.o: ../../../../morm/src/jsonexpression.h
 ./funregistermail_showusers.o: ../../../../morm/src/postgresqlexpression.h
+./funregistermail_showusers.o: ../../../../morm/src/xmlexpression.h
 ./funregistermail_showusers.o: ../../../../morm/src/jsonconnector.h
 ./funregistermail_showusers.o: ../../../../morm/src/postgresqlconnector.h
 ./funregistermail_showusers.o: ../../../../morm/src/postgresqlqueryresult.h
+./funregistermail_showusers.o: ../../../../morm/src/xmlconnector.h
 ./funregistermail_showusers.o: ../../../../morm/src/transaction.h
 ./funregistermail_showusers.o: ../../../../winix/winixd/core/log.h
 ./funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h
@@ -365,9 +369,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
 ./init.o: ../../../../winix/winixd/core/filelog.h
@@ -581,9 +587,11 @@
 ./templates.o: ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/log.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h

winixd/plugins/menu/Makefile.dep

@@ -46,9 +46,11 @@
 ./cache.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./cache.o: ../../../../morm/src/jsonexpression.h
 ./cache.o: ../../../../morm/src/postgresqlexpression.h
+./cache.o: ../../../../morm/src/xmlexpression.h
 ./cache.o: ../../../../morm/src/jsonconnector.h
 ./cache.o: ../../../../morm/src/postgresqlconnector.h
 ./cache.o: ../../../../morm/src/postgresqlqueryresult.h
+./cache.o: ../../../../morm/src/xmlconnector.h
 ./cache.o: ../../../../morm/src/transaction.h
 ./cache.o: ../../../../winix/winixd/core/log.h
 ./cache.o: ../../../../winix/winixd/core/synchro.h
@@ -146,9 +148,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/mount.h cache.h
 ./init.o: ../../../../winix/winixd/core/dirs.h
@@ -347,9 +351,11 @@
 ./templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/log.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h

winixd/plugins/seo/Makefile.dep

@@ -56,9 +56,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/log.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
@@ -246,9 +248,11 @@
 ./seo.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./seo.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./seo.o: ../../../../morm/src/postgresqlexpression.h
+./seo.o: ../../../../morm/src/xmlexpression.h
 ./seo.o: ../../../../morm/src/jsonconnector.h
 ./seo.o: ../../../../morm/src/postgresqlconnector.h
 ./seo.o: ../../../../morm/src/postgresqlqueryresult.h
+./seo.o: ../../../../morm/src/xmlconnector.h
 ./seo.o: ../../../../morm/src/transaction.h
 ./seo.o: ../../../../winix/winixd/core/log.h
 ./seo.o: ../../../../winix/winixd/core/synchro.h

winixd/plugins/stats/Makefile.dep

@@ -37,9 +37,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/request.h
 ./init.o: ../../../../winix/winixd/core/requesttypes.h
@@ -149,9 +151,11 @@
 ./stats.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./stats.o: ../../../../morm/src/jsonexpression.h
 ./stats.o: ../../../../morm/src/postgresqlexpression.h
+./stats.o: ../../../../morm/src/xmlexpression.h
 ./stats.o: ../../../../morm/src/jsonconnector.h
 ./stats.o: ../../../../morm/src/postgresqlconnector.h
 ./stats.o: ../../../../morm/src/postgresqlqueryresult.h
+./stats.o: ../../../../morm/src/xmlconnector.h
 ./stats.o: ../../../../morm/src/transaction.h
 ./templates.o: templates.h ../../../../winix/winixd/core/plugin.h
 ./templates.o: ../../../../ezc/src/ezc.h ../../../../morm/src/version.h
@@ -223,9 +227,11 @@
 ./templates.o: ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h
 ./templates.o: ../../../../winix/winixd/core/filelog.h

winixd/plugins/thread/Makefile.dep

@@ -63,9 +63,11 @@
 ./createthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./createthread.o: ../../../../morm/src/jsonexpression.h
 ./createthread.o: ../../../../morm/src/postgresqlexpression.h
+./createthread.o: ../../../../morm/src/xmlexpression.h
 ./createthread.o: ../../../../morm/src/jsonconnector.h
 ./createthread.o: ../../../../morm/src/postgresqlconnector.h
 ./createthread.o: ../../../../morm/src/postgresqlqueryresult.h
+./createthread.o: ../../../../morm/src/xmlconnector.h
 ./createthread.o: ../../../../morm/src/transaction.h
 ./createthread.o: ../../../../winix/winixd/core/log.h
 ./createthread.o: ../../../../winix/winixd/core/synchro.h
@@ -261,9 +263,11 @@
 ./funthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./funthread.o: ../../../../morm/src/jsonexpression.h
 ./funthread.o: ../../../../morm/src/postgresqlexpression.h
+./funthread.o: ../../../../morm/src/xmlexpression.h
 ./funthread.o: ../../../../morm/src/jsonconnector.h
 ./funthread.o: ../../../../morm/src/postgresqlconnector.h
 ./funthread.o: ../../../../morm/src/postgresqlqueryresult.h
+./funthread.o: ../../../../morm/src/xmlconnector.h
 ./funthread.o: ../../../../morm/src/transaction.h
 ./funthread.o: ../../../../winix/winixd/core/log.h
 ./funthread.o: ../../../../winix/winixd/core/synchro.h
@@ -402,9 +406,11 @@
 ./init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./init.o: ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
 ./init.o: ../../../../winix/winixd/core/filelog.h
@@ -603,9 +609,11 @@
 ./reply.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./reply.o: ../../../../morm/src/jsonexpression.h
 ./reply.o: ../../../../morm/src/postgresqlexpression.h
+./reply.o: ../../../../morm/src/xmlexpression.h
 ./reply.o: ../../../../morm/src/jsonconnector.h
 ./reply.o: ../../../../morm/src/postgresqlconnector.h
 ./reply.o: ../../../../morm/src/postgresqlqueryresult.h
+./reply.o: ../../../../morm/src/xmlconnector.h
 ./reply.o: ../../../../morm/src/transaction.h
 ./reply.o: ../../../../winix/winixd/core/log.h
 ./reply.o: ../../../../winix/winixd/core/synchro.h
@@ -801,9 +809,11 @@
 ./showthreads.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./showthreads.o: ../../../../morm/src/jsonexpression.h
 ./showthreads.o: ../../../../morm/src/postgresqlexpression.h
+./showthreads.o: ../../../../morm/src/xmlexpression.h
 ./showthreads.o: ../../../../morm/src/jsonconnector.h
 ./showthreads.o: ../../../../morm/src/postgresqlconnector.h
 ./showthreads.o: ../../../../morm/src/postgresqlqueryresult.h
+./showthreads.o: ../../../../morm/src/xmlconnector.h
 ./showthreads.o: ../../../../morm/src/transaction.h
 ./showthreads.o: ../../../../winix/winixd/core/log.h
 ./showthreads.o: ../../../../winix/winixd/core/synchro.h
@@ -940,9 +950,11 @@
 ./tdb.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./tdb.o: ../../../../morm/src/jsonexpression.h
 ./tdb.o: ../../../../morm/src/postgresqlexpression.h
+./tdb.o: ../../../../morm/src/xmlexpression.h
 ./tdb.o: ../../../../morm/src/jsonconnector.h
 ./tdb.o: ../../../../morm/src/postgresqlconnector.h
 ./tdb.o: ../../../../morm/src/postgresqlqueryresult.h
+./tdb.o: ../../../../morm/src/xmlconnector.h
 ./tdb.o: ../../../../morm/src/transaction.h
 ./tdb.o: ../../../../winix/winixd/core/synchro.h
 ./tdb.o: ../../../../winix/winixd/core/filelog.h
@@ -1017,9 +1029,11 @@
 ./templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/log.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h
@@ -1218,9 +1232,11 @@
 ./thread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./thread.o: ../../../../morm/src/jsonexpression.h
 ./thread.o: ../../../../morm/src/postgresqlexpression.h
+./thread.o: ../../../../morm/src/xmlexpression.h
 ./thread.o: ../../../../morm/src/jsonconnector.h
 ./thread.o: ../../../../morm/src/postgresqlconnector.h
 ./thread.o: ../../../../morm/src/postgresqlqueryresult.h
+./thread.o: ../../../../morm/src/xmlconnector.h
 ./thread.o: ../../../../morm/src/transaction.h
 ./thread.o: ../../../../winix/winixd/core/synchro.h
 ./thread.o: ../../../../winix/winixd/core/filelog.h
@@ -1329,9 +1345,11 @@
 ./threadinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./threadinfo.o: ../../../../morm/src/jsonexpression.h
 ./threadinfo.o: ../../../../morm/src/postgresqlexpression.h
+./threadinfo.o: ../../../../morm/src/xmlexpression.h
 ./threadinfo.o: ../../../../morm/src/jsonconnector.h
 ./threadinfo.o: ../../../../morm/src/postgresqlconnector.h
 ./threadinfo.o: ../../../../morm/src/postgresqlqueryresult.h
+./threadinfo.o: ../../../../morm/src/xmlconnector.h
 ./threadinfo.o: ../../../../morm/src/transaction.h
 ./threadinfo.o: ../../../../winix/winixd/core/log.h
 ./threadinfo.o: ../../../../winix/winixd/core/synchro.h

winixd/plugins/ticket/Makefile.dep

@@ -61,9 +61,11 @@
 ./createticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./createticket.o: ../../../../morm/src/jsonexpression.h
 ./createticket.o: ../../../../morm/src/postgresqlexpression.h
+./createticket.o: ../../../../morm/src/xmlexpression.h
 ./createticket.o: ../../../../morm/src/jsonconnector.h
 ./createticket.o: ../../../../morm/src/postgresqlconnector.h
 ./createticket.o: ../../../../morm/src/postgresqlqueryresult.h
+./createticket.o: ../../../../morm/src/xmlconnector.h
 ./createticket.o: ../../../../morm/src/transaction.h
 ./createticket.o: ../../../../winix/winixd/core/log.h
 ./createticket.o: ../../../../winix/winixd/core/synchro.h
@@ -262,9 +264,11 @@
 ./editticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./editticket.o: ../../../../morm/src/jsonexpression.h
 ./editticket.o: ../../../../morm/src/postgresqlexpression.h
+./editticket.o: ../../../../morm/src/xmlexpression.h
 ./editticket.o: ../../../../morm/src/jsonconnector.h
 ./editticket.o: ../../../../morm/src/postgresqlconnector.h
 ./editticket.o: ../../../../morm/src/postgresqlqueryresult.h
+./editticket.o: ../../../../morm/src/xmlconnector.h
 ./editticket.o: ../../../../morm/src/transaction.h
 ./editticket.o: ../../../../winix/winixd/core/log.h
 ./editticket.o: ../../../../winix/winixd/core/synchro.h
@@ -462,9 +466,11 @@
 ./funticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./funticket.o: ../../../../morm/src/jsonexpression.h
 ./funticket.o: ../../../../morm/src/postgresqlexpression.h
+./funticket.o: ../../../../morm/src/xmlexpression.h
 ./funticket.o: ../../../../morm/src/jsonconnector.h
 ./funticket.o: ../../../../morm/src/postgresqlconnector.h
 ./funticket.o: ../../../../morm/src/postgresqlqueryresult.h
+./funticket.o: ../../../../morm/src/xmlconnector.h
 ./funticket.o: ../../../../morm/src/transaction.h
 ./funticket.o: ../../../../winix/winixd/core/log.h
 ./funticket.o: ../../../../winix/winixd/core/synchro.h
@@ -654,9 +660,11 @@
 ./init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./init.o: ../../../../morm/src/postgresqlexpression.h
+./init.o: ../../../../morm/src/xmlexpression.h
 ./init.o: ../../../../morm/src/jsonconnector.h
 ./init.o: ../../../../morm/src/postgresqlconnector.h
 ./init.o: ../../../../morm/src/postgresqlqueryresult.h
+./init.o: ../../../../morm/src/xmlconnector.h
 ./init.o: ../../../../morm/src/transaction.h
 ./init.o: ../../../../winix/winixd/core/log.h
 ./init.o: ../../../../winix/winixd/core/synchro.h
@@ -867,9 +875,11 @@
 ./showtickets.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./showtickets.o: ../../../../morm/src/jsonexpression.h
 ./showtickets.o: ../../../../morm/src/postgresqlexpression.h
+./showtickets.o: ../../../../morm/src/xmlexpression.h
 ./showtickets.o: ../../../../morm/src/jsonconnector.h
 ./showtickets.o: ../../../../morm/src/postgresqlconnector.h
 ./showtickets.o: ../../../../morm/src/postgresqlqueryresult.h
+./showtickets.o: ../../../../morm/src/xmlconnector.h
 ./showtickets.o: ../../../../morm/src/transaction.h
 ./showtickets.o: ../../../../winix/winixd/core/log.h
 ./showtickets.o: ../../../../winix/winixd/core/synchro.h
@@ -1060,9 +1070,11 @@
 ./tdb.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 ./tdb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 ./tdb.o: ../../../../morm/src/postgresqlexpression.h
+./tdb.o: ../../../../morm/src/xmlexpression.h
 ./tdb.o: ../../../../morm/src/jsonconnector.h
 ./tdb.o: ../../../../morm/src/postgresqlconnector.h
 ./tdb.o: ../../../../morm/src/postgresqlqueryresult.h
+./tdb.o: ../../../../morm/src/xmlconnector.h
 ./tdb.o: ../../../../morm/src/transaction.h
 ./tdb.o: ../../../../winix/winixd/core/log.h
 ./tdb.o: ../../../../winix/winixd/core/synchro.h
@@ -1136,9 +1148,11 @@
 ./templates.o: ../../../../morm/src/cursor.h
 ./templates.o: ../../../../morm/src/jsonexpression.h
 ./templates.o: ../../../../morm/src/postgresqlexpression.h
+./templates.o: ../../../../morm/src/xmlexpression.h
 ./templates.o: ../../../../morm/src/jsonconnector.h
 ./templates.o: ../../../../morm/src/postgresqlconnector.h
 ./templates.o: ../../../../morm/src/postgresqlqueryresult.h
+./templates.o: ../../../../morm/src/xmlconnector.h
 ./templates.o: ../../../../morm/src/transaction.h
 ./templates.o: ../../../../winix/winixd/core/log.h
 ./templates.o: ../../../../winix/winixd/core/synchro.h
@@ -1336,9 +1350,11 @@
 ./ticketinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 ./ticketinfo.o: ../../../../morm/src/jsonexpression.h
 ./ticketinfo.o: ../../../../morm/src/postgresqlexpression.h
+./ticketinfo.o: ../../../../morm/src/xmlexpression.h
 ./ticketinfo.o: ../../../../morm/src/jsonconnector.h
 ./ticketinfo.o: ../../../../morm/src/postgresqlconnector.h
 ./ticketinfo.o: ../../../../morm/src/postgresqlqueryresult.h
+./ticketinfo.o: ../../../../morm/src/xmlconnector.h
 ./ticketinfo.o: ../../../../morm/src/transaction.h
 ./ticketinfo.o: ../../../../winix/winixd/core/log.h
 ./ticketinfo.o: ../../../../winix/winixd/core/synchro.h