Explorar o código

Fixed verify operation

Yentl Van Tendeloo %!s(int64=7) %!d(string=hai) anos
pai
achega
b44ab58ac9
Modificáronse 1 ficheiros con 16 adicións e 10 borrados
  1. 16 10
      bootstrap/core_algorithm.alc

+ 16 - 10
bootstrap/core_algorithm.alc

@@ -1576,18 +1576,24 @@ String function cmd_verify(model_name : String, metamodel_name : String):
 	model_id = get_entry_id(model_name)
 	if (model_id != ""):
 		if (allow_read(current_user_id, model_id)):
-			if (get_entry_id(metamodel_name) != ""):
-				if (allow_read(current_user_id, get_entry_id(metamodel_name))):
-					Element m
-					m = get_full_model(get_entry_id(model_name), get_entry_id(metamodel_name))
-					if (element_eq(m, read_root())):
-						return "Conformance hierarchy unknown for: " + model_name!
-
-					return string_join("Success: ", conformance_scd(m))!
+			if (read_type(core, model_id) != "Folder"):
+				if (get_entry_id(metamodel_name) != ""):
+					if (read_type(core, get_entry_id(metamodel_name)) != "Folder"):
+						if (allow_read(current_user_id, get_entry_id(metamodel_name))):
+							Element m
+							m = get_full_model(get_entry_id(model_name), get_entry_id(metamodel_name))
+							if (element_eq(m, read_root())):
+								return "Conformance hierarchy unknown for: " + model_name!
+
+							return string_join("Success: ", conformance_scd(m))!
+						else:
+							return "Read permission denied to: " + metamodel_name!
+					else:
+						return "Not a model: " + metamodel_name!
 				else:
-					return "Read permission denied to: " + metamodel_name!
+					return "Model not found: " + metamodel_name!
 			else:
-				return "Model not found: " + metamodel_name!
+				return "Not a model: " + model_name!
 		else:
 			return "Read permission denied to: " + model_name!
 	else: