From ee70d0bd4f701f63a0adc4b4b4f977fd1f540c73 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 16 Mar 2011 21:25:10 +0000 Subject: [PATCH] DaBIn-Importer git-svn-id: https://svn.libreccm.org/ccm/trunk@788 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/cms/dabin/DaBInImporter.java | 13 +++++++++++-- .../com/arsdigita/cms/dabin/PublicationData.java | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java index 5014d285b..b40e2aa13 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java @@ -2240,8 +2240,14 @@ public class DaBInImporter extends Program { && (projectData.getNameEn().length() > 0)) { projectEn = new SciProject(); projectEn.setTitle(projectData.getNameEn()); - String projectName = DaBInImporter.normalizeString(projectData. - getNameDe()); + String projectName; + if (projectData.getNameDe() == null) { + projectName = DaBInImporter.normalizeString(projectData. + getNameEn()); + } else { + projectName = DaBInImporter.normalizeString(projectData. + getNameDe()); + } if (projectName.length() > 200) { projectName = projectName.substring(0, 200); } @@ -3646,6 +3652,9 @@ public class DaBInImporter extends Program { } public static String normalizeString(final String str) { + if (str == null) { + return "null"; + } return str.replace("ä", "ae").replace("ö", "oe").replace("ü", "ue"). replace( "Ä", "Ae").replace("Ü", "Ue").replace("Ö", "Oe").replace("ß", diff --git a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/PublicationData.java b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/PublicationData.java index 0e58c9b04..9f14a82b2 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/PublicationData.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/PublicationData.java @@ -84,7 +84,7 @@ public class PublicationData { } public String getUrl() { - if (name.length() < 200) { + if (name.length() < 175) { return DaBInImporter.normalizeString(name); } else { System.out.println(