diff --git a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java index e89eb6ad4..39679b4af 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java @@ -99,7 +99,7 @@ public class DaBInImporter extends Program { private static final Logger logger = Logger.getLogger(DaBInImporter.class); private Properties config; private String timestamp = null; - private ContentSection section; + private ContentSection section; private ContentSection personsSection; private ContentSection projectsSection; private ContentSection publicationsSection; @@ -203,7 +203,7 @@ public class DaBInImporter extends Program { section = getContentSection(config.getProperty("ccm.contentsection")); personsSection = getContentSection(config.getProperty( "ccm.personsContentSection")); - + projectsSection = getContentSection(config.getProperty( "ccm.projectsContentSection")); publicationsSection = getContentSection(config.getProperty( @@ -2738,13 +2738,15 @@ public class DaBInImporter extends Program { //bundle.save(); RelatedLink download = new RelatedLink(); - download.setTitle(config.getProperty("workingpaper.download.de")); + download.setTitle(config.getProperty( + "workingpaper.download.de")); download.setTargetType(Link.INTERNAL_LINK); download.setTargetItem(fsi); download.setLinkOwner(workingPaperDe); download = new RelatedLink(); - download.setTitle(config.getProperty("workingpaper.download.en")); + download.setTitle(config.getProperty( + "workingpaper.download.en")); download.setTargetType(Link.INTERNAL_LINK); download.setTargetItem(fsi); download.setLinkOwner(workingPaperEn); @@ -2882,14 +2884,16 @@ public class DaBInImporter extends Program { getName())); } else { /*publisherDe.setTitle(String.format("%s, %s", publisherData. - getName(), publisherData.getPlace()));*/ - publisherDe.setTitle(String.format("%s", publisherData. - getName())); + getName(), publisherData.getPlace()));*/ + publisherDe.setTitle(String.format("%s %s", + publisherData.getName(), + publisherData.getPlace())); publisherDe.setName(DaBInImporter.normalizeString(String. format( - "%s, %s", publisherData.getName(), publisherData. + "%s %s", publisherData.getName(), publisherData. getPlace()))); } + publisherDe.setPublisherName(publisherData.getName()); publisherDe.setPlace(publisherData.getPlace()); publisherDe.setLanguage("de"); publisherDe.setLifecycle(createLifecycle(publicationsLifecycle)); @@ -2906,13 +2910,14 @@ public class DaBInImporter extends Program { publisherEn.setName(DaBInImporter.normalizeString(publisherData. getName())); } else { - publisherEn.setTitle(String.format("%s, %s", publisherData. + publisherEn.setTitle(String.format("%s %s", publisherData. getName(), publisherData.getPlace())); publisherEn.setName(DaBInImporter.normalizeString(String. format( - "%s, %s", publisherData.getName(), publisherData. + "%s %s", publisherData.getName(), publisherData. getPlace()))); } + publisherEn.setPublisherName(publisherData.getName()); publisherEn.setPlace(publisherData.getPlace()); publisherEn.setLanguage("en"); publisherEn.setLifecycle(createLifecycle(publicationsLifecycle)); diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl index 33b7aa4ec..795bda9a0 100644 --- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl +++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl @@ -18,6 +18,8 @@ // // +// version: $Id$ + model com.arsdigita.cms.contenttypes; import com.arsdigita.cms.*; @@ -25,6 +27,7 @@ import com.arsdigita.cms.*; // PDL definition for a publisher object type Publisher extends GenericOrganizationalUnit { + String[0..1] publisherName = ct_publisher.publishername VARCHAR(512); String[0..1] place = ct_publisher.place VARCHAR(256); reference key (ct_publisher.publisher_id); diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml index 657828ffd..733830b44 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml @@ -10,7 +10,7 @@ objectType="com.arsdigita.cms.contenttypes.Publisher" classname="com.arsdigita.cms.contenttypes.Publisher"> - +