From 0be5977a0798de43b455d6db619edc10a6936935 Mon Sep 17 00:00:00 2001 From: Winona Salesky Date: Mon, 1 Jun 2020 12:58:42 -0400 Subject: [PATCH 01/12] general app updates for eXist.v5 --- controller.xql | 2 +- expath-pkg.xml | 2 +- modules/app.xql | 24 +++++++-------- modules/config.xqm | 2 +- modules/content-negotiation/atom.xqm | 2 +- modules/content-negotiation/bibl2html.xqm | 6 ++-- .../content-negotiation.xql | 8 ++--- .../content-negotiation.xqm | 20 ++++++------- modules/content-negotiation/geojson.xqm | 4 +-- modules/content-negotiation/geokml.xqm | 2 +- modules/content-negotiation/jsonld.xqm | 6 ++-- modules/content-negotiation/tei2dc.xqm | 2 +- modules/content-negotiation/tei2html.xqm | 6 ++-- modules/content-negotiation/tei2rdf.xqm | 10 +++---- modules/content-negotiation/tei2ttl.xqm | 10 +++---- modules/content-negotiation/tei2txt.xqm | 4 +-- modules/email.xql | 2 +- modules/lib/browse.xqm | 16 +++++----- modules/lib/data.xqm | 6 ++-- modules/lib/facet.xqm | 2 +- modules/lib/get-related.xqm | 26 ++++++++-------- modules/lib/global.xqm | 4 +-- modules/lib/maps.xqm | 6 ++-- modules/lib/paging.xqm | 4 +-- modules/lib/timeline.xqm | 4 +-- modules/person.xqm | 18 +++++------ modules/place.xqm | 10 +++---- modules/rest.xqm | 8 ++--- modules/search/bhse-search.xqm | 8 ++--- modules/search/bibl-search.xqm | 8 ++--- modules/search/ms-search.xqm | 8 ++--- modules/search/nhsl-search.xqm | 8 ++--- modules/search/persons-search.xqm | 8 ++--- modules/search/places-search.xqm | 8 ++--- modules/search/search.xqm | 30 +++++++++---------- modules/search/spear-search.xqm | 8 ++--- modules/teiDocs/teiDocs.xqm | 2 +- modules/view.xql | 12 ++++---- repo.xml | 6 +--- 39 files changed, 158 insertions(+), 164 deletions(-) diff --git a/controller.xql b/controller.xql index 177c6769b..349c0c0d7 100644 --- a/controller.xql +++ b/controller.xql @@ -1,6 +1,6 @@ xquery version "3.0"; -import module namespace config="http://syriaca.org/srophe/config" at "modules/config.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "modules/config.xqm"; declare variable $exist:path external; declare variable $exist:resource external; diff --git a/expath-pkg.xml b/expath-pkg.xml index c05d497bc..b53dafa5a 100644 --- a/expath-pkg.xml +++ b/expath-pkg.xml @@ -1,5 +1,5 @@ - + The Srophe web application \ No newline at end of file diff --git a/modules/app.xql b/modules/app.xql index c34d8ebc7..b2d2a199c 100644 --- a/modules/app.xql +++ b/modules/app.xql @@ -4,21 +4,21 @@ xquery version "3.1"; : Output TEI to HTML via eXist-db templating system. : Add your own custom modules at the end of the file. :) -module namespace app="http://syriaca.org/srophe/templates"; +module namespace app="http://srophe.org/srophe/templates"; (:eXist templating module:) import module namespace templates="http://exist-db.org/xquery/templates" ; (: Import Srophe application modules. :) -import module namespace config="http://syriaca.org/srophe/config" at "config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "lib/data.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "lib/data.xqm"; import module namespace facet="http://expath.org/ns/facet" at "lib/facet.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "lib/global.xqm"; -import module namespace maps="http://syriaca.org/srophe/maps" at "lib/maps.xqm"; -import module namespace page="http://syriaca.org/srophe/page" at "lib/paging.xqm"; -import module namespace rel="http://syriaca.org/srophe/related" at "lib/get-related.xqm"; -import module namespace teiDocs="http://syriaca.org/srophe/teiDocs" at "teiDocs/teiDocs.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "content-negotiation/tei2html.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "lib/global.xqm"; +import module namespace maps="http://srophe.org/srophe/maps" at "lib/maps.xqm"; +import module namespace page="http://srophe.org/srophe/page" at "lib/paging.xqm"; +import module namespace rel="http://srophe.org/srophe/related" at "lib/get-related.xqm"; +import module namespace teiDocs="http://srophe.org/srophe/teiDocs" at "teiDocs/teiDocs.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "content-negotiation/tei2html.xqm"; (: Namespaces :) declare namespace http="http://expath.org/ns/http-client"; @@ -54,8 +54,8 @@ declare function app:get-work($node as node(), $model as map(*)) { ('No record found. ',xmldb:encode-uri($config:data-root || "/" || request:get-parameter('doc', '') || '.xml')) (: Debugging ('No record found. ',xmldb:encode-uri($config:data-root || "/" || request:get-parameter('doc', '') || '.xml')):) (:response:redirect-to(xs:anyURI(concat($config:nav-base, '/404.html'))):) - else map {"hits" := $rec } - else map {"hits" := 'Output plain HTML page'} + else map {"hits" : $rec } + else map {"hits" : 'Output plain HTML page'} }; (:~ @@ -360,7 +360,7 @@ declare function app:get-wiki($node as node(), $model as map(*), $wiki-uri as xs concat($wiki-uri, request:get-parameter('wiki-page', '')) else $wiki-uri let $wiki-data := app:wiki-rest-request($uri) - return map {"hits" := $wiki-data} + return map {"hits" : $wiki-data} }; (:~ diff --git a/modules/config.xqm b/modules/config.xqm index fd4bb46d5..b79fde221 100644 --- a/modules/config.xqm +++ b/modules/config.xqm @@ -4,7 +4,7 @@ xquery version "3.0"; : A set of helper functions to access the application context from : within a module. :) -module namespace config="http://syriaca.org/srophe/config"; +module namespace config="http://srophe.org/srophe/config"; declare namespace templates="http://exist-db.org/xquery/templates"; diff --git a/modules/content-negotiation/atom.xqm b/modules/content-negotiation/atom.xqm index d66756434..022b6d36b 100644 --- a/modules/content-negotiation/atom.xqm +++ b/modules/content-negotiation/atom.xqm @@ -7,7 +7,7 @@ xquery version "3.0"; : @param $start start paged results : @param $perpage default set to 25 can be changed via perpage param :) -module namespace feed="http://syriaca.org/srophe/atom"; +module namespace feed="http://srophe.org/srophe/atom"; declare namespace tei="http://www.tei-c.org/ns/1.0"; declare namespace atom="http://www.w3.org/2005/Atom"; diff --git a/modules/content-negotiation/bibl2html.xqm b/modules/content-negotiation/bibl2html.xqm index 66cef0288..a17e69a07 100644 --- a/modules/content-negotiation/bibl2html.xqm +++ b/modules/content-negotiation/bibl2html.xqm @@ -3,9 +3,9 @@ xquery version "3.0"; : Builds tei conversions. Citation module. :) -module namespace bibl2html="http://syriaca.org/srophe/bibl2html"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "tei2html.xqm"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +module namespace bibl2html="http://srophe.org/srophe/bibl2html"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "tei2html.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; declare namespace html="http://purl.org/dc/elements/1.1/"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/content-negotiation/content-negotiation.xql b/modules/content-negotiation/content-negotiation.xql index 6f3cf525d..2e8ad07a3 100644 --- a/modules/content-negotiation/content-negotiation.xql +++ b/modules/content-negotiation/content-negotiation.xql @@ -6,14 +6,14 @@ xquery version "3.0"; : @authored 2018-04-12 :) -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; (: Content serialization modules. :) -import module namespace cntneg="http://syriaca.org/srophe/cntneg" at "content-negotiation.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "tei2html.xqm"; +import module namespace cntneg="http://srophe.org/srophe/cntneg" at "content-negotiation.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "tei2html.xqm"; (: Data processing module. :) -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; (: Import KWIC module:) import module namespace kwic="http://exist-db.org/xquery/kwic"; diff --git a/modules/content-negotiation/content-negotiation.xqm b/modules/content-negotiation/content-negotiation.xqm index 6c1e3ae96..1b106df3f 100644 --- a/modules/content-negotiation/content-negotiation.xqm +++ b/modules/content-negotiation/content-negotiation.xqm @@ -1,6 +1,6 @@ xquery version "3.0"; -module namespace cntneg="http://syriaca.org/srophe/cntneg"; +module namespace cntneg="http://srophe.org/srophe/cntneg"; (:~ : Module for content negotiation based on work done by Steve Baskauf : https://github.com/baskaufs/guid-o-matic @@ -24,15 +24,15 @@ module namespace cntneg="http://syriaca.org/srophe/cntneg"; : Content serialization modules. : Additional modules can be added. :) -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace feed="http://syriaca.org/srophe/atom" at "atom.xqm"; -import module namespace geojson="http://syriaca.org/srophe/geojson" at "geojson.xqm"; -import module namespace geokml="http://syriaca.org/srophe/geokml" at "geokml.xqm"; -import module namespace jsonld="http://syriaca.org/srophe/jsonld" at "jsonld.xqm"; -import module namespace tei2rdf="http://syriaca.org/srophe/tei2rdf" at "tei2rdf.xqm"; -import module namespace tei2ttl="http://syriaca.org/srophe/tei2ttl" at "tei2ttl.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "tei2html.xqm"; -import module namespace tei2txt="http://syriaca.org/srophe/tei2txt" at "tei2txt.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace feed="http://srophe.org/srophe/atom" at "atom.xqm"; +import module namespace geojson="http://srophe.org/srophe/geojson" at "geojson.xqm"; +import module namespace geokml="http://srophe.org/srophe/geokml" at "geokml.xqm"; +import module namespace jsonld="http://srophe.org/srophe/jsonld" at "jsonld.xqm"; +import module namespace tei2rdf="http://srophe.org/srophe/tei2rdf" at "tei2rdf.xqm"; +import module namespace tei2ttl="http://srophe.org/srophe/tei2ttl" at "tei2ttl.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "tei2html.xqm"; +import module namespace tei2txt="http://srophe.org/srophe/tei2txt" at "tei2txt.xqm"; (: These are needed for rending as HTML via existdb templating module, can be removed if not using import module namespace config="http://syriaca.org/config" at "config.xqm"; diff --git a/modules/content-negotiation/geojson.xqm b/modules/content-negotiation/geojson.xqm index e2e08da73..292065446 100644 --- a/modules/content-negotiation/geojson.xqm +++ b/modules/content-negotiation/geojson.xqm @@ -1,6 +1,6 @@ xquery version "3.0"; -module namespace geojson="http://syriaca.org/srophe/geojson"; +module namespace geojson="http://srophe.org/srophe/geojson"; (:~ : Module returns coordinates as geoJSON : Formats include geoJSON @@ -8,7 +8,7 @@ module namespace geojson="http://syriaca.org/srophe/geojson"; : @authored 2014-06-25 :) -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization"; declare namespace json = "http://www.json.org"; diff --git a/modules/content-negotiation/geokml.xqm b/modules/content-negotiation/geokml.xqm index c6c35bdb9..4d294c3db 100644 --- a/modules/content-negotiation/geokml.xqm +++ b/modules/content-negotiation/geokml.xqm @@ -1,6 +1,6 @@ xquery version "3.0"; -module namespace geokml="http://syriaca.org/srophe/geokml"; +module namespace geokml="http://srophe.org/srophe/geokml"; (:~ : Module returns coordinates as geoJSON : Formats include geoJSON diff --git a/modules/content-negotiation/jsonld.xqm b/modules/content-negotiation/jsonld.xqm index 9614c34ce..d5c21bb50 100644 --- a/modules/content-negotiation/jsonld.xqm +++ b/modules/content-negotiation/jsonld.xqm @@ -1,14 +1,14 @@ xquery version "3.0"; -module namespace jsonld="http://syriaca.org/srophe/jsonld"; +module namespace jsonld="http://srophe.org/srophe/jsonld"; (:~ : Module returns JSON-LD : @author Winona Salesky : @authored 2018-10-10 :) -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "tei2html.xqm"; -import module namespace tei2rdf="http://syriaca.org/srophe/tei2rdf" at "tei2rdf.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "tei2html.xqm"; +import module namespace tei2rdf="http://srophe.org/srophe/tei2rdf" at "tei2rdf.xqm"; declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization"; declare namespace sparql="http://www.w3.org/2005/sparql-results#"; diff --git a/modules/content-negotiation/tei2dc.xqm b/modules/content-negotiation/tei2dc.xqm index d660800fe..7b882f0d5 100644 --- a/modules/content-negotiation/tei2dc.xqm +++ b/modules/content-negotiation/tei2dc.xqm @@ -4,7 +4,7 @@ xquery version "3.0"; : Used by oai, can be plugged into other outputs as well. :) -module namespace tei2="http://syriaca.org/srophe/tei2dc"; +module namespace tei2="http://srophe.org/srophe/tei2dc"; declare namespace dc="http://purl.org/dc/elements/1.1/"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/content-negotiation/tei2html.xqm b/modules/content-negotiation/tei2html.xqm index 35ba15d7a..228d136d4 100644 --- a/modules/content-negotiation/tei2html.xqm +++ b/modules/content-negotiation/tei2html.xqm @@ -4,9 +4,9 @@ xquery version "3.0"; : Used by oai, can be plugged into other outputs as well. :) -module namespace tei2html="http://syriaca.org/srophe/tei2html"; -import module namespace bibl2html="http://syriaca.org/srophe/bibl2html" at "bibl2html.xqm"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +module namespace tei2html="http://srophe.org/srophe/tei2html"; +import module namespace bibl2html="http://srophe.org/srophe/bibl2html" at "bibl2html.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; declare namespace html="http://purl.org/dc/elements/1.1/"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/content-negotiation/tei2rdf.xqm b/modules/content-negotiation/tei2rdf.xqm index 7c70f403d..5efdfa29d 100644 --- a/modules/content-negotiation/tei2rdf.xqm +++ b/modules/content-negotiation/tei2rdf.xqm @@ -3,11 +3,11 @@ xquery version "3.0"; : Build Srophe TEI to RDF/XML : :) -module namespace tei2rdf="http://syriaca.org/srophe/tei2rdf"; -import module namespace bibl2html="http://syriaca.org/srophe/bibl2html" at "bibl2html.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "tei2html.xqm"; -import module namespace rel="http://syriaca.org/srophe/related" at "../lib/get-related.xqm"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +module namespace tei2rdf="http://srophe.org/srophe/tei2rdf"; +import module namespace bibl2html="http://srophe.org/srophe/bibl2html" at "bibl2html.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "tei2html.xqm"; +import module namespace rel="http://srophe.org/srophe/related" at "../lib/get-related.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; import module namespace functx="http://www.functx.com"; diff --git a/modules/content-negotiation/tei2ttl.xqm b/modules/content-negotiation/tei2ttl.xqm index e7ed0c229..9b18543d1 100644 --- a/modules/content-negotiation/tei2ttl.xqm +++ b/modules/content-negotiation/tei2ttl.xqm @@ -3,11 +3,11 @@ xquery version "3.0"; : Build Srophe TEI to ttl :) -module namespace tei2ttl="http://syriaca.org/srophe/tei2ttl"; -import module namespace bibl2html="http://syriaca.org/srophe/bibl2html" at "bibl2html.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "tei2html.xqm"; -import module namespace rel="http://syriaca.org/srophe/related" at "../lib/get-related.xqm"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +module namespace tei2ttl="http://srophe.org/srophe/tei2ttl"; +import module namespace bibl2html="http://srophe.org/srophe/bibl2html" at "bibl2html.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "tei2html.xqm"; +import module namespace rel="http://srophe.org/srophe/related" at "../lib/get-related.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; import module namespace functx="http://www.functx.com"; diff --git a/modules/content-negotiation/tei2txt.xqm b/modules/content-negotiation/tei2txt.xqm index 37ae4238b..a5f558860 100644 --- a/modules/content-negotiation/tei2txt.xqm +++ b/modules/content-negotiation/tei2txt.xqm @@ -3,8 +3,8 @@ xquery version "3.0"; : Builds tei conversions to plain text. :) -module namespace tei2txt="http://syriaca.org/srophe/tei2txt"; -import module namespace bibl2html="http://syriaca.org/srophe/bibl2html" at "bibl2html.xqm"; +module namespace tei2txt="http://srophe.org/srophe/tei2txt"; +import module namespace bibl2html="http://srophe.org/srophe/bibl2html" at "bibl2html.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; declare namespace html="http://www.w3.org/1999/xhtml"; diff --git a/modules/email.xql b/modules/email.xql index bacc7105a..b49a147b2 100644 --- a/modules/email.xql +++ b/modules/email.xql @@ -4,7 +4,7 @@ xquery version "3.1"; : Build email form returns. error or sucess message to ajax function. : Use reCaptcha to filter out spam. :) -import module namespace config="http://syriaca.org/srophe/config" at "config.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "config.xqm"; import module namespace http="http://expath.org/ns/http-client"; declare namespace httpclient = "http://exist-db.org/xquery/httpclient"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/lib/browse.xqm b/modules/lib/browse.xqm index d1131185c..bb976fdba 100644 --- a/modules/lib/browse.xqm +++ b/modules/lib/browse.xqm @@ -3,19 +3,19 @@ xquery version "3.1"; : Builds HTML browse pages for Srophe Collections and sub-collections : Alphabetical English and Syriac Browse lists, browse by type, browse by date, map browse. :) -module namespace browse="http://syriaca.org/srophe/browse"; +module namespace browse="http://srophe.org/srophe/browse"; (:eXist templating module:) import module namespace templates="http://exist-db.org/xquery/templates" ; (: Import Srophe application modules. :) -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "data.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "data.xqm"; import module namespace facet="http://expath.org/ns/facet" at "facet.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "lib/global.xqm"; -import module namespace maps="http://syriaca.org/srophe/maps" at "maps.xqm"; -import module namespace page="http://syriaca.org/srophe/page" at "paging.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "../content-negotiation/tei2html.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "lib/global.xqm"; +import module namespace maps="http://srophe.org/srophe/maps" at "maps.xqm"; +import module namespace page="http://srophe.org/srophe/page" at "paging.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "../content-negotiation/tei2html.xqm"; (: Namespaces :) declare namespace tei="http://www.tei-c.org/ns/1.0"; @@ -36,7 +36,7 @@ declare variable $browse:perpage {request:get-parameter('perpage', 25) cast as x : @param $facets facet xml file name, relative to collection directory :) declare function browse:get-all($node as node(), $model as map(*), $collection as xs:string*, $element as xs:string?, $facets as xs:string?){ - map{"hits" := data:get-records($collection, $element) } + map{"hits" : data:get-records($collection, $element) } }; (: diff --git a/modules/lib/data.xqm b/modules/lib/data.xqm index 7ab4a4128..9eea4e591 100644 --- a/modules/lib/data.xqm +++ b/modules/lib/data.xqm @@ -3,10 +3,10 @@ xquery version "3.0"; : Basic data interactions, returns raw data for use in other modules : Used by ../app.xql and content-negotiation/content-negotiation.xql :) -module namespace data="http://syriaca.org/srophe/data"; +module namespace data="http://srophe.org/srophe/data"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "global.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "global.xqm"; import module namespace facet="http://expath.org/ns/facet" at "facet.xqm"; import module namespace functx="http://www.functx.com"; diff --git a/modules/lib/facet.xqm b/modules/lib/facet.xqm index ed50e71c8..29d4c188e 100644 --- a/modules/lib/facet.xqm +++ b/modules/lib/facet.xqm @@ -17,7 +17,7 @@ xquery version "3.0"; :) module namespace facet = "http://expath.org/ns/facet"; -import module namespace global="http://syriaca.org/srophe/global" at "global.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "global.xqm"; import module namespace functx="http://www.functx.com"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; diff --git a/modules/lib/get-related.xqm b/modules/lib/get-related.xqm index 32030b234..f6cc61a43 100644 --- a/modules/lib/get-related.xqm +++ b/modules/lib/get-related.xqm @@ -1,24 +1,22 @@ xquery version "3.0"; (: Get and build TEI relationships :) -module namespace rel="http://syriaca.org/srophe/related"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "global.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "data.xqm"; -import module namespace maps="http://syriaca.org/srophe/maps" at "maps.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "../content-negotiation/tei2html.xqm"; +module namespace rel="http://srophe.org/srophe/related"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "global.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "data.xqm"; +import module namespace maps="http://srophe.org/srophe/maps" at "maps.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "../content-negotiation/tei2html.xqm"; import module namespace functx="http://www.functx.com"; declare namespace tei="http://www.tei-c.org/ns/1.0"; declare namespace html="http://www.w3.org/1999/xhtml"; declare function rel:get-related($uris as xs:string?) as map(xs:string, function(*)){ - map:new( - for $uri at $i in tokenize($uris,' ') - let $data := data:get-document($uri) - where not(empty($data)) - return - map:entry($uri,$data), "?strength=primary" - ) + let $map := map{} + for $uri at $i in tokenize($uris,' ') + let $data := data:get-document($uri) + where not(empty($data)) + return map:put($map, $uri, $data) }; (:~ @@ -310,7 +308,7 @@ let $data := where $sort != '' order by $sort return concat($id, 'headword:=', $headword) -return map { "cited" := $data} +return map { "cited" : $data} }; (:~ diff --git a/modules/lib/global.xqm b/modules/lib/global.xqm index 284a66220..d10be7b95 100644 --- a/modules/lib/global.xqm +++ b/modules/lib/global.xqm @@ -1,11 +1,11 @@ xquery version "3.1"; (: Global Srophe helper functions. :) -module namespace global="http://syriaca.org/srophe/global"; +module namespace global="http://srophe.org/srophe/global"; import module namespace http="http://expath.org/ns/http-client" at "java:org.exist.xquery.modules.httpclient.HTTPClientModule"; (: Import Srophe application modules. :) -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; declare namespace html="http://www.w3.org/1999/xhtml"; diff --git a/modules/lib/maps.xqm b/modules/lib/maps.xqm index b79292029..2ed2efc96 100644 --- a/modules/lib/maps.xqm +++ b/modules/lib/maps.xqm @@ -1,6 +1,6 @@ xquery version "3.0"; -module namespace maps = "http://syriaca.org/srophe/maps"; +module namespace maps = "http://srophe.org/srophe/maps"; (:~ : Module builds leafletjs maps and/or Google maps @@ -9,8 +9,8 @@ module namespace maps = "http://syriaca.org/srophe/maps"; : @author Winona Salesky : @authored 2014-06-25 :) -import module namespace geojson = "http://syriaca.org/srophe/geojson" at "../content-negotiation/geojson.xqm"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +import module namespace geojson = "http://srophe.org/srophe/geojson" at "../content-negotiation/geojson.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; diff --git a/modules/lib/paging.xqm b/modules/lib/paging.xqm index 9942c40e3..62c8e06c6 100644 --- a/modules/lib/paging.xqm +++ b/modules/lib/paging.xqm @@ -3,8 +3,8 @@ xquery version "3.0"; : Paging module for reuse by search and browse pages : Adds page numbers and sort options to HTML output. :) -module namespace page="http://syriaca.org/srophe/page"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; +module namespace page="http://srophe.org/srophe/page"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; import module namespace functx="http://www.functx.com"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/lib/timeline.xqm b/modules/lib/timeline.xqm index 4e6af37a4..7ba593058 100644 --- a/modules/lib/timeline.xqm +++ b/modules/lib/timeline.xqm @@ -1,13 +1,13 @@ xquery version "3.0"; -module namespace timeline="http://syriaca.org/srophe/timeline"; +module namespace timeline="http://srophe.org/srophe/timeline"; (:~ : Module to build timeline json passed to http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js widget : @author Winona Salesky : @authored 2014-08-05 :) -import module namespace global="http://syriaca.org/srophe/global" at "global.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "global.xqm"; declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization"; declare namespace json = "http://www.json.org"; diff --git a/modules/person.xqm b/modules/person.xqm index e0a7f8eff..6756a7332 100644 --- a/modules/person.xqm +++ b/modules/person.xqm @@ -3,17 +3,17 @@ :) xquery version "3.0"; -module namespace person="http://syriaca.org/srophe/person"; +module namespace person="http://srophe.org/srophe/person"; import module namespace templates="http://exist-db.org/xquery/templates" ; -import module namespace config="http://syriaca.org/srophe/config" at "config.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "lib/global.xqm"; -import module namespace app="http://syriaca.org/srophe/templates" at "app.xql"; -import module namespace maps="http://syriaca.org/srophe/maps" at "lib/maps.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "lib/data.xqm"; -import module namespace rel="http://syriaca.org/srophe/related" at "lib/get-related.xqm"; -import module namespace timeline="http://syriaca.org/srophe/timeline" at "lib/timeline.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "content-negotiation/tei2html.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "config.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "lib/global.xqm"; +import module namespace app="http://srophe.org/srophe/templates" at "app.xql"; +import module namespace maps="http://srophe.org/srophe/maps" at "lib/maps.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "lib/data.xqm"; +import module namespace rel="http://srophe.org/srophe/related" at "lib/get-related.xqm"; +import module namespace timeline="http://srophe.org/srophe/timeline" at "lib/timeline.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "content-negotiation/tei2html.xqm"; declare namespace http="http://expath.org/ns/http-client"; declare namespace xslt="http://exist-db.org/xquery/transform"; diff --git a/modules/place.xqm b/modules/place.xqm index 127667455..0c8cbc57e 100644 --- a/modules/place.xqm +++ b/modules/place.xqm @@ -3,11 +3,11 @@ :) xquery version "3.0"; -module namespace place="http://syriaca.org/srophe/place"; -import module namespace config="http://syriaca.org/srophe/config" at "config.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "lib/global.xqm"; -import module namespace app="http://syriaca.org/srophe/templates" at "app.xql"; -import module namespace maps="http://syriaca.org/srophe/maps" at "lib/maps.xqm"; +module namespace place="http://srophe.org/srophe/place"; +import module namespace config="http://srophe.org/srophe/config" at "config.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "lib/global.xqm"; +import module namespace app="http://srophe.org/srophe/templates" at "app.xql"; +import module namespace maps="http://srophe.org/srophe/maps" at "lib/maps.xqm"; import module namespace templates="http://exist-db.org/xquery/templates" ; diff --git a/modules/rest.xqm b/modules/rest.xqm index 3eab7d77e..05a0df2c6 100644 --- a/modules/rest.xqm +++ b/modules/rest.xqm @@ -1,12 +1,12 @@ xquery version "3.1"; (: Syriaca.org restxq file. :) -module namespace api="http://syriaca.org/srophe/api"; +module namespace api="http://srophe.org/srophe/api"; (: Syriaca.org modules :) -import module namespace config="http://syriaca.org/srophe/config" at "config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "lib/data.xqm"; -import module namespace cntneg="http://syriaca.org/srophe/cntneg" at "content-negotiation/content-negotiation.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "lib/data.xqm"; +import module namespace cntneg="http://srophe.org/srophe/cntneg" at "content-negotiation/content-negotiation.xqm"; (: Namespaces :) declare namespace json="http://www.json.org"; diff --git a/modules/search/bhse-search.xqm b/modules/search/bhse-search.xqm index 18f7bbde8..4d179f55f 100644 --- a/modules/search/bhse-search.xqm +++ b/modules/search/bhse-search.xqm @@ -3,11 +3,11 @@ xquery version "3.0"; : Builds search information for spear sub-collection : Search string is passed to search.xqm for processing. :) -module namespace bhses="http://syriaca.org/srophe/bhses"; +module namespace bhses="http://srophe.org/srophe/bhses"; import module namespace functx="http://www.functx.com"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/search/bibl-search.xqm b/modules/search/bibl-search.xqm index d56a523f6..4613cc064 100644 --- a/modules/search/bibl-search.xqm +++ b/modules/search/bibl-search.xqm @@ -3,12 +3,12 @@ xquery version "3.0"; : Builds search information for spear sub-collection : Search string is passed to search.xqm for processing. :) -module namespace bibls="http://syriaca.org/srophe/bibls"; +module namespace bibls="http://srophe.org/srophe/bibls"; import module namespace functx="http://www.functx.com"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/search/ms-search.xqm b/modules/search/ms-search.xqm index 5cdce556d..9a474d2a7 100644 --- a/modules/search/ms-search.xqm +++ b/modules/search/ms-search.xqm @@ -3,11 +3,11 @@ xquery version "3.0"; : Builds search information for spear sub-collection : Search string is passed to search.xqm for processing. :) -module namespace ms="http://syriaca.org/srophe/ms"; +module namespace ms="http://srophe.org/srophe/ms"; import module namespace functx="http://www.functx.com"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/search/nhsl-search.xqm b/modules/search/nhsl-search.xqm index aa43ccd21..e20b26e09 100644 --- a/modules/search/nhsl-search.xqm +++ b/modules/search/nhsl-search.xqm @@ -3,11 +3,11 @@ xquery version "3.0"; : Builds search information for spear sub-collection : Search string is passed to search.xqm for processing. :) -module namespace nhsls="http://syriaca.org/srophe/nhsls"; +module namespace nhsls="http://srophe.org/srophe/nhsls"; import module namespace functx="http://www.functx.com"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/search/persons-search.xqm b/modules/search/persons-search.xqm index 10f0ec9df..b7981e329 100644 --- a/modules/search/persons-search.xqm +++ b/modules/search/persons-search.xqm @@ -3,10 +3,10 @@ xquery version "3.0"; : Builds search information for persons sub-collection : Search string is passed to search.xqm for processing. :) -module namespace persons="http://syriaca.org/srophe/persons"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +module namespace persons="http://srophe.org/srophe/persons"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/search/places-search.xqm b/modules/search/places-search.xqm index ad9cea078..4b86b179e 100644 --- a/modules/search/places-search.xqm +++ b/modules/search/places-search.xqm @@ -1,9 +1,9 @@ xquery version "3.0"; -module namespace places="http://syriaca.org/srophe/places"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +module namespace places="http://srophe.org/srophe/places"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace util="http://exist-db.org/xquery/util"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/search/search.xqm b/modules/search/search.xqm index b29cfb996..541675ca7 100644 --- a/modules/search/search.xqm +++ b/modules/search/search.xqm @@ -2,7 +2,7 @@ xquery version "3.1"; (:~ : Builds HTML search forms and HTMl search results Srophe Collections and sub-collections :) -module namespace search="http://syriaca.org/srophe/search"; +module namespace search="http://srophe.org/srophe/search"; (:eXist templating module:) import module namespace templates="http://exist-db.org/xquery/templates" ; @@ -11,20 +11,20 @@ import module namespace templates="http://exist-db.org/xquery/templates" ; import module namespace kwic="http://exist-db.org/xquery/kwic"; (: Import Srophe application modules. :) -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; -import module namespace page="http://syriaca.org/srophe/page" at "../lib/paging.xqm"; -import module namespace tei2html="http://syriaca.org/srophe/tei2html" at "../content-negotiation/tei2html.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; +import module namespace page="http://srophe.org/srophe/page" at "../lib/paging.xqm"; +import module namespace tei2html="http://srophe.org/srophe/tei2html" at "../content-negotiation/tei2html.xqm"; (: Syriaca.org search modules :) -import module namespace bhses="http://syriaca.org/srophe/bhses" at "bhse-search.xqm"; -import module namespace bibls="http://syriaca.org/srophe/bibls" at "bibl-search.xqm"; -import module namespace ms="http://syriaca.org/srophe/ms" at "ms-search.xqm"; -import module namespace nhsls="http://syriaca.org/srophe/nhsls" at "nhsl-search.xqm"; -import module namespace persons="http://syriaca.org/srophe/persons" at "persons-search.xqm"; -import module namespace places="http://syriaca.org/srophe/places" at "places-search.xqm"; -import module namespace spears="http://syriaca.org/srophe/spears" at "spear-search.xqm"; +import module namespace bhses="http://srophe.org/srophe/bhses" at "bhse-search.xqm"; +import module namespace bibls="http://srophe.org/srophe/bibls" at "bibl-search.xqm"; +import module namespace ms="http://srophe.org/srophe/ms" at "ms-search.xqm"; +import module namespace nhsls="http://srophe.org/srophe/nhsls" at "nhsl-search.xqm"; +import module namespace persons="http://srophe.org/srophe/persons" at "persons-search.xqm"; +import module namespace places="http://srophe.org/srophe/places" at "places-search.xqm"; +import module namespace spears="http://srophe.org/srophe/spears" at "spear-search.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; @@ -63,8 +63,8 @@ declare %templates:wrap function search:search-data($node as node(), $model as m let $hits := data:search($collection, $search-string, $sort-element) return map { - "hits" := $hits, - "query" := $queryExpr + "hits" : $hits, + "query" : $queryExpr } }; diff --git a/modules/search/spear-search.xqm b/modules/search/spear-search.xqm index cc927fd86..e52158c43 100644 --- a/modules/search/spear-search.xqm +++ b/modules/search/spear-search.xqm @@ -3,12 +3,12 @@ xquery version "3.0"; : Builds search information for spear sub-collection : Search string is passed to search.xqm for processing. :) -module namespace spears="http://syriaca.org/srophe/spears"; +module namespace spears="http://srophe.org/srophe/spears"; import module namespace functx="http://www.functx.com"; import module namespace facet="http://expath.org/ns/facet" at "../lib/facet.xqm"; -import module namespace config="http://syriaca.org/srophe/config" at "../config.xqm"; -import module namespace data="http://syriaca.org/srophe/data" at "../lib/data.xqm"; -import module namespace global="http://syriaca.org/srophe/global" at "../lib/global.xqm"; +import module namespace config="http://srophe.org/srophe/config" at "../config.xqm"; +import module namespace data="http://srophe.org/srophe/data" at "../lib/data.xqm"; +import module namespace global="http://srophe.org/srophe/global" at "../lib/global.xqm"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/teiDocs/teiDocs.xqm b/modules/teiDocs/teiDocs.xqm index 8747c346c..cc5352065 100644 --- a/modules/teiDocs/teiDocs.xqm +++ b/modules/teiDocs/teiDocs.xqm @@ -1,6 +1,6 @@ xquery version "3.0"; -module namespace teiDocs = "http://syriaca.org/srophe/teiDocs"; +module namespace teiDocs = "http://srophe.org/srophe/teiDocs"; declare namespace functx = "http://www.functx.com"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; diff --git a/modules/view.xql b/modules/view.xql index 8b85e11cb..9d8be1202 100644 --- a/modules/view.xql +++ b/modules/view.xql @@ -11,16 +11,16 @@ import module namespace templates="http://exist-db.org/xquery/templates" ; : The following modules provide functions which will be called by the : templating. :) -import module namespace config="http://syriaca.org/srophe/config" at "config.xqm"; -import module namespace app="http://syriaca.org/srophe/templates" at "app.xql"; +import module namespace config="http://srophe.org/srophe/config" at "config.xqm"; +import module namespace app="http://srophe.org/srophe/templates" at "app.xql"; (: Srophe specific modules :) -import module namespace browse="http://syriaca.org/srophe/browse" at "lib/browse.xqm"; -import module namespace search="http://syriaca.org/srophe/search" at "search/search.xqm"; +import module namespace browse="http://srophe.org/srophe/browse" at "lib/browse.xqm"; +import module namespace search="http://srophe.org/srophe/search" at "search/search.xqm"; (: Syriaca.org specific functions :) -import module namespace place="http://syriaca.org/srophe/place" at "place.xqm"; -import module namespace person="http://syriaca.org/srophe/person" at "person.xqm"; +import module namespace place="http://srophe.org/srophe/place" at "place.xqm"; +import module namespace person="http://srophe.org/srophe/person" at "person.xqm"; declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization"; diff --git a/repo.xml b/repo.xml index d982d5e98..042b4e5d9 100644 --- a/repo.xml +++ b/repo.xml @@ -10,9 +10,5 @@ srophe pre-install.xql - - - - -2018-10-19T11:35:41.497-04:00 + 2018-10-19T11:35:41.497-04:00 \ No newline at end of file From b6e20ada9ca0d6da81f0a700c32ac0f33e0e3ac2 Mon Sep 17 00:00:00 2001 From: Winona Salesky Date: Wed, 17 Jun 2020 09:41:04 -0400 Subject: [PATCH 02/12] Updates for eXist v5 --- 404.html | 19 +- 500.html | 19 +- about-srophe.html | 21 +- api-documentation/index.html | 1 + authors/about.html | 2 +- authors/banner.html | 2 +- authors/index.html | 6 +- bhse/about.html | 2 +- bhse/banner.html | 2 +- bhse/browse.html | 6 +- bhse/index.html | 24 +- bhse/record.html | 1 + bibl/banner.html | 2 +- bibl/browse.html | 1 + bibl/index.html | 39 +- bibl/record.html | 3 +- bibl/search.html | 1 + documentation/SPEARschema/SPEAR.html | 20249 +++++++- documentation/SPEARschema/SPEAR.odd | 1187 +- documentation/SPEARschema/SPEARSchema.xml | 407 +- documentation/SPEARschema/odd_SPEAR.html | 27899 +++++++++- documentation/SPEARschema/odd_SPEAR.xml | 54 +- documentation/SPEARschema/out/SPEAR.rng | 1195 +- documentation/SPEARschema/out/odd_SPEAR.rng | 169 +- .../SPEARschema/schemas/odd4odds.html | 42203 +++++++++++++++- .../SPEARschema/schemas/odd4odds.odd | 105 +- .../SPEARschema/schemas/odd4odds.rng | 156 +- documentation/SPEARschema/schemas/relaxng.rng | 11 +- documentation/author-editor-roles.xml | 15 +- documentation/confessions.xml | 5 +- documentation/editors.html | 1 + documentation/editors.xml | 44 +- documentation/index.html | 2 +- documentation/isostandards.xml | 95 +- documentation/menu.html | 5 +- documentation/odd4Taxonomy/odd4Taxonomy.xml | 17 +- .../odd4Taxonomy/out/odd4Taxonomy.rng | 169 +- .../odd4Taxonomy/schemas/odd4odds.html | 42203 +++++++++++++++- .../odd4Taxonomy/schemas/odd4odds.odd | 105 +- .../odd4Taxonomy/schemas/odd4odds.rng | 156 +- .../odd4Taxonomy/schemas/relaxng.rng | 11 +- documentation/place-types.html | 3 +- documentation/place-types.xml | 12 +- documentation/syriaca-tei-main.odd | 158 +- documentation/syriaca-tei-main.rng | 4 +- documentation/tei-mss-tutorials.html | 4 +- ...emplate-file-for-single-msPart-entries.xml | 31 +- .../templates/Blank-template-file.xml | 107 +- documentation/training-materials.html | 51 +- documentation/uris.html | 110 +- documentation/view-syriac.html | 2 +- .../work-subject-classifications.xml | 210 +- geo/browse.html | 1 + geo/facet-def.xml | 27 +- geo/help/index.html | 2 +- geo/index.html | 1 + geo/record.html | 1 + index.html | 36 +- modules/app.xql | 20 +- modules/build-index.xql | 78 + modules/index.xql | 13 + modules/lib/browse.xqm | 29 +- modules/lib/data.xqm | 41 +- modules/lib/facets.xql | 373 + modules/lib/get-related.xqm | 10 +- modules/search/persons-search.xqm | 10 +- nhsl/banner.html | 2 +- nhsl/browse.html | 2 +- nhsl/index.html | 17 +- persons/banner.html | 2 +- persons/facet-def.xml | 93 +- persons/index.html | 9 +- persons/record.html | 3 +- project-team.html | 2 +- q/about.html | 2 +- q/browse.html | 2 +- q/index.html | 12 +- repo-config.xml | 1 + repo.xml | 3 +- resources/css/sm-core-css.css | 0 resources/xsl/bibliography.xsl | 5 +- resources/xsl/citation.xsl | 5 +- resources/xsl/core.xsl | 3 +- resources/xsl/helper-functions.xsl | 13 +- resources/xsl/link-icons.xsl | 1 + resources/xsl/spear.xsl | 39 +- resources/xsl/tei2html.xsl | 32 +- saints/index.html | 14 +- saints/intro.html | 20 +- search-config.xml | 98 +- taxonomy/facet-def.xml | 2 +- templates/authors.html | 14 +- templates/bhse.html | 20 +- templates/bibl.html | 9 +- templates/bible.html | 14 +- templates/draft-info.html | 7 +- templates/geo.html | 14 +- templates/manuscripts.html | 14 +- templates/nhsl.html | 40 +- templates/page.html | 15 +- templates/persons.html | 32 +- templates/q.html | 20 +- templates/saints.html | 20 +- templates/shared-links.html | 30 +- templates/spear.html | 14 +- templates/subjects.html | 9 +- 106 files changed, 133931 insertions(+), 4671 deletions(-) create mode 100644 modules/build-index.xql create mode 100644 modules/index.xql create mode 100644 modules/lib/facets.xql mode change 100755 => 100644 resources/css/sm-core-css.css diff --git a/404.html b/404.html index 00c39e54f..b75544532 100644 --- a/404.html +++ b/404.html @@ -8,24 +8,29 @@

