Commit 8d02434c authored by Jens Kupferschmidt's avatar Jens Kupferschmidt
Browse files

add fields ethnikon and instMembership

parent 385ca7f9
......@@ -167,7 +167,7 @@
<manifestEntries>
<MCR-Artifact-Id>${project.artifactId}</MCR-Artifact-Id>
<MCR-Application-Module>${project.name}</MCR-Application-Module>
<Priority>60</Priority>
<Priority>33</Priority>
</manifestEntries>
</archive>
</configuration>
......
......@@ -21,6 +21,9 @@
<type name="trisperson" />
<type name="trisname" />
</element>
<element name="ethnikon" type="classification" minOccurs="0" maxOccurs="1" style="select" notinherit="ignore" heritable="ignore">
<classification id="viafEthnika"/>
</element>
<element name="firstDate" type="historydate" minOccurs="0" maxOccurs="1" style="small" notinherit="ignore" heritable="ignore" />
<element name="firstPlace" type="text" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
<element name="firstPlaceIdentifier" type="text" minOccurs="0" maxOccurs="5" style="small" notinherit="ignore" heritable="ignore" >
......@@ -62,8 +65,9 @@
<type name="trisplace" />
</element>
<element name="floruit" type="historydate" minOccurs="0" maxOccurs="1" style="small" notinherit="ignore" heritable="ignore" />
<element name="instMembership" type="text" minOccurs="0" maxOccurs="unbounded" style="big" notinherit="ignore" heritable="ignore" />
<element name="literarySource" type="text" minOccurs="0" maxOccurs="unbounded" style="big" notinherit="ignore" heritable="ignore" />
<element name="bibReference" type="text" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
<element name="bibReference" type="text" minOccurs="0" maxOccurs="unbounded" style="big" notinherit="ignore" heritable="ignore" />
<element name="note" type="text" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
<element name="internalRemark" type="text" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
<element name="link" type="href" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
......
......@@ -30,6 +30,8 @@
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="identifier-ltr" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="ethnikon-ltr" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="variantName-ltr" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="firstDate-ltr" />
......@@ -60,6 +62,8 @@
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="floruit-ltr" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="instMembership-ltr" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="literarySource-ltr" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="bibRefernce-ltr" />
......
......@@ -31,6 +31,8 @@
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="identifier-rtl" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="ethnikon-rtl" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="variantName-rtl" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="firstDate-rtl" />
......@@ -61,6 +63,8 @@
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="floruit-rtl" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="instMembership-rtl" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="literarySource-rtl" />
<xed:include uri="webapp:editor/import_editor_form_viaf_common.xed" ref="bibRefernce-rtl" />
......
......@@ -335,6 +335,64 @@
</tr>
</xed:template>
<xed:template id="ethnikon-ltr">
<tr>
<td class="dpt_editor_name-ltr">
<label for="ethnikon">
<xed:output i18n="module.dptbase.viaf.ethnikon.label" />
</label>
</td>
<td class="dpt_editor_value-ltr">
<xed:bind xpath="def.ethnikon[@class='MCRMetaClassification']">
<xed:bind xpath="@notinherit" default="true" />
<xed:bind xpath="@heritable" default="false" />
<p>
<xed:bind xpath="ethnikon[@classid='viafEthnika']">
<xed:bind xpath="@categid">
<select class="dpt_editor_select">
<option value="">
<xed:output i18n="module.dptbase.common.editor.choose" />
</option>
<xed:include uri="xslStyle:items2options:classification:editor[Text]:-1:children:viafEthnika"
cacheable="false" />
</select>
</xed:bind>
</xed:bind>
</p>
</xed:bind>
</td>
</tr>
</xed:template>
<xed:template id="ethnikon-rtl">
<tr>
<td class="dpt_editor_name-rtl">
<label for="confession">
<xed:output i18n="module.dptbase.viaf.ethnikon.label" />
</label>
</td>
<td class="dpt_editor_value-rtl">
<xed:bind xpath="def.ethnikon[@class='MCRMetaClassification']">
<xed:bind xpath="@notinherit" default="true" />
<xed:bind xpath="@heritable" default="false" />
<p>
<xed:bind xpath="ethnikon[@classid='viafEthnika']">
<xed:bind xpath="@categid">
<select class="dpt_editor_select">
<option value="">
<xed:output i18n="module.dptbase.common.editor.choose" />
</option>
<xed:include uri="xslStyle:items2options:classification:editor[Text]:-1:children:viafEthnika"
cacheable="false" />
</select>
</xed:bind>
</xed:bind>
</p>
</xed:bind>
</td>
</tr>
</xed:template>
<xed:template id="firstDate-ltr">
<tr>
<td class="dpt_editor_name-ltr">
......@@ -1179,6 +1237,60 @@
</tr>
</xed:template>
<xed:template id="instMembership-ltr">
<tr>
<td class="dpt_editor_name-ltr">
<label for="instMembership">
<xed:output i18n="module.dptbase.viaf.instMembership.label" />
</label>
</td>
<td class="dpt_editor_value-ltr">
<xed:bind xpath="def.instMembership[@class='MCRMetaLangText']">
<xed:bind xpath="@notinherit" default="true" />
<xed:bind xpath="@heritable" default="false" />
<xed:repeat xpath="instMembership" min="1" max="5">
<xed:bind xpath="@inherited" default="0" />
<p>
<xed:include uri="webapp:editor/import_editor_form_viaf_application.xed" ref="language_selection" />
<xed:controls>append remove up down</xed:controls>
<br />
<p>
<textarea type="text" class="dpt_editor_inputarea" id="instMembership" maxlength="4096" height="7" />
</p>
</p>
</xed:repeat>
</xed:bind>
</td>
</tr>
</xed:template>
<xed:template id="instMembership-rtl">
<tr>
<td class="dpt_editor_name-rtl">
<label for="instMembership">
<xed:output i18n="module.dptbase.viaf.instMembership.label" />
</label>
</td>
<td class="dpt_editor_value-rtl">
<xed:bind xpath="def.instMembership[@class='MCRMetaLangText']">
<xed:bind xpath="@notinherit" default="true" />
<xed:bind xpath="@heritable" default="false" />
<xed:repeat xpath="instMembership" min="1" max="5">
<xed:bind xpath="@inherited" default="0" />
<p>
<xed:include uri="webapp:editor/import_editor_form_viaf_application.xed" ref="language_selection" />
<xed:controls>append remove up down</xed:controls>
<br />
<p>
<textarea type="text" class="dpt_editor_inputarea" id="instMembership" maxlength="4096" height="7" />
</p>
</p>
</xed:repeat>
</xed:bind>
</td>
</tr>
</xed:template>
<xed:template id="literarySource-ltr">
<tr>
<td class="dpt_editor_name-ltr">
......
<?xml version="1.0" encoding="UTF-8"?>
<mycoreclass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MCRClassification.xsd"
ID="viafEthnika">
<label xml:lang="de" text="Ethnika"/>
<categories>
<category ID="not_used">
<label xml:lang="de" text="nicht belegt"/>
<label xml:lang="en" text="not used"/>
</category>
</categories>
</mycoreclass>
......@@ -14,6 +14,8 @@ module.dptbase.viaf.confession.view = Konfession
module.dptbase.viaf.editor.headline = Die mit * gekennzeichneten Daten sind Pflichtfelder.
module.dptbase.viaf.editor.label = lokalen Normdateieintrag
module.dptbase.viaf.editor.validation = Bitte f\u00FCllen Sie die markierten Felder noch aus!
module.dptbase.viaf.ethnikon.label = Ethnikon
module.dptbase.viaf.ethnikon.view = Ethnikon
module.dptbase.viaf.firstDate.from = von
module.dptbase.viaf.firstDate.label = Geburtsdatum
module.dptbase.viaf.firstDate.text = Text
......@@ -59,6 +61,8 @@ module.dptbase.viaf.indexpage.sub.introtext.viaf = \u00DCber diese Seite k\u00
module.dptbase.viaf.indexpage.title = Index der GND-Entit\u00E4ten
module.dptbase.viaf.indexpage.title.all = Index
module.dptbase.viaf.indexpage.title.filtered = Index (gefiltert)
module.dptbase.viaf.instMembership.label = institutionelle Zugeh\u00F6rigkeit
module.dptbase.viaf.instMembership.view = institutionelle Zugeh\u00F6rigkeit
module.dptbase.viaf.internalRemark.label = Interne Bemerkung
module.dptbase.viaf.internalRemark.view = Interne Bemerkung
module.dptbase.viaf.lifedata.label = Lebensdaten
......
......@@ -14,6 +14,8 @@ module.dptbase.viaf.confession.view = Confession of faith
module.dptbase.viaf.editor.headline = Fields with * are required.
module.dptbase.viaf.editor.label = local authority file entry
module.dptbase.viaf.editor.validation = Correct the marked fields!
module.dptbase.viaf.ethnikon.label = Ethnikon
module.dptbase.viaf.ethnikon.view = Ethnikon
module.dptbase.viaf.firstDate.from = from
module.dptbase.viaf.firstDate.label = Date of birth
module.dptbase.viaf.firstDate.text = text
......@@ -59,6 +61,8 @@ module.dptbase.viaf.indexpage.sub.introtext.viaf = Select persons over this pa
module.dptbase.viaf.indexpage.title = Index of authority files
module.dptbase.viaf.indexpage.title.all = Index of authority files
module.dptbase.viaf.indexpage.title.filtered = Index of authority files (filtered)
module.dptbase.viaf.instMembership.label = institutional membership
module.dptbase.viaf.instMembership.view = institutional membership
module.dptbase.viaf.internalRemark.label = Internal Remark
module.dptbase.viaf.internalRemark.view = Internal Remark
module.dptbase.viaf.lifedata.label = Data of life
......
......@@ -119,6 +119,18 @@ function showPNDBeaconResult(result) {
<div class="table-responsive">
<table class="table metadata_table">
<!-- ethnikon **************************************************** -->
<xsl:if test="./metadata/def.ethnikon">
<xsl:call-template name="printValueLineClassification">
<xsl:with-param name="i18n" select="'module.dptbase.viaf.ethnikon.view'"/>
<xsl:with-param name="nodes" select="./metadata/def.ethnikon/ethnikon"/>
<xsl:with-param name="next" select="'&lt;br /&gt;'"/>
<xsl:with-param name="host" select="$objectHost"/>
<xsl:with-param name="bold" select="false()"/>
</xsl:call-template>
</xsl:if>
<!-- Alternative name ******************************************** -->
<xsl:if test="./metadata/def.preferredName/preferredName[not(lang($CurrentLang))] or ./metadata/def.variantName">
......@@ -665,6 +677,17 @@ function showPNDBeaconResult(result) {
</xsl:call-template>
</xsl:if>
<!-- institutional membership ********************************** -->
<xsl:if test="./metadata/def.instMembership">
<xsl:call-template name="printValueLinePrintI18N">
<xsl:with-param name="i18n" select="'module.dptbase.viaf.instMembership.view'"/>
<xsl:with-param name="nodes" select="./metadata/def.instMembership/instMembership"/>
<xsl:with-param name="next" select="'&lt;br /&gt;'"/>
<xsl:with-param name="bold" select="false()"/>
</xsl:call-template>
</xsl:if>
<!-- literary source ******************************************* -->
<xsl:if test="./metadata/def.literarySource">
......
......@@ -15,6 +15,9 @@
<xsl:when test="name() = 'def.recordSource'">
<xsl:apply-templates select="." mode="classification-native" />
</xsl:when>
<xsl:when test="name() = 'def.ethnos'">
<xsl:apply-templates select="." mode="classification-native" />
</xsl:when>
<xsl:when test="name() = 'def.confession'">
<xsl:apply-templates select="." mode="classification-native" />
</xsl:when>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment