Changeset 1272

Timestamp:

Dec 15, 2010, 1:44:27 PM (12 years ago)

Author:

robert@…

Message:

Trying to solve a bug that only appears on ci, not locally, in importing templates (ticket #76)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/TemplateController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Template.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/TemplateField.groovy (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/TemplateController.groovy

@@ -79 +79 @@
                                 templates << templateData
                         } catch (Exception e) {
-                                templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed: " + e ];
+                                templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed: " + e + " (" + e. getStackTrace()[ 0 ] + ")" ];
                         }
                 }

trunk/grails-app/domain/dbnp/studycapturing/Template.groovy

@@ -301 +301 @@
                         // template fields with the same name, in order to have as little comparisons
                         // as possible
-                        for( def otherField in TemplateField.findAllByName( field.name ) ) {
+                        for( def otherField in TemplateField.findAllByName( field?.name ) ) {
                                 if( field.contentEquals( otherField ) ) {
                                         field = otherField;

trunk/grails-app/domain/dbnp/studycapturing/TemplateField.groovy

@@ -475 +475 @@
                 xmlObject.listItems?.listItem.each {
                         def name = ""
-                        if( it && it.name )
+                        if( it != null && it.name )
                                 name = it.name.text()