From 041784e1bef2ad9bd97a9b498fa50bfd216ab1a2 Mon Sep 17 00:00:00 2001
From: Adam Milward <adam.milward@outlook.com>
Date: Thu, 29 May 2014 11:47:52 +0100
Subject: [PATCH] fixed data import bug for extra escape charcter. hardcoded
 another report for xml for models.

---
 .../core/ui/bs/catalogueElementTreeviewItem.coffee              | 2 +-
 .../modelcatalogue/core/ui/catalogueElementView.coffee          | 2 +-
 .../org/modelcatalogue/core/dataarchitect/Importer.groovy       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/catalogueElementTreeviewItem.coffee b/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/catalogueElementTreeviewItem.coffee
index 10d9774829..85a03c5c60 100644
--- a/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/catalogueElementTreeviewItem.coffee
+++ b/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/catalogueElementTreeviewItem.coffee
@@ -13,7 +13,7 @@ angular.module('mc.core.ui.bs.catalogueElementTreeviewItem', ['mc.core.ui.catalo
           <a ng-if="!currentDescend &amp;&amp; element.elementType" class="btn btn-link">
             <span class="glyphicon glyphicon-file"></span>
           </a>
-          <span class="catalogue-element-treeview-name" ng-click="select(element)">{{element.name}} ({{element.id}})</span>
+          <span class="catalogue-element-treeview-name" ng-click="select(element)">{{element.name}}</span>
           <a ng-click="element.show()" class="btn btn-link btn-xs" title="Show" ng-if="element.elementType"><span class="glyphicon glyphicon-link"></span></a>
         </span>
       </div>
diff --git a/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/catalogueElementView.coffee b/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/catalogueElementView.coffee
index ace667ed8e..cd24091bc4 100644
--- a/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/catalogueElementView.coffee
+++ b/ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/catalogueElementView.coffee
@@ -181,7 +181,7 @@ angular.module('mc.core.ui.catalogueElementView', ['mc.core.catalogueElementEnha
             tabDefinition.active = true
             activeTabSet = true
             if element.elementTypeName == 'Model'
-              $scope.reports = [{name: "exportAll COSD", url: modelCatalogueApiRoot + "/dataArchitect/getSubModelElements/" + element.id + "?format=xlsx&report=COSD"}, {name: "exportAll NHIC", url: modelCatalogueApiRoot + "/dataArchitect/getSubModelElements/" + element.id + "?format=xlsx&report=NHIC"}]
+              $scope.reports = [{name: "exportAll COSD", url: modelCatalogueApiRoot + "/dataArchitect/getSubModelElements/" + element.id + "?format=xlsx&report=COSD"}, {name: "exportAll XML", url: modelCatalogueApiRoot + "/dataArchitect/getSubModelElements/" + element.id + "?format=xlsx&report=NHIC"},{name: "exportAll NHIC", url: modelCatalogueApiRoot + "/dataArchitect/getSubModelElements/" + element.id + "?format=xml"}]
 
           tabs.unshift tabDefinition
 
diff --git a/ModelCatalogueCorePlugin/grails-app/domain/org/modelcatalogue/core/dataarchitect/Importer.groovy b/ModelCatalogueCorePlugin/grails-app/domain/org/modelcatalogue/core/dataarchitect/Importer.groovy
index 49db72d953..f01c4f2541 100644
--- a/ModelCatalogueCorePlugin/grails-app/domain/org/modelcatalogue/core/dataarchitect/Importer.groovy
+++ b/ModelCatalogueCorePlugin/grails-app/domain/org/modelcatalogue/core/dataarchitect/Importer.groovy
@@ -401,7 +401,7 @@ class Importer {
                 } catch (Exception e) { return null }
                 dataTypeReturn = EnumeratedType.findWhere(enumAsString: data)
                 if (!dataTypeReturn) { dataTypeReturn = new EnumeratedType(name: name.replaceAll("\\s", "_"), enumAsString: data).save() }
-            } else if (data.contains("\\n") || data.contains("\\r")) {
+            } else if (data.contains("\n") || data.contains("\r")) {
                 String[] lines = data.split("\\r?\\n")
                 if (lines.size() > 0 && lines[] != null) {
                     Map enumerations = new HashMap()