Merge pull request majlis-erc#779 from majlis-erc/774-lookup-bugs

lookups fixed

Author: mMoliere

src/main/formGenerator/config-mss.xml

@@ -236,6 +236,7 @@
         <subform xpath="/tei:TEI/descendant::tei:msDesc/tei:additional/tei:surrogates/tei:listBibl" formName="reproductions"
             formLabel="Reproductions" repeat="no">
             <lookup elementName="title" suppress="true"/>
+            <lookup elementName="bibl" suppress="true"/>
             <localSchema src="schemas/mss-reproductions.xml"/>
             <globalSchema src="schemas/mss-reproductions.xml"/>
             <xmlTemplate src="templates/full-mss-template.xml"/>
@@ -598,7 +599,11 @@
             <globalSchema src="schemas/mss-compiled.odd"/>
             <xmlTemplate src="templates/full-mss-template.xml"/>
             <formDesc>Describe the binding of the manuscript.</formDesc>
-            <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"/>
+            <lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;collection=places&amp;wrapElement=origPlace&amp;q=" 
+                formURL="forms/msSimple/lookup/placeName.xhtml" 
+                elementName="origPlace" 
+                formName="placeName" 
+                lookupLabel="Look up places"/>
             <elementGroups>
                 <group groupLabel="Binding's origin, material, and dimensions." groupNo="1">
                     <element xpath="tei:decoNote"/>
@@ -709,4 +714,4 @@
             </elementGroups>
         </subform>        
     </subforms>
-</config>   
+</config>   

src/main/formGenerator/config-persons.xml

@@ -103,6 +103,11 @@
             <localSchema src="schemas/person-schema.xml"/>
             <localSchema src="schemas/person-schema.xml"/>
             <xmlTemplate src="templates/persons-template.xml"/>
+            <lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;collection=places&amp;q=" 
+                formURL="forms/msSimple/lookup/placeName.xhtml" 
+                elementName="placeName" 
+                formName="placeName" 
+                lookupLabel="Look up places"/>
             <elementGroups>
                 <group groupLabel="Biographical data." groupNo="1" repeatable="no">
                     <element xpath="tei:note"/>
@@ -191,6 +196,11 @@
             <localSchema src="schemas/org-schema.xml"/>
             <localSchema src="schemas/org-schema.xml"/>
             <xmlTemplate src="templates/org-template.xml"/>
+            <lookup api="/exist/apps/majlis/api/search/placeName?format=xml&amp;collection=places&amp;q=" 
+                formURL="forms/msSimple/lookup/placeName.xhtml" 
+                elementName="placeName" 
+                formName="placeName" 
+                lookupLabel="Look up places"/>
             <elementGroups>
                 <group groupLabel="Notes." groupNo="1" repeatable="no">
                     <element xpath="tei:note"/>
@@ -236,4 +246,4 @@
             </elementGroups>
         </subform>
     </subforms>
-</config>
+</config>

src/main/formGenerator/config-works.xml

@@ -87,7 +87,18 @@
             <localSchema src="schemas/work-schema.xml"/>
             <globalSchema src="schemas/work-schema.xml"/>
             <xmlTemplate src="templates/work-fulltemplate.xml"/>
-            <lookup api="/exist/apps/majlis/api/search/persName?format=xml&amp;wrapElement=author&amp;q=" formURL="forms/mssTEI/lookup/persName.xhtml" elementName="author" formName="persName" lookupLabel="Look up author"/>
+            <lookup
+                api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=author&amp;q="
+                formURL="forms/msSimple/lookup/author.xhtml"
+                elementName="author"
+                formName="author"
+                lookupLabel="Look up author record."/>
+            <lookup
+                api="/exist/apps/majlis/api/search/persName?format=xml&amp;collection=persons&amp;wrapElement=persName&amp;q="
+                formURL="forms/msSimple/lookup/author.xhtml"
+                elementName="persName"
+                formName="persName"
+                lookupLabel="Look up person record."/>
             <elementGroups>
                 <group groupLabel="Add bibliographic information about the work." groupNo="1" repeatable="no">
                     <element xpath="tei:title"/>
