Merge pull request #264 from VandyVRC/main

Update to latest version.
VandyVRC · Dec 1, 2023 · ef32e1b · ef32e1b
2 parents 9d49bd9 + bb226eb
commit ef32e1b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/expath-pkg.xml b/expath-pkg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://srophe.org/tcadrt" abbrev="tcadrt" version="1.23" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="http://srophe.org/tcadrt" abbrev="tcadrt" version="1.24" spec="1.0">
     <title>Architectura Sinica</title>
     <!-- eXist shared resources -->
     <dependency package="http://exist-db.org/html-templating"/>

diff --git a/modules/content-negotiation/tei2tsv.xqm b/modules/content-negotiation/tei2tsv.xqm
@@ -130,11 +130,11 @@ return concat($headers,($data))
 
 declare function tei2tsv:tei2tsv-keywords($nodes as node()*) {
 let $headers :=concat(string-join(
-                ('title', 'uri','principal','principal2','principal3','editor', 'editor2', 'editor3', 'published','team',
+                ('title', 'uri','principal','editor', 'editor2', 'editor3', 'published','team',
                  'term-en','term-literal_translation','term-zh-latn-pinyin','term-zh-Hant',
                  'term-zh-Hans','term-Wade-Giles','term-other','term-other2','term-other3','term-other4',
                  'term-other5','term-other6','term-other7','term-other8','term-other9','term-other10',
-                 'getty-scopeNote-en','getty-scopeNote-zh-hant',
+                 'note','note-en','note-zh-Hant','getty-scopeNote-en','getty-scopeNote-zh-hant',
                  'sources-note-en','sources-note-zh-hant',
                  'scope-note-brief-en','scope-note-brief-zh-hant',
                  'scope-note-full-en','scope-note-full-zh-hant',
@@ -184,6 +184,9 @@ let $data :=
     let $term14 := tei2tsv:value($n/tei:term[13])  
     let $term15 := tei2tsv:value($n/tei:term[14])  
     let $term16 := tei2tsv:value($n/tei:term[15])  
+    let $note := tei2tsv:value($n/descendant::tei:note[@type="note" or @type="Note"])
+    let $note-en := tei2tsv:value($n/descendant::tei:note[@type="Note" or @type="Note"][@xml:lang = 'en' or not(@xml:lang)])
+    let $note-zh-hant := tei2tsv:value($n/descendant::tei:note[@type="Note" or @type="Note"][@xml:lang = 'zh-Hant'])
     let $getty-scopeNote-en := tei2tsv:value($n/descendant::tei:note[@type="getty:scopeNote" or @type="Scope Note"][@xml:lang = 'en' or not(@xml:lang)])
     let $getty-scopeNote-zh-hant := tei2tsv:value($n/descendant::tei:note[@type="getty:scopeNote" or @type="Scope Note"][@xml:lang = 'zh-Hant'])
     let $sources-note-en := tei2tsv:value($n/tei:note[@type="sources"]/tei:p[@xml:lang = 'en' or not(@xml:lang)])
@@ -228,10 +231,9 @@ let $data :=
         return concat($r/@ref,': ', $r/@passive),' | ')
     return 
         concat(
-            string-join(($title,$uri,$principal,$principal2,
-            $principal3,$editor,$editor2,$editor3,$published,$team,
+            string-join(($title,$uri,$principal,$editor,$editor2,$editor3,$published,$team,
             $term1,$term2,$term3,$term4,$term5,$term6,
-            $term7,$term8,$term9,$term10,$term11,$term12,$term13,$term14,$term15,$term16,$getty-scopeNote-en, $getty-scopeNote-zh-hant,
+            $term7,$term8,$term9,$term10,$term11,$term12,$term13,$term14,$term15,$term16,$note,$note-en,$note-zh-hant,$getty-scopeNote-en,$getty-scopeNote-zh-hant,
             $sources-note-en,$sources-note-zh-hant,$scope-note-brief-en,$scope-note-brief-zh-hant,    
             $scope-note-full-en,$scope-note-full-zh-hant,
             $note-brief-en,$note-brief-zh-hant,$note-full-en,$note-full-zh-hant,