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

[Sorin Marian Nasoi]

Fix for bug lp:948712: Added a way for easy copy&paste of the import schema statements.

Fix for bug lp:948712: Added a way for easy copy&paste of the import schema statements.

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

review: Approve

[Matthias Brantner (matthias-brantner)]

The result looks as follows:
----------------------------------------
Imported schemas:

  • http://expath.org/ns/http-client

Please note that the schemas are not automatically imported in the modules that import this module.
In order to import and use the schemas, please add:

import schema "http://expath.org/ns/http-client";
----------------------------------------

1. The schema import is syntactically not correct. You also need to specify a prefix.

2. IMHO, it would be sufficient to show something as follows:

• http://expath.org/ns/http-client (usage: import schema namespace http = "http://expath.org/ns/http-client";)

review: Needs Fixing

[lp:~zorba-coders/zorba/bug_948712]

10708. By Sorin Marian Nasoi <email address hidden> on 2012-03-09

Merged trunk.
Also fixed an error in the XQDoc module import section.

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

The error was fixed, Thanks for pointing it out Matthias.

I did not change the layout though because I think that Dana's original propose best fits the copy/paste scenario.

> The result looks as follows:
> ----------------------------------------
> Imported schemas:
>
> • http://expath.org/ns/http-client
>
> Please note that the schemas are not automatically imported in the modules
> that import this module.
> In order to import and use the schemas, please add:
>
> import schema "http://expath.org/ns/http-client";
> ----------------------------------------
>
> 1. The schema import is syntactically not correct. You also need to specify a
> prefix.
>
> 2. IMHO, it would be sufficient to show something as follows:
>
> • http://expath.org/ns/http-client (usage: import schema namespace http =
> "http://expath.org/ns/http-client";)

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug_948712-2012-03-09T18-25-16.692Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug_948712-2012-03-09T18-25-16.692Z 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-03-07 15:49:25 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-09 07:01:19 +0000
@@ -1228,8 +1228,17 @@
     }
     </ul></p>
   else (),
+  if (fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="library"]) > 0) then
+    <p>External C++ library dependencies:<ul>
+      {
+      for $library in $xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="library"]
+        return
+         <li>{$library/node()}</li>
+      }
+    </ul></p>
+  else (),
   if (fn:count($xqdoc/xqdoc:imports//xqdoc:import[@type = "schema"]) > 0) then
-    <p>Imported schemas:<ul>
+    (<p>Imported schemas:<ul>
     {
       for $import in $xqdoc/xqdoc:imports//xqdoc:import[@type = "schema"]
       return
@@ -1243,16 +1252,23 @@
         else
           <li>{string($import/xqdoc:uri/text())}</li>
     }
-    </ul></p>
-  else (),
-  if (fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="library"]) > 0) then
-    <p>External C++ library dependencies:<ul>
-      {
-      for $library in $xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="library"]
-        return
-         <li>{$library/node()}</li>
-      }
-    </ul></p>
+    </ul></p>,
+    <p>Please note that the schemas are not automatically imported in the modules that import this module. <br />
+    In order to import and use the schemas, please add:
+    <pre class="brush: xquery;">
+    {
+    let $namespaces := $xqdoc/xqdoc:module//xqdoc:custom[@tag = "namespaces"]
+    return
+    string-join(
+    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,
+              ' =  "',
+              string($import/xqdoc:uri/text()),'";'),"
+")
+    }
+    </pre></p>)
   else ()
   )
 };