From e7aa14e10d476bfaecb07eb24143b86bee668dc1 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 30 Apr 2019 12:18:44 +0000 Subject: [PATCH] Rename to match naming pattern git-svn-id: https://svn.libreccm.org/ccm/trunk@5982 8810af33-2d31-482b-a856-94f89814c4df --- .../{ContentItem.ftl => content-item.ftl} | 0 .../ui/PublicationExtraXmlGenerator.java | 52 +++++++++++++------ .../ccm-sci-publications/article.ftl | 2 +- .../ccm-sci-publications/collected-volume.ftl | 2 +- .../ccm-sci-publications/journal.ftl | 2 +- .../ccm-sci-publications/proceedings.ftl | 2 +- .../ccm-sci-publications/series.ftl | 2 +- .../freemarker/ccm-sci-types-department.ftl | 2 +- .../freemarker/ccm-sci-types-institute.ftl | 2 +- 9 files changed, 42 insertions(+), 24 deletions(-) rename ccm-cms/web/themes/freemarker/ccm-cms/{ContentItem.ftl => content-item.ftl} (100%) diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/ContentItem.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl similarity index 100% rename from ccm-cms/web/themes/freemarker/ccm-cms/ContentItem.ftl rename to ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java index 2d169e782..65c3afc29 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java @@ -32,10 +32,12 @@ import com.arsdigita.cms.contenttypes.SeriesCollection; import com.arsdigita.cms.dispatcher.SimpleXMLGenerator; import com.arsdigita.cms.scipublications.imexporter.PublicationFormat; import com.arsdigita.cms.scipublications.exporter.SciPublicationsExporters; -import com.arsdigita.cms.scipublications.importer.report.OrganizationalUnitImportReport; import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.xml.Element; +import com.arsdigita.persistence.SessionManager; +import java.sql.Connection; +import java.sql.PreparedStatement; import java.util.ArrayList; import java.util.List; @@ -48,7 +50,7 @@ import java.util.List; public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { private final static List EXTENDING_GENERATORS - = new ArrayList(); + = new ArrayList(); private boolean listMode; public static void addExtendingGenerator(final ExtraXMLGenerator generator) { @@ -99,14 +101,14 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { private void createAuthorsXml(final Publication publication, final Element parent, final PageState state) { -// final long start = System.nanoTime(); + final long start = System.nanoTime(); final AuthorshipCollection authors = publication.getAuthors(); if ((authors == null) || authors.isEmpty()) { return; } -// System.out.printf("[%s#createAuthorsXML] Got authors in %d ms\n", -// PublicationExtraXmlGenerator.class.getName(), -// (System.nanoTime() - start) / 1000000); + System.out.printf("[%s#createAuthorsXML] Got authors in %d ms\n", + PublicationExtraXmlGenerator.class.getName(), + (System.nanoTime() - start) / 1000000); final Element authorsElem = parent.newChildElement("authors"); while (authors.next()) { @@ -116,9 +118,24 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { authorsElem, state); } -// System.out.printf("[%s#createAuthorsXML] Created XML for authors in %d ms\n", -// PublicationExtraXmlGenerator.class.getName(), -// (System.nanoTime() - start) / 1000000); + System.out.printf( + "[%s#createAuthorsXML] Created XML for authors in %d ms\n", + PublicationExtraXmlGenerator.class.getName(), + (System.nanoTime() - start) / 1000000); + +// final long sqlStart = System.nanoTime(); +// final Connection connection = SessionManager +// .getSession() +// .getConnection(); +// +// final PreparedStatement statement = connection +// .prepareStatement("SELECT person_id " +// + "FROM ct_publications_authorship " +// + "WHERE publication_id = ?"); +// statement.setString(1, publication.getBundle().getBundleID().toString()); +// + + } private void createAuthorXml(final GenericPerson author, @@ -143,7 +160,7 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { final Element parent, final PageState state) { final PublicationGenericOrganizationalsUnitCollection orgaunits - = publication + = publication .getOrganizationalUnits(); if ((orgaunits == null) || orgaunits.isEmpty()) { return; @@ -159,10 +176,11 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { final GenericOrganizationalUnit orgaUnit = orgaunits .getOrganizationalUnit(); - final Element orgaUnitElem = orgaunitsElem.newChildElement("organizationalunit"); - orgaUnitElem.addAttribute("oid", orgaUnit.getOID().toString()); - final Element titleElem = orgaUnitElem.newChildElement("title"); - titleElem.setText(orgaUnit.getTitle()); + final Element orgaUnitElem = orgaunitsElem.newChildElement( + "organizationalunit"); + orgaUnitElem.addAttribute("oid", orgaUnit.getOID().toString()); + final Element titleElem = orgaUnitElem.newChildElement("title"); + titleElem.setText(orgaUnit.getTitle()); } } @@ -199,14 +217,14 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { if (series == null) { return; } - + final Element seriesItemElem = seriesElem.newChildElement("series"); seriesItemElem.addAttribute("oid", series.getOID().toString()); seriesItemElem.addAttribute("volume", volumeOfSeries); - + final Element titleElem = seriesItemElem.newChildElement("title"); titleElem.setText(series.getTitle()); - + // final XmlGenerator generator = new XmlGenerator(series); // generator.setItemElemName("series", ""); // if (volumeOfSeries != null) { diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl index 152b501ce..5979a7c08 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getHref article> <#return ContentItem.generateContentItemLink(article["./@oid"])> diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl index 1f7a66d76..bc0ed21cd 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getHref collectedVolume> <#return ContentItem.generateContentItemLink(collectedVolume["./@oid"])> diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl index d23294280..cf8f2048b 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getTitle journal> <#return journal["./title"]> diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl index 7f6e87331..09de541f4 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getHref proceedings> <#return ContentItem.generateContentItemLink(proceedings["./@oid"])> diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl index 6b0b9cec9..4efe378d0 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getLink series> <#return ContentItem.generateContentItemLink(series)> diff --git a/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl b/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl index 0e42269fc..78a51bb77 100644 --- a/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl +++ b/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getDescription data> <#if (data["./instituteDesc"]?size > 0)> diff --git a/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl b/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl index aa3997327..585251729 100644 --- a/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl +++ b/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms/ContentItem.ftl as ContentItem> +<#import ../ccm-cms/content-item.ftl as ContentItem> <#function getDescription data> <#if (data["./instituteDesc"]?size > 0)>