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

[Sorin Marian Nasoi]

Added try/catch for errors in the module processing.

Added try/catch for errors in the module processing.

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

review: Approve

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqdoc_exception_handling-2012-04-24T20-55-13.173Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xqdoc_exception_handling-2012-04-24T20-55-13.173Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/com/zorba-xquery/www/modules/project_xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-04-16 20:56:43 +0000
+++ modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-04-18 11:36:52 +0000
@@ -112,13 +112,15 @@
     if(count($moduleManifests) eq xs:integer(0)) then ();
     else
     {
+      try 
+      {
       for $module in $moduleManifests
       (: note the module version is not supported because of a bug in the fetch for the module URI ending with / :)
       (:let $moduleURI := if(ends-with(data($module/zm:uri),'/')) then data($module/zm:uri) 
                        else if(exists($module/@version)) then concat(data($module/zm:uri),"#",data($module/@version))
                        else data($module/zm:uri):)
       (:let $moduleFetched := fetch:content(trace($moduleURI,"fetch module URI version.."), "MODULE"):)
-      let $moduleURI := if(ends-with(data($module/zm:uri),".xq")) then substring-before(data($module/zm:uri),".xq") else data($module/zm:uri)
+      let $moduleURI := data($module/zm:uri)
       let $moduleFetched := fetch:content($moduleURI, "MODULE")
       let $xqdoc := xqd:xqdoc-content($moduleFetched)
       let $xqdocRelFileName  := pxqdoc:get-filename($moduleURI)
@@ -127,6 +129,15 @@
         file:write($xqdocFileName,
                    $xqdoc, 
                    $pxqdoc:serParamXml)
+      }
+      catch *
+      {
+        fn:error($err:UE004,
+                 concat("Error processing module ",
+                        $werr:code,
+                        " - ",
+                        $werr:description))
+      }
     };
   }  
 };