Cleaned 80% of errors found in the datamodel validity check

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@578 a333f486-631f-4898-b8df-5754b55c2be0

core/metamodel.class.php

@@ -1030,7 +1030,7 @@ abstract class MetaModel
 							self::$m_aAttribDefs[$sClass][$sClassRecallAttCode] = $oClassRecall;
 							self::$m_aAttribOrigins[$sClass][$sClassRecallAttCode] = $sRemoteClass;
 
-							$oClassFlt = new FilterFromAttribute($oClassAtt);
+							$oClassFlt = new FilterFromAttribute($oClassRecall);
 							self::$m_aFilterDefs[$sClass][$sClassRecallAttCode] = $oClassFlt;
 							self::$m_aFilterOrigins[$sClass][$sClassRecallAttCode] = $sRemoteClass;
 

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -72,7 +72,7 @@ class Location extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(""),
 			"db_table" => "location",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -214,7 +214,7 @@ class lnkTeamToContact extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "team_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkteamtocontact",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -622,7 +622,7 @@ class lnkPatchToCI extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "patch_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkpatchtoci",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -1330,7 +1330,7 @@ class lnkCIToDoc extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "ci_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkcitodoc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -1364,7 +1364,7 @@ class lnkCIToContact extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "ci_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkcitocontact",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -1398,7 +1398,7 @@ class lnkSolutionToCI extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "solution_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnksolutiontoci",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -1431,7 +1431,7 @@ class lnkProcessToSolution extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "solution_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkprocesstosolution",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",

modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php

@@ -138,7 +138,7 @@ class lnkProviderToCustomer extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "provider_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkprovidertocustomer",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -169,7 +169,7 @@ class lnkContractToSLA extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "contract_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkcontracttosla",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -201,7 +201,7 @@ class lnkContractToDoc extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "contract_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkcontracttodoc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -234,7 +234,7 @@ class lnkContractToContact extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "contract_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkcontracttocontact",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -267,7 +267,7 @@ class lnkContractToCI extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "contract_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkcontracttoci",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -310,8 +310,8 @@ class Service extends cmdbAbstractObject
 
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('RequestManagement,IncidentManagement'), "sql"=>"type", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('design,production,obsolete'), "sql"=>"status", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('RequestManagement,IncidentManagement'), "sql"=>"type", "default_value"=>"IncidentManagement", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('design,production,obsolete'), "sql"=>"status", "default_value"=>"design", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("subcategory_list", array("linked_class"=>"ServiceSubcategory", "ext_key_to_me"=>"service_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("sla_list", array("linked_class"=>"SLA", "ext_key_to_me"=>"service_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("document_list", array("linked_class"=>"lnkServiceToDoc", "ext_key_to_me"=>"service_id", "ext_key_to_remote"=>"document_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
@@ -406,10 +406,10 @@ class SLT extends cmdbAbstractObject
 		MetaModel::Init_InheritAttributes();
 
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("metric", array("allowed_values"=>new ValueSetEnum('TTO,TTR'), "sql"=>"metric", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("ticket_priority", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"ticket_priority", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("value_unit", array("allowed_values"=>new ValueSetEnum('days,hours,minutes'), "sql"=>"value_unit", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("metric", array("allowed_values"=>new ValueSetEnum('TTO,TTR'), "sql"=>"metric", "default_value"=>'TTO', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("ticket_priority", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"ticket_priority", "default_value"=>"1", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("value_unit", array("allowed_values"=>new ValueSetEnum('days,hours,minutes'), "sql"=>"value_unit", "default_value"=>"hours", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("sla_list", array("linked_class"=>"lnkSLTToSLA", "ext_key_to_me"=>"slt_id", "ext_key_to_remote"=>"sla_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 
 		MetaModel::Init_SetZListItems('details', array('name', 'metric', 'ticket_priority', 'value', 'value_unit', 'sla_list'));
@@ -429,7 +429,7 @@ class lnkSLTToSLA extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "sla_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkslttosla",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -464,7 +464,7 @@ class lnkServiceToDoc extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "service_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkservicetodoc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -497,7 +497,7 @@ class lnkServiceToContact extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "service_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkservicetocontact",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -530,7 +530,7 @@ class lnkServiceToCI extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "service_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnkservicetoci",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",

modules/itop-tickets-1.0.0/model.itop-tickets.php

@@ -69,7 +69,7 @@ class lnkTicketToDoc extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "ticket_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnktickettodoc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -100,7 +100,7 @@ class lnkTicketToContact extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "ticket_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnktickettocontact",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -133,7 +133,7 @@ class lnkTicketToCI extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "ticket_id",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array(),
 			"db_table" => "lnktickettoci",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -188,7 +188,7 @@ abstract class ResponseTicket extends Ticket
 		MetaModel::Init_AddAttribute(new AttributeString("product", array("allowed_values"=>null, "sql"=>"product", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("impact", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"impact", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("urgency", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"urgency", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("priority", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"priority", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("priority", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"priority", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"Team", "jointype"=>null, "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("allowed_values"=>null, "extkey_attcode"=>"workgroup_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
@@ -203,9 +203,9 @@ abstract class ResponseTicket extends Ticket
 		MetaModel::Init_AddAttribute(new AttributeDateTime("assignment_date", array("allowed_values"=>null, "sql"=>"assignment_date", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeDeadline("escalation_deadline", array("allowed_values"=>null, "sql"=>"escalation_deadline", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeDeadline("closure_deadline", array("allowed_values"=>null, "sql"=>"closure_deadline", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("resolution_code", array("allowed_values"=>new ValueSetEnum('fixed,duplicate,couldnotreproduce,irrelevant'), "sql"=>"resolution_code", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("resolution_code", array("allowed_values"=>new ValueSetEnum('fixed,duplicate,couldnotreproduce,irrelevant'), "sql"=>"resolution_code", "default_value"=>"fixed", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("solution", array("allowed_values"=>null, "sql"=>"solution", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("user_satisfaction", array("allowed_values"=>new ValueSetEnum('1,2,3,4'), "sql"=>"user_satisfaction", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("user_satisfaction", array("allowed_values"=>new ValueSetEnum('1,2,3,4'), "sql"=>"user_satisfaction", "default_value"=>"1", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("user_commment", array("allowed_values"=>null, "sql"=>"user_commment", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		MetaModel::Init_SetZListItems('details', array('ref', 'title', 'ticket_log', 'start_date', 'escalation_deadline', 'closure_deadline', 'document_list', 'ci_list', 'contact_list', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment'));