support wega iconography images for orgs

Edirom · Mar 5, 2024 · cb93e79 · cb93e79
1 parent 3a0111d
commit cb93e79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/img.xqm b/modules/img.xqm
@@ -439,6 +439,7 @@ declare %private function img:wega-images($model as map(*), $lang as xs:string)
         for $fig in core:getOrCreateColl('iconography', $model('docID'), true())//tei:figure[tei:graphic]
         let $docType := 
             if($fig/tei:figDesc/tei:listPlace) then 'places'
+            else if($fig/tei:figDesc/tei:listOrg) then 'orgs'
             else 'persons'
         let $iiifURI := $iiifImageApi || encode-for-uri(string-join(($docType, substring($model('docID'), 1, 5) || 'xx', $model('docID'), $fig/tei:graphic/@url), '/'))
         order by $fig/@n (: markup with <figure n="portrait"> takes precedence  :)

diff --git a/modules/wdt.xqm b/modules/wdt.xqm
@@ -541,10 +541,14 @@ declare function wdt:iconography($item as item()*) as map(*) {
             else false()
         },
         'filter' : function() as document-node()* {
-            $item/root()/descendant::tei:person[@corresp]/root() | $item/root()/descendant::tei:place[@corresp]/root()
+            $item/root()/descendant::tei:person[@corresp]/root() | 
+            $item/root()/descendant::tei:place[@corresp]/root() |
+            $item/root()/descendant::tei:org[@corresp]/root()
         },
         'filter-by-person' : function($personID as xs:string) as document-node()* {
-            $item/root()/descendant::tei:person[@corresp = $personID]/root() | $item/root()/descendant::tei:place[@corresp = $personID]/root()
+            $item/root()/descendant::tei:person[@corresp = $personID]/root() | 
+            $item/root()/descendant::tei:place[@corresp = $personID]/root() |
+            $item/root()/descendant::tei:org[@corresp = $personID]/root()
         },
         'filter-by-date' : function($dateFrom as xs:date?, $dateTo as xs:date?) as document-node()* {
             ()
@@ -555,7 +559,7 @@ declare function wdt:iconography($item as item()*) as map(*) {
             for $i in wdt:iconography($item)('filter')() order by sort:index('iconography', $i) descending return $i
         },
         'init-collection' : function() as document-node()* {
-            crud:data-collection('iconography')//(tei:place|tei:person)[@corresp]/root()
+            crud:data-collection('iconography')//(tei:place|tei:person|tei:org)[@corresp]/root()
         },
         'init-sortIndex' : function() as item()* {
             sort:create-index-callback('iconography', wdt:iconography(())('init-collection')(), function($node) { $node//data(@corresp) }, ())