removed: doc functionality (generating documentation from a model)
we can use our own class (based on FlatConnector and FlatExpression) to generate documentation git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1213 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
371
src/model.h
371
src/model.h
@@ -86,7 +86,6 @@ public:
|
||||
*
|
||||
*/
|
||||
virtual void map_fields() = 0;
|
||||
virtual void map_doc_fields() {} ;
|
||||
|
||||
|
||||
|
||||
@@ -126,9 +125,6 @@ public:
|
||||
|
||||
virtual void generate_select_columns(PT::TextStream & stream);
|
||||
|
||||
virtual void generate_doc_for_flat(PT::TextStream & stream, bool clear_stream = true);
|
||||
virtual void generate_doc_for_db(PT::TextStream & stream, bool clear_stream = true);
|
||||
|
||||
// set object to default values
|
||||
virtual void clear();
|
||||
|
||||
@@ -441,234 +437,6 @@ protected:
|
||||
field_list(db_field_name, flat_field_name, field_value, list_model_null_pointer, insertable, updatable);
|
||||
}
|
||||
|
||||
//////////////////////
|
||||
void doc(const wchar_t * field_name, char & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, unsigned char & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, std::wstring & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
// void doc(const wchar_t * field_name, wchar_t * field_value)
|
||||
// {
|
||||
// doc_field_generic(field_name, field_name, field_value);
|
||||
// }
|
||||
|
||||
void doc(const wchar_t * field_name, std::string & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
// void doc(const wchar_t * field_name, char * field_value)
|
||||
// {
|
||||
// doc_field_generic(field_name, field_name, field_value);
|
||||
// }
|
||||
|
||||
void doc(const wchar_t * field_name, bool & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, short & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, unsigned short & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, int & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, unsigned int & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, long & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, unsigned long & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, long long & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, unsigned long long & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, float & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, double & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, long double & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
// void doc(const wchar_t * field_name, void * field_value)
|
||||
// {
|
||||
// doc_field_generic(field_name, field_name, field_value);
|
||||
// }
|
||||
|
||||
void doc(const wchar_t * field_name, PT::Date & field_value)
|
||||
{
|
||||
doc_field_generic(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * field_name, Model & field_value)
|
||||
{
|
||||
doc_field_model(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
template<typename ModelClass>
|
||||
void doc(const wchar_t * field_name, std::list<ModelClass> & field_value)
|
||||
{
|
||||
doc_field_list(field_name, field_name, field_value);
|
||||
}
|
||||
|
||||
|
||||
//////////////////////
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, char & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, unsigned char & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, std::wstring & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
// void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, wchar_t * field_value)
|
||||
// {
|
||||
// doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
// }
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, std::string & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
// void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, char * field_value)
|
||||
// {
|
||||
// doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
// }
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, bool & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, short & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, unsigned short & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, int & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, unsigned int & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, long & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, unsigned long & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, long long & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, unsigned long long & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, float & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, double & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, long double & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
// void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, void * field_value)
|
||||
// {
|
||||
// doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
// }
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, PT::Date & field_value)
|
||||
{
|
||||
doc_field_generic(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, Model & field_value)
|
||||
{
|
||||
doc_field_model(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
template<typename ModelClass>
|
||||
void doc(const wchar_t * db_field_name, const wchar_t * flat_field_name, std::list<ModelClass> & field_value)
|
||||
{
|
||||
doc_field_list(db_field_name, flat_field_name, field_value);
|
||||
}
|
||||
|
||||
//////////////////////
|
||||
|
||||
|
||||
protected:
|
||||
@@ -800,25 +568,6 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
// will be changed
|
||||
template<typename FieldValue>
|
||||
void field_generic_generate_doc_for_flat(const wchar_t * db_field_name, const wchar_t * flat_field_name, FieldValue & field_value, bool insertable, bool updatable, bool is_primary_key)
|
||||
{
|
||||
FlatConnector * doc_connector = model_connector->get_doc_connector(); // different connector will be here (doc, flat)
|
||||
|
||||
if( doc_connector )
|
||||
{
|
||||
FlatExpression * doc_expression = doc_connector->get_expression();
|
||||
|
||||
// potrzebujemy dwa rozne doce, jeden dla flat drugi dla bazy danych
|
||||
if( doc_expression && !is_empty_field(flat_field_name) )
|
||||
{
|
||||
// insertable, updatable and is_primary_key are ignored here
|
||||
doc_expression->field_doc(*this, flat_field_name, field_value, insertable, updatable, is_primary_key, model_env);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
template<typename FieldValue>
|
||||
void field_generic(const wchar_t * db_field_name, const wchar_t * flat_field_name, FieldValue & field_value, bool insertable, bool updatable, bool is_primary_key)
|
||||
@@ -854,11 +603,6 @@ protected:
|
||||
{
|
||||
field_generic_clear_value(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
|
||||
}
|
||||
|
||||
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT )
|
||||
{
|
||||
field_generic_generate_doc_for_flat(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1126,24 +870,6 @@ protected:
|
||||
}
|
||||
|
||||
|
||||
void field_model_generate_doc_flat(const wchar_t * db_field_name, const wchar_t * flat_field_name, Model & field_model, bool insertable, bool updatable, bool has_foreign_key)
|
||||
{
|
||||
FlatConnector * doc_connector = model_connector->get_doc_connector(); // different connector will be here (doc, flat)
|
||||
|
||||
if( doc_connector )
|
||||
{
|
||||
FlatExpression * doc_expression = doc_connector->get_expression();
|
||||
|
||||
// potrzebujemy dwa rozne doce, jeden dla flat drugi dla bazy danych
|
||||
if( doc_expression && !is_empty_field(flat_field_name) )
|
||||
{
|
||||
// insertable, updatable and is_primary_key are ignored here
|
||||
doc_expression->field_doc(*this, flat_field_name, field_model, insertable, updatable, false, model_env);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void field_model_read_values_from_queryresult(const wchar_t * db_field_name, const wchar_t * flat_field_name, Model & field_model, bool insertable, bool updatable, bool has_foreign_key)
|
||||
{
|
||||
DbConnector * db_connector = model_connector->get_db_connector();
|
||||
@@ -1224,11 +950,6 @@ protected:
|
||||
field_model_clear_values(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
|
||||
}
|
||||
|
||||
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT )
|
||||
{
|
||||
field_model_generate_doc_flat(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
|
||||
}
|
||||
|
||||
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_READING_VALUE_FROM_DB_RESULTSET )
|
||||
{
|
||||
field_model_read_values_from_queryresult(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
|
||||
@@ -1295,23 +1016,6 @@ protected:
|
||||
clearer->clear_container(field_container);
|
||||
}
|
||||
}
|
||||
|
||||
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT )
|
||||
{
|
||||
FlatConnector * doc_connector = model_connector->get_doc_connector(); // different connector will be here (doc, flat)
|
||||
|
||||
if( doc_connector )
|
||||
{
|
||||
FlatExpression * doc_expression = doc_connector->get_expression();
|
||||
|
||||
// potrzebujemy dwa rozne doce, jeden dla flat drugi dla bazy danych
|
||||
if( doc_expression && !is_empty_field(flat_field_name) )
|
||||
{
|
||||
// insertable, updatable and is_primary_key are ignored here
|
||||
doc_expression->field_doc(*this, flat_field_name, field_container, insertable, updatable, false, model_env);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1378,81 +1082,6 @@ protected:
|
||||
}
|
||||
|
||||
|
||||
////
|
||||
template<typename FieldValue>
|
||||
void doc_field_generic(const wchar_t * db_field_name, const wchar_t * flat_field_name, FieldValue & field_value)
|
||||
{
|
||||
if( reinterpret_cast<const void*>(&field_value) == model_env->doc_field_pointer && model_connector )
|
||||
{
|
||||
FlatConnector * doc_connector = model_connector->get_doc_connector();
|
||||
|
||||
if( doc_connector )
|
||||
{
|
||||
FlatExpression * doc_expression = doc_connector->get_expression();
|
||||
|
||||
if( doc_expression )
|
||||
{
|
||||
PT::TextStream * out_stream = doc_expression->get_current_stream();
|
||||
|
||||
if( out_stream )
|
||||
{
|
||||
(*out_stream) << flat_field_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void doc_field_model(const wchar_t * db_field_name, const wchar_t * flat_field_name, Model & field_model)
|
||||
{
|
||||
if( reinterpret_cast<const void*>(&field_model) == model_env->doc_field_pointer && model_connector )
|
||||
{
|
||||
FlatConnector * doc_connector = model_connector->get_doc_connector();
|
||||
|
||||
if( doc_connector )
|
||||
{
|
||||
FlatExpression * doc_expression = doc_connector->get_expression();
|
||||
|
||||
if( doc_expression )
|
||||
{
|
||||
PT::TextStream * out_stream = doc_expression->get_current_stream();
|
||||
|
||||
if( out_stream )
|
||||
{
|
||||
(*out_stream) << flat_field_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
template<typename ModelContainer>
|
||||
void doc_field_list(const wchar_t * db_field_name, const wchar_t * flat_field_name, ModelContainer & field_container)
|
||||
{
|
||||
if( reinterpret_cast<const void*>(&field_container) == model_env->doc_field_pointer && model_connector )
|
||||
{
|
||||
FlatConnector * doc_connector = model_connector->get_doc_connector();
|
||||
|
||||
if( doc_connector )
|
||||
{
|
||||
FlatExpression * doc_expression = doc_connector->get_expression();
|
||||
|
||||
if( doc_expression )
|
||||
{
|
||||
PT::TextStream * out_stream = doc_expression->get_current_stream();
|
||||
|
||||
if( out_stream )
|
||||
{
|
||||
(*out_stream) << flat_field_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
virtual void set_parent_key_in_childs()
|
||||
{
|
||||
if( model_env )
|
||||
|
Reference in New Issue
Block a user