New: Enable XInclude when processing authority files

See msDesc/consolidated-tei-schema#6
bodleian · Jan 4, 2018 · 564b598 · 564b598
1 parent b58026a
commit 564b598
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/processing/generate-solr-document.sh b/processing/generate-solr-document.sh
@@ -30,7 +30,7 @@ echo "Processing TEI files in collections folder using $1 on $(date +"%Y-%m-%d %
 
 # Run XQuery to build Solr XML index files
 echo "Generating Solr XML file containing $3 records..."
-java -Xmx1G -Xms1G -cp "saxon/saxon9he.jar" net.sf.saxon.Query -q:$1 1> solr/$2 2>> $LOGFILE
+java -Xmx1G -Xms1G -cp "saxon/saxon9he.jar" net.sf.saxon.Query -xi:on -q:$1 1> solr/$2 2>> $LOGFILE
 if [ $? -gt 0 ]; then
     echo "XQuery failed. Re-indexing of $3 records cancelled. Please raise an issue on GitHub, attaching $LOGFILE"
     exit 1;

diff --git a/processing/organizations.xquery b/processing/organizations.xquery
@@ -62,11 +62,10 @@ declare option saxon:output "indent=yes";
             (
             bod:logging('info', 'Skipping organization in places.xml but not in any manuscript', ($orgid, $orgname))
             )
-
 }
 
 {
-    let $controlledorgids := doc("../places.xml")//tei:org/@xml:id/string()
+    let $controlledorgids := distinct-values(doc("../places.xml")//tei:org/@xml:id/string())
     let $allorgs := collection("../collections?select=*.xml;recurse=yes")//tei:orgName
     let $allorgids := distinct-values($allorgs/@key/string())
     for $orgid in $allorgids

diff --git a/processing/people.xquery b/processing/people.xquery
@@ -65,7 +65,7 @@ declare option saxon:output "indent=yes";
 }
 
 {
-    let $controlledpeopleids := doc("../persons.xml")//tei:person/@xml:id/string()
+    let $controlledpeopleids := distinct-values(doc("../persons.xml")//tei:person/@xml:id/string())
     let $allpeople := collection("../collections?select=*.xml;recurse=yes")//tei:TEI//(tei:persName|tei:author)
     let $allpeopleids := distinct-values($allpeople/@key/string())
     for $personid in $allpeopleids

diff --git a/processing/places.xquery b/processing/places.xquery
@@ -58,7 +58,7 @@ declare option saxon:output "indent=yes";
 }
 
 {
-    let $controlledplaceids := doc("../places.xml")//tei:place/@xml:id/string()
+    let $controlledplaceids := distinct-values(doc("../places.xml")//tei:place/@xml:id/string())
     let $allplaces := collection("../collections?select=*.xml;recurse=yes")//tei:TEI//((tei:country|tei:settlement)[ancestor::tei:history]|tei:placeName)
     let $allplaceids := distinct-values($allplaces/@key/string())
     for $placeid in $allplaceids

diff --git a/processing/works.xquery b/processing/works.xquery
@@ -46,7 +46,7 @@ declare option saxon:output "indent=yes";
 }
 
 {
-    let $controlledworkids := doc("../works.xml")//tei:listBibl/tei:bibl/@xml:id/string()
+    let $controlledworkids := distinct-values(doc("../works.xml")//tei:listBibl/tei:bibl/@xml:id/string())
     let $allworks := collection("../collections?select=*.xml;recurse=yes")//tei:TEI//tei:title
     let $allworksids := distinct-values($allworks/@key/string())
     for $workid in $allworksids