Feature: Auto measure label handling

add/data/xql/getMeasurePage.xql

@@ -26,6 +26,7 @@ declare function local:findMeasure($mei, $movementId, $measureIdName) as element
         else
          (($mei/id($movementId)//mei:measure[@label eq $measureIdName], $mei/id($movementId)//mei:measure[@n eq $measureIdName])[1]) 
 };
+
 declare function local:getMeasure($mei, $measure, $movementId) as map(*) {
     let $measureId := $measure/string(@xml:id)
     let $zoneId := substring-after($measure/string(@facs), '#')

add/data/xql/getMeasures.xql

@@ -9,6 +9,8 @@ import module namespace functx = "http://www.functx.com";
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/Edirom-Online/data/xqm/util.xqm";
 
+import module namespace measure = "http://www.edirom.de/xquery/measure" at "/db/apps/Edirom-Online/data/xqm/measure.xqm";
+
 (: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";

add/data/xql/getMeasuresOnPage.xql

@@ -9,6 +9,12 @@ xquery version "3.1";
     @author <a href="mailto:[email protected]">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ================================================================= :)
+
+import module namespace eutil="http://www.edirom.de/xquery/util" at "/db/apps/Edirom-Online/data/xqm/util.xqm";
+
+import module namespace measure = "http://www.edirom.de/xquery/measure" at "/db/apps/Edirom-Online/data/xqm/measure.xqm";
+
 (: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -22,60 +28,6 @@ declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare option output:method "json";
 declare option output:media-type "application/json";
 
-(: FUNCTION DECLARATIONS =================================================== :)
-
-(:~
-    Finds all measures on a page.
-
-    @param $mei The sourcefile
-    @param $surface The surface to look at
-    @returns A list of json objects with measure information
-:)
-declare function local:getMeasures($mei as node(), $surface as node()) as map(*)* {
-
-    for $zone in $surface/mei:zone[@type = 'measure']
-    let $zoneRef := concat('#', $zone/@xml:id)
-    (:
-        The first predicate with `contains` is just a rough estimate to narrow down the result set.
-        It uses the index and is fast while the second (exact) predicate is generally too slow
-    :)
-    let $measures := $mei//mei:measure[contains(@facs, $zoneRef)][$zoneRef = tokenize(@facs, '\s+')]
-    return
-        for $measure in $measures
-        let $measureLabel :=
-            if ($measure/@label) then
-                ($measure/string(@label))
-            else
-                ($measure/string(@n))
-        let $measureLabel :=
-            if ($measure//mei:multiRest) then
-                ($measureLabel || '–' || number($measureLabel) + number($measure//mei:multiRest/@num) - 1)
-            else
-                ($measureLabel)
-        return
-            map {
-                'zoneId': $zone/string(@xml:id),
-                'ulx': $zone/string(@ulx),
-                'uly': $zone/string(@uly),
-                'lrx': $zone/string(@lrx),
-                'lry': $zone/string(@lry),
-                'id': $measure/string(@xml:id),
-                'name': $measureLabel,
-                'type': $measure/string(@type),(: where is measure type being used :)
-                'rest': local:getMRest($measure)
-            }
-};
-
-declare function local:getMRest($measure) {
-
-    if ($measure//mei:mRest) then
-        (string('1'))
-    else if ($measure//mei:multiRest) then
-        ($measure//mei:multiRest/string(@num))
-    else
-        (string('0'))
-};
-
 (: QUERY BODY ============================================================== :)
 
 let $uri := request:get-parameter('uri', '')
@@ -86,8 +38,7 @@ let $mei := doc($uri)/root()
 
 let $surface := $mei/id($surfaceId)
 
-return
-    array {
-        (: TODO: überlegen, wie die Staff-spezifischen Ausschnitte angezeigt werden sollen :)
-        local:getMeasures($mei, $surface)
-    }
+return (
+    (: TODO: überlegen, wie die Staff-spezifischen Ausschnitte angezeigt werden sollen :)
+    measure:getMeasuresOnPage($mei, $surface)
+)