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

Rename to match naming pattern 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5982 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-04-30 12:18:44 +00:00
parent e3327f82a8
commit e7aa14e10d
9 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ccm-cms/web/themes/freemarker/ccm-cms/ContentItem.ftl → ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
View File

46
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java
View File

@ -32,10 +32,12 @@ import com.arsdigita.cms.contenttypes.SeriesCollection;
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator; import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
import com.arsdigita.cms.scipublications.imexporter.PublicationFormat; import com.arsdigita.cms.scipublications.imexporter.PublicationFormat;
import com.arsdigita.cms.scipublications.exporter.SciPublicationsExporters; import com.arsdigita.cms.scipublications.exporter.SciPublicationsExporters;
import com.arsdigita.cms.scipublications.importer.report.OrganizationalUnitImportReport;
import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.xml.Element; 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.ArrayList;
import java.util.List; import java.util.List;
@ -48,7 +50,7 @@ import java.util.List;
public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
private final static List<ExtraXMLGenerator> EXTENDING_GENERATORS private final static List<ExtraXMLGenerator> EXTENDING_GENERATORS
= new ArrayList<ExtraXMLGenerator>(); = new ArrayList<ExtraXMLGenerator>();
private boolean listMode; private boolean listMode;
public static void addExtendingGenerator(final ExtraXMLGenerator generator) { public static void addExtendingGenerator(final ExtraXMLGenerator generator) {
@ -99,14 +101,14 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
private void createAuthorsXml(final Publication publication, private void createAuthorsXml(final Publication publication,
final Element parent, final Element parent,
final PageState state) { final PageState state) {
// final long start = System.nanoTime(); final long start = System.nanoTime();
final AuthorshipCollection authors = publication.getAuthors(); final AuthorshipCollection authors = publication.getAuthors();
if ((authors == null) || authors.isEmpty()) { if ((authors == null) || authors.isEmpty()) {
return; return;
} }
// System.out.printf("[%s#createAuthorsXML] Got authors in %d ms\n", System.out.printf("[%s#createAuthorsXML] Got authors in %d ms\n",
// PublicationExtraXmlGenerator.class.getName(), PublicationExtraXmlGenerator.class.getName(),
// (System.nanoTime() - start) / 1000000); (System.nanoTime() - start) / 1000000);
final Element authorsElem = parent.newChildElement("authors"); final Element authorsElem = parent.newChildElement("authors");
while (authors.next()) { while (authors.next()) {
@ -116,9 +118,24 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
authorsElem, authorsElem,
state); state);
} }
// System.out.printf("[%s#createAuthorsXML] Created XML for authors in %d ms\n", System.out.printf(
// PublicationExtraXmlGenerator.class.getName(), "[%s#createAuthorsXML] Created XML for authors in %d ms\n",
// (System.nanoTime() - start) / 1000000); 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, private void createAuthorXml(final GenericPerson author,
@ -143,7 +160,7 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
final Element parent, final Element parent,
final PageState state) { final PageState state) {
final PublicationGenericOrganizationalsUnitCollection orgaunits final PublicationGenericOrganizationalsUnitCollection orgaunits
= publication = publication
.getOrganizationalUnits(); .getOrganizationalUnits();
if ((orgaunits == null) || orgaunits.isEmpty()) { if ((orgaunits == null) || orgaunits.isEmpty()) {
return; return;
@ -159,10 +176,11 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
final GenericOrganizationalUnit orgaUnit = orgaunits final GenericOrganizationalUnit orgaUnit = orgaunits
.getOrganizationalUnit(); .getOrganizationalUnit();
final Element orgaUnitElem = orgaunitsElem.newChildElement("organizationalunit"); final Element orgaUnitElem = orgaunitsElem.newChildElement(
orgaUnitElem.addAttribute("oid", orgaUnit.getOID().toString()); "organizationalunit");
final Element titleElem = orgaUnitElem.newChildElement("title"); orgaUnitElem.addAttribute("oid", orgaUnit.getOID().toString());
titleElem.setText(orgaUnit.getTitle()); final Element titleElem = orgaUnitElem.newChildElement("title");
titleElem.setText(orgaUnit.getTitle());
} }
} }

2
ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getHref article>
<#return ContentItem.generateContentItemLink(article["./@oid"])> <#return ContentItem.generateContentItemLink(article["./@oid"])>

2
ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getHref collectedVolume>
<#return ContentItem.generateContentItemLink(collectedVolume["./@oid"])> <#return ContentItem.generateContentItemLink(collectedVolume["./@oid"])>

2
ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getTitle journal>
<#return journal["./title"]> <#return journal["./title"]>

2
ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getHref proceedings>
<#return ContentItem.generateContentItemLink(proceedings["./@oid"])> <#return ContentItem.generateContentItemLink(proceedings["./@oid"])>

2
ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getLink series>
<#return ContentItem.generateContentItemLink(series)> <#return ContentItem.generateContentItemLink(series)>

2
ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getDescription data>
<#if (data["./instituteDesc"]?size > 0)> <#if (data["./instituteDesc"]?size > 0)>

2
ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl
View File

@ -5,7 +5,7 @@
"ui": "http://www.arsdigita.com/ui/1.0"} "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> <#function getDescription data>
<#if (data["./instituteDesc"]?size > 0)> <#if (data["./instituteDesc"]?size > 0)>