LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nachtrag für Revision r2459, der CSV Importer war nicht entsprechend angepasst 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2463 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-11-28 15:23:04 +00:00
parent c8be91ff92
commit 3aa3e145ed
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/AbstractPublicationImporter.java
View File

@ -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.AuthorData;
import com.arsdigita.cms.scipublications.importer.util.ImporterUtil; import com.arsdigita.cms.scipublications.importer.util.ImporterUtil;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -114,8 +113,7 @@ abstract class AbstractPublicationImporter<T extends Publication> {
if (!pretend) { if (!pretend) {
publication.save(); publication.save();
final Integer folderId = getFolderId(); final Folder folder = getFolder();
final Folder folder = new Folder(new BigDecimal(folderId));
publication.setContentSection(folder.getContentSection()); publication.setContentSection(folder.getContentSection());
publication.setLanguage(Kernel.getConfig().getLanguagesIndependentCode()); publication.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
@ -170,7 +168,7 @@ abstract class AbstractPublicationImporter<T extends Publication> {
* *
* @return * @return
*/ */
protected Integer getFolderId() { protected Folder getFolder() {
return Publication.getConfig().getDefaultPublicationsFolder(); return Publication.getConfig().getDefaultPublicationsFolder();
} }

3
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInCollectedVolumeImporter.java
View File

@ -1,5 +1,6 @@
package com.arsdigita.cms.scipublications.importer.csv; package com.arsdigita.cms.scipublications.importer.csv;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume;
import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeBundle; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeBundle;
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
@ -104,7 +105,7 @@ class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<Artic
} }
@Override @Override
protected Integer getFolderId() { protected Folder getFolder() {
return Publication.getConfig().getDefaultArticlesInCollectedVolumeFolder(); return Publication.getConfig().getDefaultArticlesInCollectedVolumeFolder();
} }
} }

3
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ArticleInJournalImporter.java
View File

@ -1,5 +1,6 @@
package com.arsdigita.cms.scipublications.importer.csv; package com.arsdigita.cms.scipublications.importer.csv;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.contenttypes.ArticleInJournal; import com.arsdigita.cms.contenttypes.ArticleInJournal;
import com.arsdigita.cms.contenttypes.ArticleInJournalBundle; import com.arsdigita.cms.contenttypes.ArticleInJournalBundle;
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
@ -133,7 +134,7 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
} }
@Override @Override
protected Integer getFolderId() { protected Folder getFolder() {
return Publication.getConfig().getDefaultArticlesInJournalFolder(); return Publication.getConfig().getDefaultArticlesInJournalFolder();
} }

3
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CollectedVolumeImporter.java
View File

@ -1,5 +1,6 @@
package com.arsdigita.cms.scipublications.importer.csv; package com.arsdigita.cms.scipublications.importer.csv;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.contenttypes.CollectedVolume; import com.arsdigita.cms.contenttypes.CollectedVolume;
import com.arsdigita.cms.contenttypes.CollectedVolumeBundle; import com.arsdigita.cms.contenttypes.CollectedVolumeBundle;
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
@ -40,7 +41,7 @@ class CollectedVolumeImporter extends AbstractPublicationWithPublisherImporter<C
} }
@Override @Override
protected Integer getFolderId() { protected Folder getFolder() {
return Publication.getConfig().getDefaultCollectedVolumesFolder(); return Publication.getConfig().getDefaultCollectedVolumesFolder();
} }
} }

3
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/InProceedingsImporter.java
View File

@ -1,5 +1,6 @@
package com.arsdigita.cms.scipublications.importer.csv; package com.arsdigita.cms.scipublications.importer.csv;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.contenttypes.InProceedings; import com.arsdigita.cms.contenttypes.InProceedings;
import com.arsdigita.cms.contenttypes.InProceedingsBundle; import com.arsdigita.cms.contenttypes.InProceedingsBundle;
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
@ -92,7 +93,7 @@ class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
} }
@Override @Override
protected Integer getFolderId() { protected Folder getFolder() {
return Publication.getConfig().getDefaultInProceedingsFolder(); return Publication.getConfig().getDefaultInProceedingsFolder();
} }

3
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/ProceedingsImporter.java
View File

@ -1,5 +1,6 @@
package com.arsdigita.cms.scipublications.importer.csv; package com.arsdigita.cms.scipublications.importer.csv;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.contenttypes.Proceedings; import com.arsdigita.cms.contenttypes.Proceedings;
import com.arsdigita.cms.contenttypes.ProceedingsBundle; import com.arsdigita.cms.contenttypes.ProceedingsBundle;
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
@ -57,7 +58,7 @@ class ProceedingsImporter extends AbstractPublicationWithPublisherImporter<Proce
} }
@Override @Override
protected Integer getFolderId() { protected Folder getFolder() {
return Publication.getConfig().getDefaultProceedingsFolder(); return Publication.getConfig().getDefaultProceedingsFolder();
} }
} }