diff options
Diffstat (limited to 'src/core/model/Document.cpp')
| -rw-r--r-- | src/core/model/Document.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp index 2fcd20d..b29767e 100644 --- a/src/core/model/Document.cpp +++ b/src/core/model/Document.cpp @@ -180,7 +180,7 @@ bool DocumentEntity::doValidate(Logger &logger) const // check if the parent reference is correct. if (child->getParent() != subInst) { logger.error(std::string("A child of field \"") + - fieldDescs[f]->getName() + + fieldDescs[f]->getNameOrDefaultName() + "\" has the wrong parent reference!", *child); valid = false; @@ -209,7 +209,7 @@ bool DocumentEntity::doValidate(Logger &logger) const c->getDescriptor()->getName() + "\" is not allowed as child of an instance of \"" + descriptor->getName() + "\" in field \"" + - fieldDescs[f]->getName() + "\"", + fieldDescs[f]->getNameOrDefaultName() + "\"", *child); valid = false; continue; @@ -285,7 +285,7 @@ static int enforceGetFieldDescriptorIndex( if (idx == -1) { throw OusiaException(std::string("Descriptor \"") + desc->getName() + "\" does not reference the given field \"" + - fieldDescriptor->getName() + "\""); + fieldDescriptor->getNameOrDefaultName() + "\""); } return idx; } @@ -723,7 +723,7 @@ void Document::doResolve(ResolutionState &state) if (root != nullptr) { continueResolveCompositum(root, state); } - continueResolveReferences(domains, state); + continueResolveReferences(ontologies, state); continueResolveReferences(typesystems, state); } @@ -761,8 +761,8 @@ bool Document::doValidate(Logger &logger) const void Document::doReference(Handle<Node> node) { - if (node->isa(&RttiTypes::Domain)) { - referenceDomain(node.cast<Domain>()); + if (node->isa(&RttiTypes::Ontology)) { + referenceOntology(node.cast<Ontology>()); } if (node->isa(&RttiTypes::Typesystem)) { referenceTypesystem(node.cast<Typesystem>()); @@ -771,7 +771,7 @@ void Document::doReference(Handle<Node> node) RttiSet Document::doGetReferenceTypes() const { - return RttiSet{&RttiTypes::Domain, &RttiTypes::Typesystem}; + return RttiSet{&RttiTypes::Ontology, &RttiTypes::Typesystem}; } Rooted<StructuredEntity> Document::createRootStructuredEntity( |