Merge lp:~zorba-coders/zorba/xqdoc_fix into lp:zorba

[William Candillon]

Fix make doc target when multiple version of the same module exists.

Fix make doc target when multiple version of the same module exists.

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqdoc_fix-2012-08-06T10-55-57.96Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xqdoc_fix-2012-08-06T10-55-57.96Z is finished. The final status was:

All tests succeeded!

=== 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:43:23 +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;