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

Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Rodolfo Ochoa
Approved revision: 10862
Merged at revision: 10864
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1001477
Merge into: lp:zorba
Diff against target: 21 lines (+2/-5)
1 file modified
modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq (+2/-5)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1001477
Reviewer Review Type Date Requested Status
Rodolfo Ochoa Approve
Sorin Marian Nasoi Approve
Review via email: mp+106773@code.launchpad.net

Commit message

Fixed bug lp:1001477.

Description of the change

Fixed bug lp:1001477.

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1001477-2012-05-22T21-38-00.485Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
2--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2012-05-18 15:36:42 +0000
3+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2012-05-22 10:19:23 +0000
4@@ -267,15 +267,12 @@
5 file:directory-separator(), "main.html")
6 return
7 {
8- (: first - create the xhtml folder if it does not exist already :)
9- file:create-directory($xhtmlPath);
10-
11- (: second - clear the XHTML folder :)
12 if(file:exists($xhtmlPath)) then
13 file:delete($xhtmlPath);
14 else ();
15
16- (: third - re-copy these files :)
17+ file:create-directory($xhtmlPath);
18+
19 xqdoc2html:copy-files($xhtmlRequisitesPath, $imagesPath ,("gif", "png", "svg"));
20 xqdoc2html:copy-files($xhtmlRequisitesPath, $libPath ,"js");
21 xqdoc2html:copy-files($xhtmlRequisitesPath, $cssPath ,"css");

Subscribers

People subscribed via source and target branches