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 { 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 { * * @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 { } @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