From 3aa3e145ede167a8316950b225d1887efe70cf44 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 28 Nov 2013 15:23:04 +0000
Subject: [PATCH] =?UTF-8?q?Nachtrag=20f=C3=BCr=20Revision=20r2459,=20der?=
 =?UTF-8?q?=20CSV=20Importer=20war=20nicht=20entsprechend=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2463 8810af33-2d31-482b-a856-94f89814c4df
---
 .../importer/csv/AbstractPublicationImporter.java           | 6 ++----
 .../importer/csv/ArticleInCollectedVolumeImporter.java      | 3 ++-
 .../importer/csv/ArticleInJournalImporter.java              | 3 ++-
 .../importer/csv/CollectedVolumeImporter.java               | 3 ++-
 .../scipublications/importer/csv/InProceedingsImporter.java | 3 ++-
 .../scipublications/importer/csv/ProceedingsImporter.java   | 3 ++-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/AbstractPublicationImporter.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/AbstractPublicationImporter.java
index 52b8f4bbf..973fdace8 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/AbstractPublicationImporter.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/AbstractPublicationImporter.java
@@ -12,7 +12,6 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
 import com.arsdigita.cms.scipublications.importer.util.AuthorData;
 import com.arsdigita.cms.scipublications.importer.util.ImporterUtil;
 import com.arsdigita.kernel.Kernel;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -114,8 +113,7 @@ abstract class AbstractPublicationImporter<T extends Publication> {
         if (!pretend) {
             publication.save();
 
-            final Integer folderId = getFolderId();
-            final Folder folder = new Folder(new BigDecimal(folderId));
+            final Folder folder = getFolder();
             publication.setContentSection(folder.getContentSection());
             publication.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
 
@@ -170,7 +168,7 @@ abstract class AbstractPublicationImporter<T extends Publication> {
      * 
      * @return
      */
-    protected Integer getFolderId() {
+    protected Folder getFolder() {
         return Publication.getConfig().getDefaultPublicationsFolder();
     }
 
diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInCollectedVolumeImporter.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInCollectedVolumeImporter.java
index e56e48e05..6aa0fccc4 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInCollectedVolumeImporter.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInCollectedVolumeImporter.java
@@ -1,5 +1,6 @@
 package com.arsdigita.cms.scipublications.importer.csv;
 
+import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume;
 import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeBundle;
 import com.arsdigita.cms.contenttypes.Publication;
@@ -104,7 +105,7 @@ class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<Artic
     }
 
     @Override
-    protected Integer getFolderId() {
+    protected Folder getFolder() {
         return Publication.getConfig().getDefaultArticlesInCollectedVolumeFolder();
     }
 }
diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInJournalImporter.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInJournalImporter.java
index a9ea264dd..63c183282 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInJournalImporter.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInJournalImporter.java
@@ -1,5 +1,6 @@
 package com.arsdigita.cms.scipublications.importer.csv;
 
+import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.contenttypes.ArticleInJournal;
 import com.arsdigita.cms.contenttypes.ArticleInJournalBundle;
 import com.arsdigita.cms.contenttypes.Publication;
@@ -133,7 +134,7 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
     }
     
     @Override
-    protected Integer getFolderId() {
+    protected Folder getFolder() {
         return Publication.getConfig().getDefaultArticlesInJournalFolder();
     }
 
diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CollectedVolumeImporter.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CollectedVolumeImporter.java
index 539765ef0..4cc0c521b 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CollectedVolumeImporter.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CollectedVolumeImporter.java
@@ -1,5 +1,6 @@
 package com.arsdigita.cms.scipublications.importer.csv;
 
+import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.contenttypes.CollectedVolume;
 import com.arsdigita.cms.contenttypes.CollectedVolumeBundle;
 import com.arsdigita.cms.contenttypes.Publication;
@@ -40,7 +41,7 @@ class CollectedVolumeImporter extends AbstractPublicationWithPublisherImporter<C
     }
 
      @Override
-    protected Integer getFolderId() {
+    protected Folder getFolder() {
         return Publication.getConfig().getDefaultCollectedVolumesFolder();
     }
 }
diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/InProceedingsImporter.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/InProceedingsImporter.java
index cd547c94b..fddc3cda9 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/InProceedingsImporter.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/InProceedingsImporter.java
@@ -1,5 +1,6 @@
 package com.arsdigita.cms.scipublications.importer.csv;
 
+import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.contenttypes.InProceedings;
 import com.arsdigita.cms.contenttypes.InProceedingsBundle;
 import com.arsdigita.cms.contenttypes.Publication;
@@ -92,7 +93,7 @@ class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
     }
     
      @Override
-    protected Integer getFolderId() {
+    protected Folder getFolder() {
         return Publication.getConfig().getDefaultInProceedingsFolder();
     }
 
diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ProceedingsImporter.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ProceedingsImporter.java
index 13b05e44d..d436ff2c6 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ProceedingsImporter.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ProceedingsImporter.java
@@ -1,5 +1,6 @@
 package com.arsdigita.cms.scipublications.importer.csv;
 
+import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.contenttypes.Proceedings;
 import com.arsdigita.cms.contenttypes.ProceedingsBundle;
 import com.arsdigita.cms.contenttypes.Publication;
@@ -57,7 +58,7 @@ class ProceedingsImporter extends AbstractPublicationWithPublisherImporter<Proce
     }
 
      @Override
-    protected Integer getFolderId() {
+    protected Folder getFolder() {
         return Publication.getConfig().getDefaultProceedingsFolder();
     }
 }