Skip to content

Commit d2d42c0

Browse files
committed
[bugfix] Make sure that elements copied into the record do not carry xmlns=''
1 parent 14f3bc0 commit d2d42c0

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/main/formGenerator/config-documentation.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
@collection - collections to be searched, should match collections in your data directory. To specify multiple collections separate with a comma: manuscripts,works,persons
7777
@wrapElement - element that will contain the search results, if different from the name of the searched element.
7878
For example the following searches all persNames, but returns results wrapped in author element for insertion into TEI record:
79-
/exist/apps/majlis/api/search/persName?format=xml&wrapElement=author&q=
79+
/exist/apps/majlis/api/search/persName?format=xml&wrapElement=tei:author&q=
8080
@q - query to search
8181
elementName - the element that will trigger the lookup
8282
formName - the name of the lookup form (usually uses same name as element, for simplicity)
@@ -153,4 +153,4 @@
153153
</elementGroups>
154154
</subform>
155155
</subforms>
156-
</config>
156+
</config>

src/main/formGenerator/config-mss.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
lookupLabel="Look up places."/>
7373
<popup formName="placeTEI" elementName="placeName" label="New place"/>
7474
<lookup
75-
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=author&amp;q="
75+
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=tei%3Aauthor&amp;q="
7676
formURL="forms/msSimple/lookup/author.xhtml"
7777
elementName="author"
7878
formName="author"
@@ -101,7 +101,7 @@
101101
@collection - collections to be searched, should match collections in your data directory
102102
@wrapElement - element that will contain the search results, if different from the name of the request
103103
example the following searches all persNames, but returns results wrapped in author element for insertion into TEI record:
104-
/exist/apps/majlis/api/search/persName?format=xml&amp;wrapElement=author&amp;q=
104+
/exist/apps/majlis/api/search/persName?format=xml&wrapElement=tei:author&q=
105105
@q - query to search
106106
elementName - the element that will trigger the lookup
107107
formName - the name of the lookup form (usually uses same name as element, for simplicity)
@@ -269,7 +269,7 @@
269269
<localSchema src="schemas/mss-codicological-definition.xml"/>
270270
<globalSchema src="schemas/mss-codicological-definition.xml"/>
271271
<xmlTemplate src="templates/full-mss-template.xml"/>
272-
<lookup api="/exist/apps/majlis/api/search/biblWorksCitation?format=xml&amp;collection=manuscripts&amp;wrapElement=idno&amp;q="
272+
<lookup api="/exist/apps/majlis/api/search/biblWorksCitation?format=xml&amp;collection=manuscripts&amp;wrapElement=tei%3Aidno&amp;q="
273273
elementName="bibl"
274274
formName="bibl"
275275
lookupLabel="Look up manuscript record"/>
@@ -297,7 +297,7 @@
297297
<globalSchema src="schemas/mss-content-description.xml"/>
298298
<xmlTemplate src="templates/full-mss-template.xml"/>
299299
<lookup
300-
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=author&amp;q="
300+
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=tei%3Aauthor&amp;q="
301301
formURL="forms/msSimple/lookup/author.xhtml"
302302
elementName="author"
303303
formName="author"
@@ -323,7 +323,7 @@
323323
<localSchema src="schemas/mss-writing-material.xml"/>
324324
<globalSchema src="schemas/mss-compiled.odd"/>
325325
<xmlTemplate src="templates/full-mss-template.xml"/>
326-
<lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;wrapElement=origPlace&amp;q=" formURL="forms/msSimple/lookup/placeName.xhtml" elementName="origPlace" formName="placeName" lookupLabel="Look up places"/>
326+
<lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;wrapElement=tei%3AorigPlace&amp;q=" formURL="forms/msSimple/lookup/placeName.xhtml" elementName="origPlace" formName="placeName" lookupLabel="Look up places"/>
327327
<formDesc>Describe the writing material, measurements and related additional properties of the manuscript.</formDesc>
328328
<elementGroups>
329329
<group groupLabel="Writing material of the manuscript." groupLabelConditionalElement="./*:material"
@@ -525,7 +525,7 @@
525525
formName="bibl"
526526
lookupLabel="Look up bibliographic record."/>
527527
<lookup
528-
api="/exist/apps/majlis/api/search/titleBibl?format=xml&amp;collection=manuscripts&amp;wrapElement=idno&amp;q="
528+
api="/exist/apps/majlis/api/search/titleBibl?format=xml&amp;collection=manuscripts&amp;wrapElement=tei%3Aidno&amp;q="
529529
formURL="forms/msSimple/lookup/titleBibl.xhtml"
530530
elementName="idno"
531531
formName="idno"
@@ -603,7 +603,7 @@
603603
<globalSchema src="schemas/mss-compiled.odd"/>
604604
<xmlTemplate src="templates/full-mss-template.xml"/>
605605
<formDesc>Describe the binding of the manuscript.</formDesc>
606-
<lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;collection=places&amp;wrapElement=origPlace&amp;q="
606+
<lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;collection=places&amp;wrapElement=tei%3AorigPlace&amp;q="
607607
formURL="forms/msSimple/lookup/placeName.xhtml"
608608
elementName="origPlace"
609609
formName="placeName"

