From fba978d8bd27049fdff635855794a241db760f84 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 22 Dec 2010 17:41:46 +0000 Subject: [PATCH] DaBInImporter: NPE bei der Term-Zuordnung der Arbeitspapiere behoben. git-svn-id: https://svn.libreccm.org/ccm/trunk@655 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/cms/dabin/DaBInImporter.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 4aca3e489..fd7d940bc 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java @@ -161,7 +161,7 @@ public class DaBInImporter extends Program { System.out.println(""); System.out.println(""); - System.out.println("DaBInImporter starting..."); + System.out.println("DaBInImporter is starting..."); //Get command line arguments... args = cmdLine.getArgs(); @@ -2738,12 +2738,13 @@ public class DaBInImporter extends Program { //publications.addItem(workingPaper); workingPaperMap.put(workingPaperData.getDabinId(), workingPaper); insertIntoAZFolder(workingPaper, publicationsAlpha); - Term term = termsDomain.getTerm(workingPaperTerms.get(Integer.toString(((Publication) workingPaper. - getPrimaryInstance()). - getYearOfPublication())).getUniqueID()); + WorkingPaper primary = (WorkingPaper) workingPaper.getPrimaryInstance(); + String yearStr = Integer.toString(primary.getYearOfPublication()); + Term term = workingPaperTerms.get(yearStr); if (term == null) { term = workingPapersTerm; } + term = termsDomain.getTerm(term.getUniqueID()); term.addObject(workingPaper); term.save(); @@ -3328,7 +3329,7 @@ public class DaBInImporter extends Program { } } } catch (SQLException ex) { - System.err.println("Query for publication years failed."); + System.err.println("Query for publication years of working papers failed."); ex.printStackTrace(System.err); }