diff options
author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-09 15:33:03 +0100 |
---|---|---|
committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-09 15:33:03 +0100 |
commit | 192794c711571f1689a62d56342c1c9ef1ccc805 (patch) | |
tree | 89cb690c39756b2727fa354b54d646bfece8a120 /src/core/model/Document.cpp | |
parent | 3c28ac2fbca95c8b635b38e4c48a183c8159355a (diff) |
removed resolve debug printouts and simplified resolve method in Document.
Diffstat (limited to 'src/core/model/Document.cpp')
-rw-r--r-- | src/core/model/Document.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp index 912a04e..d01fbd6 100644 --- a/src/core/model/Document.cpp +++ b/src/core/model/Document.cpp @@ -93,18 +93,9 @@ NodeVector<StructuredEntity> &DocumentEntity::getField( void Document::continueResolve(ResolutionState &state) { - // Try to resolve annotations and other document nodes first - bool hasResult = - continueResolveComposita(annotations, annotations.getIndex(), state); - if (root != nullptr) { - hasResult = hasResult | continueResolveCompositum(root, state); - } - - // If no direct child has been found, continue resolving the referenced - // domains - if (!hasResult) { - continueResolveReferences(domains, state); - } + continueResolveComposita(annotations, annotations.getIndex(), state); + continueResolveCompositum(root, state); + continueResolveReferences(domains, state); } } |