@@ -175,4 +186,4 @@
             </elementGroups>
         </subform>
     </subforms>
-</config>
+</config>

src/main/formGenerator/schemas/mss-incodicated-documents.xml

@@ -262,9 +262,11 @@ End license statement: do not remove --><!--requirements:
                         </content>
                         <attList>
                             <attDef ident="key" mode="delete"/>
-                            <attDef ident="ref" mode="change" style="restricted">
+                            <!--Temporarily removed  @style="restricted" since this creates an error in the HTML-->
+                            <attDef ident="ref" mode="change">
                                 <gloss>Place identifier</gloss>
                             </attDef>
+                            <!--Temporarily removed  @style="restricted" since this creates an error in the HTML-->
                             <attDef ident="role" mode="change" style="restricted">
                                 <gloss>Role</gloss>
                                 <valList mode="change" type="closed">
@@ -291,6 +293,10 @@ End license statement: do not remove --><!--requirements:
                             <textNode/>
                         </content>
                         <attList>
+                            <!--Temporarily removed  @style="restricted" since this creates an error in the HTML-->
+                            <attDef ident="ref" mode="change">
+                                <gloss>Place identifier</gloss>
+                            </attDef>
                             <attDef ident="level" mode="delete"/>
                             <attDef ident="xml:lang" mode="delete"/>
                             <attDef ident="ana" mode="delete"/>
@@ -482,7 +488,7 @@ End license statement: do not remove --><!--requirements:
                             <textNode/>
                         </content>
                         <attList>
-                            <attDef ident="role" mode="change" style="restricted">
+                            <attDef ident="role" mode="change">
                                 <gloss>Role</gloss>
                                 <valList mode="change" type="closed">
                                     <valItem mode="add" ident="mentioned">
@@ -493,7 +499,8 @@ End license statement: do not remove --><!--requirements:
                             <attDef ident="nymRef" mode="delete"/>
                             <attDef ident="key" mode="delete"/>
                             <attDef ident="type" mode="delete"/>
-                            <attDef ident="ref" mode="change" style="restricted">
+                            <!--Temporarily removed  @style="restricted" since this creates an error in the HTML-->
+                            <attDef ident="ref" mode="change">
                                 <gloss>Person identifier</gloss>
                             </attDef>
                         </attList>

src/main/formGenerator/schemas/mss-script-hand-description.xml

@@ -377,7 +377,6 @@ End license statement: do not remove -->
                                     </valItem>
                                 </valList>
                             </attDef>
-                            <attDef ident="role" mode="delete"/>
                             <attDef ident="type" mode="delete"/>
                             <attDef ident="ref">
                                 <gloss>Person identifier</gloss>

src/main/formGenerator/schemas/relations-schema.xml

@@ -146,8 +146,6 @@ End license statement: do not remove -->
                             <elementRef key="persName"/>
                             <elementRef key="placeName"/>
                             <elementRef key="date"/>
-                            <elementRef key="idno"/>
-                            <elementRef key="title"/>
                         </content>
                     </elementSpec>
 

src/main/formGenerator/templates/relations-fulltemplate.xml

@@ -89,8 +89,6 @@
                             <persName ref=""/>
                             <persName ref=""/>
                             <placeName ref=""/>
-                            <idno ref=""/>
-                            <title ref=""/>
                             <date/>
                         </desc>
                     </relation>

src/main/formGenerator/templates/relations-template.xml

@@ -7,8 +7,6 @@
                 <persName ref=""/>
                 <persName ref=""/>
                 <placeName ref=""/>
-                <idno ref=""/>
-                <title ref=""/>
                 <date/>
             </desc>
         </relation>