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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/util/ImporterUtil.java
View File

@ -162,7 +162,7 @@ public class ImporterUtil {
bundle.save(); bundle.save();
publication.setPublisher(publisher); publication.setPublisher(publisher);
if (publish) { if (publish) {
publishItem(publisher); publishItem(publisher);
} }
@ -239,7 +239,7 @@ public class ImporterUtil {
collectedVolume.save(); collectedVolume.save();
article.setCollectedVolume(collectedVolume); article.setCollectedVolume(collectedVolume);
if (publish) { if (publish) {
publishItem(collectedVolume); publishItem(collectedVolume);
} }
@ -324,7 +324,7 @@ public class ImporterUtil {
proceedings.save(); proceedings.save();
inProceedings.setProceedings(proceedings); inProceedings.setProceedings(proceedings);
if (publish) { if (publish) {
publishItem(proceedings); publishItem(proceedings);
} }
@ -390,7 +390,7 @@ public class ImporterUtil {
bundle.save(); bundle.save();
article.setJournal(journal); article.setJournal(journal);
if (publish) { if (publish) {
publishItem(journal); publishItem(journal);
} }
@ -421,7 +421,9 @@ public class ImporterUtil {
final LifecycleDefinitionCollection lifecycles = item.getContentSection().getLifecycleDefinitions(); final LifecycleDefinitionCollection lifecycles = item.getContentSection().getLifecycleDefinitions();
lifecycles.next(); lifecycles.next();
final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition(); 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) { protected final String normalizeString(final String str) {
@ -435,4 +437,5 @@ public class ImporterUtil {
replace(" ", "-"). replace(" ", "-").
replaceAll("[^a-zA-Z0-9\\-]", "").toLowerCase().trim(); replaceAll("[^a-zA-Z0-9\\-]", "").toLowerCase().trim();
} }
} }

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

@ -72,12 +72,13 @@ abstract class AbstractPublicationImporter<T extends Publication> {
assignCategories(publication.getPublicationBundle()); assignCategories(publication.getPublicationBundle());
if (publishNewItems) { if (publishNewItems) {
//final Calendar now = new GregorianCalendar(); // final Calendar now = new GregorianCalendar();
//final LifecycleDefinitionCollection lifecycles = publication.getContentSection(). // final LifecycleDefinitionCollection lifecycles = publication.getContentSection().
// getLifecycleDefinitions(); // getLifecycleDefinitions();
//lifecycles.next(); // lifecycles.next();
//final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition(); // final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition();
//publication.publish(lifecycleDef, now.getTime()); // publication.publish(lifecycleDef, now.getTime());
// lifecycles.close();
importerUtil.publishItem(publication); importerUtil.publishItem(publication);
} }
} }

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

@ -57,8 +57,12 @@ public class CsvImporterConfig extends AbstractConfig {
public Map<String, Category> getDepartmentCategories() { public Map<String, Category> getDepartmentCategories() {
final String categoryIds = getDepartmentCategoryIds(); final String categoryIds = getDepartmentCategoryIds();
final Map<String, Category> categories = new HashMap<String, Category>(); final Map<String, Category> categories = new HashMap<String, Category>();
if ((categoryIds == null) || categoryIds.isEmpty()) {
return categories;
}
final String[] departmentTokens = categoryIds.split(";"); final String[] departmentTokens = categoryIds.split(";");
for (String departmentToken : departmentTokens) { for (String departmentToken : departmentTokens) {