From d080827c13cc8ed9bff537c217102d315799438a Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 21 Dec 2010 09:17:00 +0000 Subject: [PATCH] DaBInImporter Terms (sollte) jetzt funktionieren. git-svn-id: https://svn.libreccm.org/ccm/trunk@654 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/dabin/DaBInImporter.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 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 45d2beec0..4aca3e489 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java @@ -2135,11 +2135,17 @@ public class DaBInImporter extends Program { (SciProject) project.getPrimaryInstance(); if ((sciProject.getEnd() != null) && today.getTime().after(sciProject.getEnd())) { - finishedProjectsTerm.addObject(project); - finishedProjectsTerm.save(); + Term term; + term = termsDomain.getTerm( + finishedProjectsTerm.getUniqueID()); + term.addObject(project); + term.save(); } else { - currentProjectsTerm.addObject(project); - currentProjectsTerm.save(); + Term term; + term = + termsDomain.getTerm(currentProjectsTerm.getUniqueID()); + term.addObject(project); + term.save(); } System.out.println("\tOK"); @@ -2623,9 +2629,9 @@ public class DaBInImporter extends Program { } insertIntoAZFolder(publication, publicationsAlpha); - Term term = publicationTerms.get(Integer.toString(((Publication) publication. - getPrimaryInstance()). - getYearOfPublication())); + Term term = termsDomain.getTerm(publicationTerms.get(Integer. + toString(((Publication) publication.getPrimaryInstance()). + getYearOfPublication())).getUniqueID()); if (term == null) { term = publicationsTerm; } @@ -2732,9 +2738,9 @@ public class DaBInImporter extends Program { //publications.addItem(workingPaper); workingPaperMap.put(workingPaperData.getDabinId(), workingPaper); insertIntoAZFolder(workingPaper, publicationsAlpha); - Term term = workingPaperTerms.get(Integer.toString(((Publication) workingPaper. + Term term = termsDomain.getTerm(workingPaperTerms.get(Integer.toString(((Publication) workingPaper. getPrimaryInstance()). - getYearOfPublication())); + getYearOfPublication())).getUniqueID()); if (term == null) { term = workingPapersTerm; }