404 Error

-
-

ܠܐ ܬܫܦܠܘܢ ܒܐܓܘܢܐ ܡܠܐ ܢܨܚ̈ܢܐ. ܕܡܢܗ ܟܠ ܛܒ̈ܢ ܠܟܘܢ ܡ̈ܛܝܒܢ܀ +

+

+ ܠܐ ܬܫܦܠܘܢ ܒܐܓܘܢܐ ܡܠܐ ܢܨܚ̈ܢܐ. ܕܡܢܗ ܟܠ ܛܒ̈ܢ ܠܟܘܢ ܡ̈ܛܝܒܢ܀

-

Do not weaken in the contest that is full of feats of valour, +

+ Do not weaken in the contest that is full of feats of valour, for as a result of it all kind of good things have been prepared for you.

  • - + 1 Sebastian P. Brock (ed.). - The Martyrs of Mount Berʾain - (Persian Martyr Acts in Syriac: Text and Translation, + + The Martyrs of Mount Berʾain + + ( + Persian Martyr Acts in Syriac: Text and Translation + , vol. 4; Piscataway, NJ: Gorgias Press, 2014)
  • diff --git a/500.html b/500.html index c64141a4f..aadde2332 100644 --- a/500.html +++ b/500.html @@ -8,24 +8,29 @@

    500 Error

-
-

ܠܐ ܬܫܦܠܘܢ ܒܐܓܘܢܐ ܡܠܐ ܢܨܚ̈ܢܐ. ܕܡܢܗ ܟܠ ܛܒ̈ܢ ܠܟܘܢ ܡ̈ܛܝܒܢ܀ +

+

+ ܠܐ ܬܫܦܠܘܢ ܒܐܓܘܢܐ ܡܠܐ ܢܨܚ̈ܢܐ. ܕܡܢܗ ܟܠ ܛܒ̈ܢ ܠܟܘܢ ܡ̈ܛܝܒܢ܀

-

Do not weaken in the contest that is full of feats of valour, +

+ Do not weaken in the contest that is full of feats of valour, for as a result of it all kind of good things have been prepared for you.

  • - + 1 Sebastian P. Brock (ed.). - The Martyrs of Mount Berʾain - (Persian Martyr Acts in Syriac: Text and Translation, + + The Martyrs of Mount Berʾain + + ( + Persian Martyr Acts in Syriac: Text and Translation + , vol. 4; Piscataway, NJ: Gorgias Press, 2014)
  • diff --git a/about-srophe.html b/about-srophe.html index 629d55a22..a9faea67e 100644 --- a/about-srophe.html +++ b/about-srophe.html @@ -1,7 +1,8 @@
    -

    About Syriaca.org: The Syriac Reference Portal

    +

    About Syriaca.org: The Syriac Reference Portal +

    @@ -36,11 +37,14 @@

    Online Reference Works

    Volume 3: Miscellaneous Syriac Persons (David A. Michelson, Nathan P. Gibson, and Daniel L. Schwartz, eds.) is a biographical guide to persons relevant to the study of Syriac history, literature, and culture.
  • Volume 4: Anonymous Syriac Persons (Daniel L. Schwartz, David A. Michelson, and Nathan P. Gibson) is a biographical guide to persons relevant to the study of Syriac history, literature, and culture.
  • -
  • [Notabene: At present, volumes 3 and 4 are accessible directly through the main SBD search page].
  • +
  • [Notabene: At present, volumes 3 and 4 are accessible directly through the main + SBD search page].
  • - A New Handbook of Syriac Literature is a multi-volume reference guide to Syriac literature from antiquity to the modern period. The first volume has been published and several more are in process. This resources is intended to serve as a title authority file for use in cataloguing Syriac manuscripts. + + A New Handbook of Syriac Literature + is a multi-volume reference guide to Syriac literature from antiquity to the modern period. The first volume has been published and several more are in process. This resources is intended to serve as a title authority file for use in cataloguing Syriac manuscripts.
    • @@ -91,7 +95,11 @@

      Use Cases

      User Scenario One: Researcher, Syriac Specialist

      A researcher working with an unpublished Syriac manuscript encounters a homiletic text attributed to a minor author she cannot identify. She consults the A Guide to Syriac Authors - for an encyclopedia entry on the author that links to a listing of known works and citations for published works. Consulting these texts, she determines that her text has not previously been documented. Following the standards and protocols established for collaboration with Syriaca.org, the researcher submits information about the text and the manuscript citation to the Portal for inclusion in A New Handbook of Syriac Literature and A Union Catalogue of Syriac Manuscripts (forthcoming). Later, another researcher who has come across a text with the same title but without attribution to an author consults A New Handbook of Syriac Literature for text titles (or incipits) and discovers that the text’s author has been identified through another manuscript. This second scholar then submits his manuscript citation to the evidence field in the entry for that author.

      + for an encyclopedia entry on the author that links to a listing of known works and citations for published works. Consulting these texts, she determines that her text has not previously been documented. Following the standards and protocols established for collaboration with Syriaca.org, the researcher submits information about the text and the manuscript citation to the Portal for inclusion in + A New Handbook of Syriac Literature + and A Union Catalogue of Syriac Manuscripts (forthcoming). Later, another researcher who has come across a text with the same title but without attribution to an author consults + A New Handbook of Syriac Literature + for text titles (or incipits) and discovers that the text’s author has been identified through another manuscript. This second scholar then submits his manuscript citation to the evidence field in the entry for that author.

      User Scenario Two: Researcher, Non-Specialist

      An historian of philosophy working on an Islamic philosophical text comes across a reference to Aristotle’s Analytica Priora in its Arabic translation. A search on Google Scholar pulls up a reference from Syriaca.org to the same work in Syriac. The researcher then consults A New Handbook of Syriac Literature for a list of the works of Aristotle extant in Syriac. By using the classified bibliography, the researcher learns of Syriac commentaries on the Analytica and is able to incorporate them into his study. Following suggestions generated by the semantic links in the Portal’s bibliography, he also discovers an unpublished master’s thesis on Syriac translation technique which provides an explanation of some terminological issues he has found confusing about the text.


      diff --git a/api-documentation/index.html b/api-documentation/index.html index ec290cb35..ed4c4f55b 100644 --- a/api-documentation/index.html +++ b/api-documentation/index.html @@ -1,3 +1,4 @@ +
      diff --git a/authors/about.html b/authors/about.html index e3ffe1fed..7db28e946 100644 --- a/authors/about.html +++ b/authors/about.html @@ -2,5 +2,5 @@

      About Authors

      -

      +

      \ No newline at end of file diff --git a/authors/banner.html b/authors/banner.html index b6a9db4fc..0910f46b3 100644 --- a/authors/banner.html +++ b/authors/banner.html @@ -1,5 +1,5 @@ - @@ -148,4 +148,4 @@

      Example entries

      -
  • +
    \ No newline at end of file diff --git a/bhse/about.html b/bhse/about.html index 93312f53d..28e909624 100644 --- a/bhse/about.html +++ b/bhse/about.html @@ -5,4 +5,4 @@

    About

    -
    +
    \ No newline at end of file diff --git a/bhse/banner.html b/bhse/banner.html index c0683ca94..11dfd5c4b 100644 --- a/bhse/banner.html +++ b/bhse/banner.html @@ -1,5 +1,5 @@ -
    +
    DFM 13, f. 61r, from Dominican Friars of Mosul MS 13 (1723 CE). Hill Museum & Manuscript Library. diff --git a/bhse/browse.html b/bhse/browse.html index aca3eaea9..daf7495c3 100644 --- a/bhse/browse.html +++ b/bhse/browse.html @@ -19,9 +19,11 @@

    Browse Syriac Hagiographic Works

    اللغة العربية +
    @@ -35,4 +37,4 @@

    Browse Syriac Hagiographic Works

    - + \ No newline at end of file diff --git a/bhse/index.html b/bhse/index.html index 13df5a7b3..a361b0a7b 100644 --- a/bhse/index.html +++ b/bhse/index.html @@ -10,10 +10,10 @@ @@ -76,11 +76,11 @@

    Bibliotheca Hagiographica Syriaca Electronica -- BHSE

    inherited from Fr. Ugo Zanetti and his student Dr. Claude Detienne, the Bibliotheca - Hagiographica Syriaca.  In the 1990s, they collated data pertaining to over 1800 texts on + Hagiographica Syriaca.  In the 1990s, they collated data pertaining to over 1800 texts on saints from the Syriac tradition along with the incipit, desinit, and other parts of these - texts (Zanetti, 1993).  They also gathered information on the manuscripts that contain + texts (Zanetti, 1993).  They also gathered information on the manuscripts that contain these hagiographic works as well as secondary literature on them.

    @@ -150,14 +150,14 @@

    BHSE (Bibliotheca Hagiographica Syriaca Electronica) incipit (début du texte) et leur desinit (fin du texte). Cette idée géniale a - profondément modifié la manière de travailler dans le domaine de l’hagiographie : + profondément modifié la manière de travailler dans le domaine de l’hagiographie : conçue au départ comme un répertoire de textes publiés, elle prit de plus en plus d’ampleur, notamment grâce à la prise en compte des textes inédits, identifiés grâce aux catalogues de manuscrits, ou parfois à l’examen direct des manuscrits. Ainsi - constituée, une « bibliothèque hagiographique » permet à l’utilisateur de se rendre + constituée, une « bibliothèque hagiographique » permet à l’utilisateur de se rendre compte d’un coup d’œil de l’étendue du dossier d’un saint donné. Si la Bibliotheca @@ -182,11 +182,11 @@

    BHSE (Bibliotheca Hagiographica Syriaca Electronica) BHSE (Bibliotheca Hagiographica Syriaca Electronica) @@ -280,7 +280,7 @@

    BHSE (Bibliotheca Hagiographica Syriaca Electronica)

    BHSE (Bibliotheca Hagiographica Syriaca Electronica)

    It will be necessary that the records presented here ultimately be gathered and diff --git a/bhse/record.html b/bhse/record.html index 29ea605f3..da6f57e8b 100644 --- a/bhse/record.html +++ b/bhse/record.html @@ -1,3 +1,4 @@ +

    diff --git a/bibl/banner.html b/bibl/banner.html index f8d9560c7..f6f1f85da 100644 --- a/bibl/banner.html +++ b/bibl/banner.html @@ -1,5 +1,5 @@ - @@ -73,7 +66,11 @@

    Introduction: Princeton University -
  • Marquette University
  • +
  • + + Marquette University + +
  • Société des Bollandistes @@ -86,17 +83,17 @@

    Introduction:

    Example entries

    - Browse all works cited + Browse all works cited

  • - + \ No newline at end of file diff --git a/bibl/record.html b/bibl/record.html index d6425ca56..749e1ed6e 100644 --- a/bibl/record.html +++ b/bibl/record.html @@ -1,3 +1,4 @@ +
    @@ -40,7 +41,7 @@