Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11305
Merged at revision: 11591
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 51 lines (+4/-5)
2 files modified
modules/json/json-xml.xq (+0/-1)
modules/org/expath/ns/file.xq (+4/-4)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+179235@code.launchpad.net

Commit message

Changed write-text() signature to accept only xs:string.

Description of the change

Changed write-text() signature to accept only xs:string.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/179235

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/json/json-xml.xq'
2--- modules/json/json-xml.xq 2013-08-07 05:28:39 +0000
3+++ modules/json/json-xml.xq 2013-08-08 17:08:33 +0000
4@@ -95,7 +95,6 @@
5 :)
6 module namespace jx = "http://zorba.io/modules/json-xml";
7
8-declare namespace an = "http://www.zorba-xquery.com/annotations";
9 declare namespace err = "http://www.w3.org/2005/xqt-errors";
10 declare namespace zerr = "http://zorba.io/errors";
11
12
13=== modified file 'modules/org/expath/ns/file.xq'
14--- modules/org/expath/ns/file.xq 2013-08-05 22:12:13 +0000
15+++ modules/org/expath/ns/file.xq 2013-08-08 17:08:33 +0000
16@@ -53,7 +53,7 @@
17 : @error file:FOFL9999 If any other error occurs.
18 :)
19 declare %an:sequential
20-function file:append-text( $file as xs:string, $content as xs:string*,
21+function file:append-text( $file as xs:string, $content as xs:string,
22 $encoding as xs:string )
23 as empty-sequence() external;
24
25@@ -67,7 +67,7 @@
26 : @error file:FOFL9999 If any other error occurs.
27 :)
28 declare %an:sequential
29-function file:append-text( $file as xs:string, $content as xs:string* )
30+function file:append-text( $file as xs:string, $content as xs:string )
31 as empty-sequence()
32 {
33 file:append-text( $file, $content, "UTF-8" )
34@@ -609,7 +609,7 @@
35 : @error file:FOFL9999 If any other error occurs.
36 :)
37 declare %an:sequential
38-function file:write-text( $file as xs:string, $content as xs:string*,
39+function file:write-text( $file as xs:string, $content as xs:string,
40 $encoding as xs:string )
41 as empty-sequence() external;
42
43@@ -623,7 +623,7 @@
44 : @error file:FOFL9999 If any other error occurs.
45 :)
46 declare %an:sequential
47-function file:write-text( $file as xs:string, $content as xs:string* )
48+function file:write-text( $file as xs:string, $content as xs:string )
49 as empty-sequence()
50 {
51 file:write-text( $file, $content, "UTF-8" )

Subscribers

People subscribed via source and target branches