Skip to content

outsource codemeta stuff #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
golsch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

outsource codemeta stuff #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,6 @@
<version>${cage.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>dsn</artifactId>
Expand All @@ -192,31 +187,6 @@
<version>${sun.mail.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-jsonld</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
Expand Down Expand Up @@ -245,12 +215,6 @@
<!-- provided by mir-module > mycore-acl -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<!-- provided by mir-module -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down
77 changes: 0 additions & 77 deletions src/main/java/de/vzg/reposis/digibib/util/CodeMetaRDFConverterResolver.java
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/main/java/de/vzg/reposis/digibib/util/ValidationHelper.java
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions src/main/resources/META-INF/resources/editor/custom-includes.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<xed:template xmlns:xed="http://www.mycore.de/xeditor"
xmlns:mir="http://www.mycore.de/mir">

<xed:load-resource name="mir_genres" uri="classification:metadata:-1:children:mir_genres"/>

<xed:template id="language">
<xed:bind xpath="mods:language">
<div class="form-group row {$xed-validation-marker}">
Expand Down Expand Up @@ -148,16 +150,16 @@
<xed:output i18n="mir.select" />
</option>
<option value="article">
<xed:output i18n="digibib.genre.publication" />
<xed:output value="$mir_genres//category[@ID='article']/label[lang($CurrentLang)]/@text"/>
</option>
<option value="research_data">
<xed:output i18n="digibib.genre.researchData" />
<xed:output value="$mir_genres//category[@ID='research_data']/label[lang($CurrentLang)]/@text"/>
</option>
<option value="software">
<xed:output i18n="digibib.genre.software" />
<xed:output value="$mir_genres//category[@ID='software']/label[lang($CurrentLang)]/@text"/>
</option>
<option value="speech">
<xed:output i18n="digibib.genre.presentation" />
<xed:output value="$mir_genres//category[@ID='speech']/label[lang($CurrentLang)]/@text"/>
</option>
</select>
</xed:bind>
Expand Down
98 changes: 40 additions & 58 deletions src/main/resources/META-INF/resources/editor/editor-customization.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<xed:include ref="digibib.class.sponsors" after="digibib.class.location" />
<xed:remove ref="openAIRE" />
<xed:include ref="openAIRE" after="digibib.class.sponsors" />
<xed:include ref="research-data-extensions" after="related.item.search.of.all.items"/>
<xed:include ref="research-data-extension" after="related.item.search.of.all.items"/>
<xed:include ref="software-extension" after="research-data-extension"/>
<xed:include ref="metadata-box-script" after="software-extension"/>
<xed:remove ref="related.item.other.search.of.all.items" />
</xed:modify>

Expand Down Expand Up @@ -209,15 +211,15 @@
</legend>
<xed:choose>
<xed:when test="$genre_intern='software'">
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="involved.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/software-includes.xed" ref="software.involved.repeated"/>
</xed:when>
<xed:otherwise>
<xed:include ref="research.data.person.repeated" />
</xed:otherwise>
</xed:choose>
<!-- relevant-if="count(./mods:name/mods:role/mods:roleTerm[text()='aut']) &gt; 0" -->
<!-- TODO enable default for software too -->
<xed:validate xpath="//mods:mods" test="count(./mods:name/mods:role/mods:roleTerm[@valueURIxEditor='corresponding_author']) &gt; 0"
display="global" i18n="digibib.validation.correspondingAuthor"/>
display="global" i18n="digibib.validation.correspondingAuthor" relevant-if="count(./mods:name/mods:role/mods:roleTerm[text()='aut']) &gt; 0"/>
</fieldset>
<xed:if test="$genre_intern!='software'">
<xed:include ref="openAIRE" after="person.repeated"/>
Expand All @@ -234,7 +236,7 @@
</fieldset>
<xed:choose>
<xed:when test="$genre_intern='software'">
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="relatedPublication.repeated" />
<xed:include ref="software.relatedPublication.repeated"/>
</xed:when>
<xed:otherwise>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/custom-includes.xed" ref="relatedPublication.repeated" />
Expand Down Expand Up @@ -264,7 +266,7 @@
<xed:if test="$genre_intern">
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-includes.xed" ref="cartographics" />
</xed:if>
<xed:bind xpath="mods:extension[@displayLabel='advanced-part']/fn:map" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<xed:bind xpath="mods:extension[@type='advanced-part']/fn:map" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/advanced-includes.xed" ref="type.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/advanced-includes.xed" ref="research-object.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/advanced-includes.xed" ref="data-origin.repeated" />
Expand Down Expand Up @@ -302,59 +304,52 @@
<xed:include ref="metadata-box-script" />
</xed:template>

<xed:template id="advanced-cleanup-rules">
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='advanced-part']" relevant-if="*" />
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='advanced-part']//fn:string" relevant-if="(string-length(text()) &gt; 0)" />
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='advanced-part']//fn:array" relevant-if="*" />
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='advanced-part']//fn:map" relevant-if="(count(*) &gt; 0)" />
</xed:template>

