set non-empty default field name.

1 files changed, 6 insertions, 22 deletions

diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp
index 8c87cfe..f27da1d 100644
--- a/src/core/model/Document.cpp
+++ b/src/core/model/Document.cpp
@@ -34,31 +34,15 @@ int DocumentEntity::getFieldDescriptorIndex(const std::string &fieldName,
 	const NodeVector<FieldDescriptor> &fds = descriptor->getFieldDescriptors();
 	unsigned int f = 0;
 
-	// look if we have an empty name.
-	if (fieldName == "") {
-		// in that case we look for a default field.
-		// First: Do we only have one field?
-		if (fds.size() == 1) {
-			// if so we return that one.
+	// otherwise we return the FieldDescriptor with the correct name (if
+	// such a descriptor exists).
+	for (auto &fd : fds) {
+		if (fd->getName() == fieldName) {
 			return f;
 		}
-		// Second: Do we have a TREE field?
-		for (auto &fd : fds) {
-			if (fd->getFieldType() == FieldDescriptor::FieldType::TREE) {
-				return f;
-			}
-			f++;
-		}
-	} else {
-		// otherwise we return the FieldDescriptor with the correct name (if
-		// such a descriptor exists).
-		for (auto &fd : fds) {
-			if (fd->getName() == fieldName) {
-				return f;
-			}
-			f++;
-		}
+		f++;
 	}
+
 	if (enforce) {
 		throw OusiaException(std::string("\"") + descriptor->getName() +
 		                     "\" has no field with name \"" + fieldName + "\"");