zorba-coders team mailing list archive

[William Candillon <william.candillon@xxxxxxxxxx>]

William Candillon has proposed merging lp:~zorba-coders/zorba/xqdoc_fix into lp:zorba.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fix/+merge/118175

Fix make doc target when multiple version of the same module exists.
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fix/+merge/118175
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-07-24 08:48:48 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-08-03 18:41:20 +0000
@@ -324,10 +324,13 @@
     variable $manifestXML := fn:parse-xml(file:read-text($zorbaManifestPath));
 
     variable $moduleManifests := $manifestXML/z:manifest/z:module;
-
+      
     for $module in $moduleManifests
+    let $uri := $module/z:uri/text()
+    group by $uri
+    let $module := if(count($module) gt 1) then $module[@version = max($module/@version)] else $module
     return
-      insert node <module uri="{data($module/z:uri)}"
+      insert node <module uri="{$uri}"
                           isCore="{data($module/@isCore)}"
                           version="{if (exists(data($module/@version))) then data($module/@version) else ''}"
                           projectRoot="{data($module/z:projectRoot)}"/> as last into $xqdoc2html:ZorbaManifest;