src/main/formGenerator/config-persons.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
@collection - collections to be searched, should match collections in your data directory
4343
@wrapElement - element that will contain the search results, if different from the name of the request
4444
example the following searches all persNames, but returns results wrapped in author element for insertion into TEI record:
45-
/exist/apps/majlis/api/search/persName?format=xml&amp;wrapElement=author&amp;q=
45+
/exist/apps/majlis/api/search/persName?format=xml&wrapElement=author&q=
4646
@q - query to search
4747
elementName - the element that will trigger the lookup
4848
formName - the name of the lookup form (usually uses same name as element, for simplicity)

src/main/formGenerator/config-works.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<lookups>
4444
<lookup api="/exist/apps/majlis/api/search/persName?format=xml&amp;q=" formURL="forms/mssTEI/lookup/persName.xhtml" elementName="persName" formName="persName" lookupLabel="Look up persons"/>
4545
<popup formName="personTEI" elementName="persName" label="New person"/>
46-
<lookup api="/exist/apps/majlis/api/search/biblWorksAuthor?format=xml&amp;collection=persons&amp;wrapElement=author&amp;q=" formURL="forms/worksTEI/lookup/persName.xhtml" elementName="author" formName="persName" lookupLabel="Look up authors"/>
46+
<lookup api="/exist/apps/majlis/api/search/biblWorksAuthor?format=xml&amp;collection=persons&amp;wrapElement=tei%3Aauthor&amp;q=" formURL="forms/worksTEI/lookup/persName.xhtml" elementName="author" formName="persName" lookupLabel="Look up authors"/>
4747
<popup formName="personTEI" elementName="authors" label="New author"/>
4848
<lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;q=" formURL="forms/mssTEI/lookup/placeName.xhtml" elementName="placeName" formName="placeName" lookupLabel="Look up places"/>
4949
<popup formName="placeTEI" elementName="placeName" label="New place"/>
@@ -91,13 +91,13 @@
9191
<globalSchema src="schemas/work-schema.xml"/>
9292
<xmlTemplate src="templates/work-fulltemplate.xml"/>
9393
<lookup
94-
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=author&amp;q="
94+
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=tei%3Aauthor&amp;q="
9595
formURL="forms/msSimple/lookup/author.xhtml"
9696
elementName="author"
9797
formName="author"
9898
lookupLabel="Look up author record."/>
9999
<lookup
100-
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=persName&amp;q="
100+
api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=tei%3ApersName&amp;q="
101101
formURL="forms/msSimple/lookup/author.xhtml"
102102
elementName="persName"
103103
formName="persName"

0 commit comments

Comments
 (0)