<xed:template id="codemeta-extension">
<xed:template id="software-extension">
<div class="card">
<h5 class="card-header">
<a data-toggle="collapse" href="#codemeta" role="button" aria-expanded="false" aria-controls="codemeta" style="color: black; text-decoration:none;">
<xed:output i18n="digibib.researchData.software" />
<a data-toggle="collapse" href="#software" role="button" aria-expanded="false" aria-controls="software" style="color: black; text-decoration:none;">
<xed:output i18n="digibib.editor.software" />
</a>
</h5>
<div id="codemeta" class="collapse metadata-box">
<div id="software" class="collapse metadata-box">
<div class="card card-body">
<xed:bind xpath="mods:extension[@displayLabel='codemeta-part']/fn:map" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<xed:bind xpath="mods:extension[@type='codemeta-part']/fn:map" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<xed:bind xpath="fn:string[@key='@type']">
<input type="hidden" value="SoftwareSourceCode" />
<input type="hidden" value="SoftwareSourceCode"/>
</xed:bind>
<fieldset>
<legend class="mir-fieldset-legend mb-3">
<xed:output i18n="digibib.researchData.codeMeta.facts" />
<xed:output i18n="digibib.editor.software.codemeta.facts"/>
</legend>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="developement-status" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="version" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="application-category.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="application-sub-category.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="programming-language.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="operating-system.repeated" />
<xed:include ref="codemeta.developementStatus"/>
<xed:include ref="codemeta.version"/>
<xed:include ref="codemeta.applicationCategory.repeated"/>
<xed:include ref="codemeta.applicationSubCategory.repeated"/>
<xed:include ref="codemeta.programmingLanguage.repeated"/>
<xed:include ref="codemeta.operatingSystem.repeated"/>
</fieldset>
<fieldset>
<legend class="mir-fieldset-legend mb-3">
<xed:output i18n="digibib.researchData.codeMeta.instance" />
<xed:output i18n="digibib.editor.software.codemeta.instance"/>
</legend>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="processor-requirements.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="memory-requirements.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="storage-requirements.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="runtime-platform.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="software-requirements.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="software-suggestions.repeated" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="permissions.repeated" />
<xed:include ref="codemeta.processorRequirement.repeated"/>
<xed:include ref="codemeta.memoryRequirement.repeated"/>
<xed:include ref="codemeta.storageRequirement.repeated"/>
<xed:include ref="codemeta.runtimePlatform.repeated"/>
<xed:include ref="codemeta.softwareRequirement.repeated"/>
<xed:include ref="codemeta.softwareSuggestion.repeated"/>
<xed:include ref="codemeta.permission.repeated"/>
</fieldset>
<fieldset>
<legend class="mir-fieldset-legend mb-3">
<xed:output i18n="digibib.researchData.codeMeta.other" />
<xed:output i18n="digibib.editor.software.codemeta.other"/>
</legend>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="code-repository" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="readme" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="build-instructions" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="release-notes" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="cont-integration" />
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/codemeta-includes.xed" ref="issue-tracker" />
<xed:include ref="codemeta.codeRepository"/>
<xed:include ref="codemeta.readme"/>
<xed:include ref="codemeta.buildInstructions"/>
<xed:include ref="codemeta.releaseNotes"/>
<xed:include ref="codemeta.contIntegration"/>
<xed:include ref="codemeta.issueTracker"/>
</fieldset>
</xed:bind>
</div>
Expand All @@ -364,31 +359,18 @@

<xed:template id="genres.software">
<div class="mb-3">
<xed:output i18n="digibib.researchData.software.introductionText" />
<xed:output i18n="digibib.editor.software.introductionText"/>
</div>
<xed:include ref="research-data-base" />
<xed:include ref="codemeta-extension" />
<xed:include ref="software-extension"/>
<xed:include ref="metadata-box-script" />
</xed:template>

<xed:template id="codemeta-cleanup-rules">
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='codemeta-part']" relevant-if="*" />
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='codemeta-part']//fn:string" relevant-if="(string-length(text()) &gt; 0)" />
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='codemeta-part']//fn:array" relevant-if="*" />
<xed:cleanup-rule xpath="//mods:extension[@displayLabel='codemeta-part']//fn:map" relevant-if="(count(*) &gt; 1)" />
</xed:template>

<xed:modify ref="cleanup-rules">
<xed:include ref="codemeta-cleanup-rules" />
<xed:include ref="advanced-cleanup-rules" />
<xed:include ref="codemeta.cleanup-rules"/>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/research_data/advanced-includes.xed" ref="rd.advanced-cleanup-rules"/>
</xed:modify>

<xed:template id="research-data-extensions">
<xed:include ref="research-data-extension" />
<xed:include ref="codemeta-extension" />
<xed:include ref="metadata-box-script" />
</xed:template>

<xed:modify ref="genres.lecture">
<xed:include ref="digibib.ddc.repeat" after="sdnb.repeat" />
<xed:remove ref="sdnb.repeat" />
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/META-INF/resources/editor/research_data/advanced-includes.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,11 @@
<mir:textarea xpath="fn:string[@key='processing']" label="digibib.researchData.advanced.processing"
help-text="{i18n:digibib.researchData.advanced.processing.help}" rows="2" />
</xed:template>

<xed:template id="rd.advanced-cleanup-rules">
<xed:cleanup-rule xpath="//mods:extension[@type='advanced-part']" relevant-if="*"/>
<xed:cleanup-rule xpath="//mods:extension[@type='advanced-part']//fn:string" relevant-if="(string-length(text()) &gt; 0)"/>
<xed:cleanup-rule xpath="//mods:extension[@type='advanced-part']//fn:array" relevant-if="*"/>
<xed:cleanup-rule xpath="//mods:extension[@type='advanced-part']//fn:map" relevant-if="(count(*) &gt; 0)"/>
</xed:template>
</xed:template>
Loading