From 21100f7ae0531cef0c7763e346d951e2e8747c0a Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 7 Nov 2012 20:53:23 +0000
Subject: [PATCH] Ein paar kleinere Korrekturen am CSV-Importer und am
 allgemeinen Import-Util

git-svn-id: https://svn.libreccm.org/ccm/trunk@1914 8810af33-2d31-482b-a856-94f89814c4df
---
 .../scipublications/importer/util/ImporterUtil.java | 13 ++++++++-----
 .../importer/csv/AbstractPublicationImporter.java   | 13 +++++++------
 .../importer/csv/CsvImporterConfig.java             |  6 +++++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/util/ImporterUtil.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/util/ImporterUtil.java
index afd965a09..d577459a1 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/util/ImporterUtil.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/util/ImporterUtil.java
@@ -162,7 +162,7 @@ public class ImporterUtil {
                 bundle.save();
 
                 publication.setPublisher(publisher);
-                
+
                 if (publish) {
                     publishItem(publisher);
                 }
@@ -239,7 +239,7 @@ public class ImporterUtil {
 
                 collectedVolume.save();
                 article.setCollectedVolume(collectedVolume);
-                
+
                 if (publish) {
                     publishItem(collectedVolume);
                 }
@@ -324,7 +324,7 @@ public class ImporterUtil {
 
                 proceedings.save();
                 inProceedings.setProceedings(proceedings);
-                
+
                 if (publish) {
                     publishItem(proceedings);
                 }
@@ -390,7 +390,7 @@ public class ImporterUtil {
                 bundle.save();
 
                 article.setJournal(journal);
-                
+
                 if (publish) {
                     publishItem(journal);
                 }
@@ -421,7 +421,9 @@ public class ImporterUtil {
         final LifecycleDefinitionCollection lifecycles = item.getContentSection().getLifecycleDefinitions();
         lifecycles.next();
         final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition();
-        item.publish(lifecycleDef, now.getTime());
+        final ContentItem pending = item.publish(lifecycleDef, now.getTime());
+        lifecycles.close();
+        item.promotePendingVersion(pending);
     }
 
     protected final String normalizeString(final String str) {
@@ -435,4 +437,5 @@ public class ImporterUtil {
                 replace(" ", "-").
                 replaceAll("[^a-zA-Z0-9\\-]", "").toLowerCase().trim();
     }
+
 }
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 52bccccd7..22d5d4664 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
@@ -72,12 +72,13 @@ abstract class AbstractPublicationImporter<T extends Publication> {
             assignCategories(publication.getPublicationBundle());
 
             if (publishNewItems) {
-                //final Calendar now = new GregorianCalendar();
-                //final LifecycleDefinitionCollection lifecycles = publication.getContentSection().
-                //        getLifecycleDefinitions();
-                //lifecycles.next();
-                //final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition();
-                //publication.publish(lifecycleDef, now.getTime());
+//                final Calendar now = new GregorianCalendar();
+//                final LifecycleDefinitionCollection lifecycles = publication.getContentSection().
+//                        getLifecycleDefinitions();
+//                lifecycles.next();
+//                final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition();
+//                publication.publish(lifecycleDef, now.getTime());
+//                lifecycles.close();
                 importerUtil.publishItem(publication);
             }
         }
diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CsvImporterConfig.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CsvImporterConfig.java
index 1e715846d..cdc343ab8 100644
--- a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CsvImporterConfig.java
+++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/CsvImporterConfig.java
@@ -57,8 +57,12 @@ public class CsvImporterConfig extends AbstractConfig {
 
     public Map<String, Category> getDepartmentCategories() {
         final String categoryIds = getDepartmentCategoryIds();
-
+                
         final Map<String, Category> categories = new HashMap<String, Category>();
+        
+        if ((categoryIds == null) || categoryIds.isEmpty()) {
+            return categories;
+        }
 
         final String[] departmentTokens = categoryIds.split(";");
         for (String departmentToken : departmentTokens) {