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
master
jensp 2012-11-07 20:53:23 +00:00
parent 22d2a675f1
commit 21100f7ae0
3 changed files with 20 additions and 12 deletions

View File

@ -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();
}
}

View File

@ -78,6 +78,7 @@ abstract class AbstractPublicationImporter<T extends Publication> {
// lifecycles.next();
// final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition();
// publication.publish(lifecycleDef, now.getTime());
// lifecycles.close();
importerUtil.publishItem(publication);
}
}

View File

@ -60,6 +60,10 @@ public class CsvImporterConfig extends AbstractConfig {
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) {
processDepartmentToken(departmentToken, categories);