zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

You have been requested to review the proposed merge of lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba.

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

Fixed a namespace clash by adding a "-schema" to the import schema prefix.

-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba.

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-09 06:57:41 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-15 17:38:21 +0000
@@ -1263,7 +1263,8 @@
     for $import in $xqdoc/xqdoc:imports//xqdoc:import[@type = "schema"]
       return
        concat('import schema namespace ',
-              $namespaces//xqdoc:namespace[@uri = $import/xqdoc:uri/text()][1]/@prefix,
+              concat($namespaces//xqdoc:namespace[@uri = $import/xqdoc:uri/text()][1]/@prefix,
+                     "-schema"),
               ' =  "',
               string($import/xqdoc:uri/text()),'";'),"
 ")