Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Review: Needs Information
Should the implementation of base64:decode#1 be:
declare function base64:decode($base64 as xs:base64Binary) as xs:string {
base64:decode($base64, "UTF-8")};
?
--
https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
I don't believe it can be done that way, because the base64 module is an internally-implemented module. In release mode, the .xq file for the module won't even be parsed, so it cannot contain user-defined functions. Matthias, correct me if I'm wrong. -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
yes correct, sorry I missed that. On Tue, May 8, 2012 at 12:23 PM, Chris Hillery wrote: > I don't believe it can be done that way, because the base64 module is an > internally-implemented module. In release mode, the .xq file for the module > won't even be parsed, so it cannot contain user-defined functions. Matthias, > correct me if I'm wrong. > -- > https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 > You are reviewing the proposed merge of > lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba. -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-996084-reuse-stream-2012-05-08T10-33-54.117Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Validation queue job bug-996084-reuse-stream-2012-05-08T10-33-54.117Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996548] [NEW] format-dateTime does not support timezone
Public bug reported:
the timezone formatting in http://www.w3.org/TR/xpath-functions-30
/#func-format-dateTime does not work.
example:
format-dateTime(current-dateTime(),
"[D01][M01][Y0001][H01][m01][s01][z]")
expected:
08052012152215GMT+02:00
actual result:
08052012152215
The timezone is just not returned. A temporary workaround in XQuery is
(for others running into this issue):
concat(
format-dateTime(
adjust-dateTime-to-timezone(current-dateTime(),
xs:dayTimeDuration("PT2H")),
"[D01][M01][Y0001][H01][m01][s01]"),
"GMT+02:00")
** Affects: zorba
Importance: Medium
Assignee: Markos Zaharioudakis (markos-za)
Status: New
** Tags: incorrect-result
** Description changed:
the timezone formatting in http://www.w3.org/TR/xpath-functions-30
/#func-format-dateTime does not work.
example:
- format-dateTime(current-dateTime(),
+ format-dateTime(current-dateTime(),
"[D01][M01][Y0001][H01][m01][s01][z]")
expected:
- 08052012152215GMT+02:00
+ 08052012152215GMT+02:00
actual result:
- 08052012152215
+ 08052012152215
The timezone is just not returned. A temporary workaround in XQuery is
(for others running into this issue):
- concat(
- format-dateTime(
- adjust-dateTime-to-timezone(current-dateTime(),
xs:dayTimeDuration("PT2H")),
- "[D01][M01][Y0001][H01][m01][s01]"),
- "GMT+02:00")
+ concat(
+ format-dateTime(
+ adjust-dateTime-to-timezone(current-dateTime(),
+ xs:dayTimeDuration("PT2H")),
+ "[D01][M01][Y0001][H01][m01][s01]"),
+ "GMT+02:00")
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996548
Title:
format-dateTime does not support timezone
Status in Zorba - The XQuery Processor:
New
Bug description:
the timezone formatting in http://www.w3.org/TR/xpath-functions-30
/#func-format-dateTime does not work.
example:
format-dateTime(current-dateTime(),
"[D01][M01][Y0001][H01][m01][s01][z]")
expected:
08052012152215GMT+02:00
actual result:
08052012152215
The timezone is just not returned. A temporary workaround in XQuery is
(for others running into this issue):
concat(
format-dateTime(
adjust-dateTime-to-timezone(current-dateTime(),
xs:dayTimeDuration("PT2H")),
"[D01][M01][Y0001][H01][m01][s01]"),
"GMT+02:00")
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996548/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-994610 into lp:zorba
Review: Approve The regex tests seem to now pass on my side. -- https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-994610 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-994610 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 -- https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-994610 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-994610-2012-05-08T14-42-54.852Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
> I don't believe it can be done that way, because the base64 module is an > internally-implemented module. In release mode, the .xq file for the module > won't even be parsed, so it cannot contain user-defined functions. Matthias, > correct me if I'm wrong. It could but it would require us to process the .xq file at runtime which I wanted to avoid given the fact that it doesn't make the C++ implementation too complex. -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-994610 into lp:zorba
Validation queue job bug-994610-2012-05-08T14-42-54.852Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996548] Re: format-dateTime does not support timezone
** Changed in: zorba
Assignee: Markos Zaharioudakis (markos-za) => Nicolae Brinza (nbrinza)
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996548
Title:
format-dateTime does not support timezone
Status in Zorba - The XQuery Processor:
New
Bug description:
the timezone formatting in http://www.w3.org/TR/xpath-functions-30
/#func-format-dateTime does not work.
example:
format-dateTime(current-dateTime(),
"[D01][M01][Y0001][H01][m01][s01][z]")
expected:
08052012152215GMT+02:00
actual result:
08052012152215
The timezone is just not returned. A temporary workaround in XQuery is
(for others running into this issue):
concat(
format-dateTime(
adjust-dateTime-to-timezone(current-dateTime(),
xs:dayTimeDuration("PT2H")),
"[D01][M01][Y0001][H01][m01][s01]"),
"GMT+02:00")
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996548/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-994610 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-994610 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 -- https://code.launchpad.net/~paul-lucas/zorba/bug-994610/+merge/104769 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 994610] Re: Regex tests "fail" using latest ICU version
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/994610 Title: Regex tests "fail" using latest ICU version Status in Zorba - The XQuery Processor: Fix Committed Bug description: The regex tests: 22356 - test/rbkt/zorba/string/Regex/regex_err10 (Failed) 22361 - test/rbkt/zorba/string/Regex/regex_err15 (Failed) 22362 - test/rbkt/zorba/string/Regex/regex_err16 (Failed) 22413 - test/rbkt/zorba/string/Regex/regex_m40 (Failed) 22414 - test/rbkt/zorba/string/Regex/regex_m41 (Failed) fail when using ICU 4.8.1 but not 3.8.1. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/994610/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 974477] Re: Invalid regex character class not reported with ICU
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/974477 Title: Invalid regex character class not reported with ICU Status in Zorba - The XQuery Processor: Fix Committed Bug description: When using ICU, the query: fn:matches( "a", "[\s-e]" ) returns "false" even though it should raise err:FORX0002 because \s can't be used in a character class. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/974477/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Review: Approve I tested it and it works. -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] [NEW] http client throws error with no content-type header in http response
Public bug reported:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is created
internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp) the
following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
** Affects: zorba
Importance: Medium
Assignee: Paul J. Lucas (paul-lucas)
Status: New
** Tags: incorrect-result
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] Re: http client throws error with no content-type header in http response
** Attachment added: "simple query to reproduce the error"
https://bugs.launchpad.net/bugs/996593/+attachment/3136986/+files/test.xq
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/dataf-module-fix into
lp:zorba/data-formatting-module.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091
Fix cmake script for finding fop.jar and it's dependencies on non win boxes.
--
https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'src/com/zorba-xquery/www/modules/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-04-11 16:06:04 +
+++ src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-05-08 17:15:25 +
@@ -24,32 +24,24 @@
IF (NOT DEFINED XSL_FOP_HOME)
IF (WIN32)
MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying default: C:\\dev\\libraries\\fop-1.0")
- SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0")
+ SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0 C:\\dev\\libraries\\fop-1.0\\lib")
ELSE (WIN32)
MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${Java_LIBRARIES} " /usr/share/java/ /usr/share/java/fop/")
- SET (XSL_FOP_HOME "/usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES}")
+ SET (XSL_FOP_HOME /usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES})
ENDIF (WIN32)
ENDIF (NOT DEFINED XSL_FOP_HOME)
STRING(REGEX REPLACE "" "/" XSL_FOP_HOME "${XSL_FOP_HOME}")
MESSAGE (STATUS "XSL-FOP HOME: " ${XSL_FOP_HOME} )
- FIND_FILE( FOP_JAR NAMES fop.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/build )
- FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D2_JAR NAMES batik-all.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D3_JAR NAMES commons-io.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D5_JAR NAMES serializer.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
+ FIND_FILE( FOP_JARNAMES fop.jar PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jarPATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D2_JAR NAMES batik-all.jar PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D3_JAR NAMES commons-io.jar PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D5_JAR NAMES serializer.jar PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jarPATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar PATHS ${XSL_FOP_HOME} )
#MULTIPLE EXISTS CAN'T BE USED IN AN *IF* COMMAND, LOOKS LIKE A BUG ON CMAKE
SET(ALL_FOP FALSE)
@@ -70,8 +62,7 @@
ENDIF ( EXISTS ${FOP_D2_JAR} )
ENDIF ( EXISTS ${FOP_D1_JAR} )
ENDIF ( EXISTS ${FOP_JAR} )
- MESSAGE(STATUS "ALL_FOP:" ${ALL_FOP})
-
+
IF ( ALL_FOP )
MESSAGE(STATUS "FOP Libraries Found.")
INCLUDE (CMakeJavaInformation )
@@ -101,5 +92,9 @@
ELSE ( ALL_FOP )
MESSAGE (STATUS "fop.jar and/or all its dependecies (avalon-framework.jar, batik-all.jar, commons-io.jar, commons-logging.jar, serializer.jar, xalan2.jar, xmlgraphics-commons.jar) not found skiping data-formating module")
+MESSAGE ( STATUS " fop: " ${FOP_JAR} "\navalon: " ${FOP_D1_JAR}
+ "\nbatik: " ${FOP_D2_JAR} "\nio: " ${FOP_D3_JAR}
+ "\nlogging: " ${FOP_D4_JAR} "\nserializer: " ${FOP_D5_JAR} " "
+ "\nxalan: " ${FOP_D6_JAR} "\nxmlgraphics: " ${FOP_D7_JAR} )
ENDIF ( ALL_FOP )
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module has been updated. Commit Message changed to: Fix cmake script for finding fop.jar and it's dependencies on non win boxes. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/dataf-module-fix-2012-05-08T17-16-38.082Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Validation queue job dataf-module-fix-2012-05-08T17-16-38.082Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105091 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] Re: http client throws error with no content-type header in http response
** Branch linked: lp:~paul-lucas/zorba/bug-996593
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 994919] Re: Typos in full-text module documentation and other places
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/994919 Title: Typos in full-text module documentation and other places Status in Zorba - The XQuery Processor: Fix Committed Bug description: In full-text.xq: "langauage". In json/common.h: "supporess". To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/994919/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] Re: http client throws error with no content-type header in http response
Are you also saying that the correct behavior would also be to not do
transcoding and just hope that the unspecified character set is UTF-8?
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] Re: http client throws error with no content-type header in http response
a comment in the http_response_parser.cpp says that the HTTP/1.1 spec
says that the default charset is ISO-8859-1. That is the charset used in
the response parser if a content-type without charset is returned.
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:zorba. Check out http://trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/dataf-module-fix
into lp:zorba/data-formatting-module.
Requested reviews:
Chris Hillery (ceejatec)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122
Fix cmake script for finding fop.jar and it's dependencies on non win boxes.
--
https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'src/com/zorba-xquery/www/modules/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-04-11 16:06:04 +
+++ src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-05-08 20:36:19 +
@@ -24,32 +24,33 @@
IF (NOT DEFINED XSL_FOP_HOME)
IF (WIN32)
MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying default: C:\\dev\\libraries\\fop-1.0")
- SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0")
+ SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0 C:\\dev\\libraries\\fop-1.0\\lib")
ELSE (WIN32)
- MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${Java_LIBRARIES} " /usr/share/java/ /usr/share/java/fop/")
- SET (XSL_FOP_HOME "/usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES}")
+ SET (UNIX_FOP_DEFAULTS /usr/share/java/ /usr/share/java/fop/ /opt/local/share/java/fop/1.0/lib /opt/local/share/java/fop/1.0/build/ ${Java_LIBRARIES})
+ MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${UNIX_FOP_DEFAULTS})
+ SET (XSL_FOP_HOME ${UNIX_FOP_DEFAULTS})
ENDIF (WIN32)
ENDIF (NOT DEFINED XSL_FOP_HOME)
STRING(REGEX REPLACE "" "/" XSL_FOP_HOME "${XSL_FOP_HOME}")
MESSAGE (STATUS "XSL-FOP HOME: " ${XSL_FOP_HOME} )
- FIND_FILE( FOP_JAR NAMES fop.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/build )
- FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D2_JAR NAMES batik-all.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D3_JAR NAMES commons-io.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D5_JAR NAMES serializer.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
+ FIND_FILE( FOP_JARNAMES fop.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar avalon-framework-4.2.0.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D2_JAR NAMES batik-all.jar /batik-all-1.7.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D3_JAR NAMES commons-io.jar commons-io-1.3.1.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar commons-logging-1.0.4.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D5_JAR NAMES serializer.jar serializer-2.7.0.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar xalan-2.7.0.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar xmlgraphics-commons-1.4.jar
+PATHS ${XSL_FOP_HOME} )
#MULTIPLE EXISTS CAN'T BE USED IN AN *IF* COMMAND, LOOKS LIKE A BUG ON CMAKE
SET(ALL_FOP FALSE)
@@ -70,8 +71,7 @@
ENDIF ( EXISTS ${FOP_D2_JAR} )
ENDIF ( EXISTS ${FOP_D1_JAR} )
ENDIF ( EXISTS ${FOP_JAR} )
- MESSAGE(STATUS "ALL_FOP:" ${ALL_FOP})
-
+
IF ( ALL_FOP )
MESSAGE(STATUS "FOP Libraries Found.")
INCLUDE (CMakeJavaInformation )
@@ -101,5 +101,9 @@
ELSE ( ALL_FOP )
MESSAGE (STATUS "fop.jar and/or all its dependecies (avalon-framework.jar, batik-all.jar, commons-io.jar, commons-logging.jar, serializer.jar, xalan2.jar, xmlgraphics-commons.jar) not found skiping data-formating module")
+MESSAGE ( STATUS " fop: " ${FOP_JAR} "\navalon: " ${FOP_D1_JAR}
+ "\nbatik: " ${FOP_D2_JAR} "\nio: " ${FOP_D3_JAR}
+ "\nlogging: " ${FOP_D4_JAR} "\nserializer: " ${FOP_D5_JAR} " "
+ "\nxalan: " ${FOP_D6_JAR} "\nxmlgraphics: " ${FOP_D7_JAR} )
ENDIF ( ALL_FOP )
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module has been updated. Commit Message changed to: Fix cmake script for finding fop.jar and it's dependencies on non win boxes. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/dataf-module-fix-2012-05-08T20-37-40.21Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
I have hard-coded some version such that the jars are at least found with the current port version of xsl-fo. That's clearly not a long-term solution but given the fact that find_jar is not in cmake 2.8.5 I don't see any quick fix for this. The right solution is probably to come up with a FindFOP.cmake script that does all the magic. -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105126
no node copying during insertion into collection if the nodes are freshly
constructed nodes
--
https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105126
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/base/plan_iterator.h'
--- src/runtime/base/plan_iterator.h 2012-05-03 12:31:51 +
+++ src/runtime/base/plan_iterator.h 2012-05-08 20:53:18 +
@@ -346,6 +346,8 @@
TypeManager* getTypeManager() const;
+ virtual bool isConstructor() const { return false; }
+
/**
* Accept method for the PlanIterator-Tree-Visitor
*
=== modified file 'src/runtime/collections/collections_base.h'
--- src/runtime/collections/collections_base.h 2012-05-03 12:31:51 +
+++ src/runtime/collections/collections_base.h 2012-05-08 20:53:18 +
@@ -128,6 +128,9 @@
getCopyMode(lCopyMode, this->theSctx);
+lCopyMode.theDoCopy = !
+this->theChildren[this->theChildren.size()-1]->isConstructor();
+
while (this->consumeNext(node, this->theChildren[this->theChildren.size()-1].getp(), planState))
{
checkNodeType(this->theSctx, node, collectionDecl, this->loc, theDynamicCollection);
=== modified file 'src/runtime/core/constructors.h'
--- src/runtime/core/constructors.h 2012-05-03 12:31:51 +
+++ src/runtime/core/constructors.h 2012-05-08 20:53:18 +
@@ -67,6 +67,8 @@
bool copyInputNodes() const { return theCopyInputNodes; }
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
void openImpl(PlanState& planState, uint32_t& offset);
@@ -141,6 +143,8 @@
bool copyInputNodes() const { return theCopyInputNodes; }
+ bool isConstructor() const { return true; }
+
uint32_t getStateSizeOfSubtree() const;
void accept(PlanIterVisitor&) const;
@@ -193,6 +197,8 @@
store::Item* getQName() const { return theQName.getp(); }
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -234,6 +240,8 @@
PlanIter_t& aChild,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -275,6 +283,8 @@
PlanIter_t& aComment,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -314,6 +324,8 @@
PlanIter_t& aContent,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Validation queue job dataf-module-fix-2012-05-08T20-37-40.21Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105122 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/dataf-module-fix
into lp:zorba/data-formatting-module.
Requested reviews:
Chris Hillery (ceejatec)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105131
Fix cmake script for finding fop.jar and it's dependencies on non win boxes.
Also, modified the test to be less strict such that it also succeeds on Mac.
--
https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105131
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'src/com/zorba-xquery/www/modules/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-04-11 16:06:04 +
+++ src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-05-08 21:12:20 +
@@ -24,32 +24,33 @@
IF (NOT DEFINED XSL_FOP_HOME)
IF (WIN32)
MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying default: C:\\dev\\libraries\\fop-1.0")
- SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0")
+ SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0 C:\\dev\\libraries\\fop-1.0\\lib")
ELSE (WIN32)
- MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${Java_LIBRARIES} " /usr/share/java/ /usr/share/java/fop/")
- SET (XSL_FOP_HOME "/usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES}")
+ SET (UNIX_FOP_DEFAULTS /usr/share/java/ /usr/share/java/fop/ /opt/local/share/java/fop/1.0/lib /opt/local/share/java/fop/1.0/build/ ${Java_LIBRARIES})
+ MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${UNIX_FOP_DEFAULTS})
+ SET (XSL_FOP_HOME ${UNIX_FOP_DEFAULTS})
ENDIF (WIN32)
ENDIF (NOT DEFINED XSL_FOP_HOME)
STRING(REGEX REPLACE "" "/" XSL_FOP_HOME "${XSL_FOP_HOME}")
MESSAGE (STATUS "XSL-FOP HOME: " ${XSL_FOP_HOME} )
- FIND_FILE( FOP_JAR NAMES fop.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/build )
- FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D2_JAR NAMES batik-all.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D3_JAR NAMES commons-io.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D5_JAR NAMES serializer.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar
-PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
+ FIND_FILE( FOP_JARNAMES fop.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar avalon-framework-4.2.0.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D2_JAR NAMES batik-all.jar batik-all-1.7.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D3_JAR NAMES commons-io.jar commons-io-1.3.1.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar commons-logging-1.0.4.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D5_JAR NAMES serializer.jar serializer-2.7.0.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar xalan-2.7.0.jar
+PATHS ${XSL_FOP_HOME} )
+ FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar xmlgraphics-commons-1.4.jar
+PATHS ${XSL_FOP_HOME} )
#MULTIPLE EXISTS CAN'T BE USED IN AN *IF* COMMAND, LOOKS LIKE A BUG ON CMAKE
SET(ALL_FOP FALSE)
@@ -70,8 +71,7 @@
ENDIF ( EXISTS ${FOP_D2_JAR} )
ENDIF ( EXISTS ${FOP_D1_JAR} )
ENDIF ( EXISTS ${FOP_JAR} )
- MESSAGE(STATUS "ALL_FOP:" ${ALL_FOP})
-
+
IF ( ALL_FOP )
MESSAGE(STATUS "FOP Libraries Found.")
INCLUDE (CMakeJavaInformation )
@@ -101,5 +101,9 @@
ELSE ( ALL_FOP )
MESSAGE (STATUS "fop.jar and/or all its dependecies (avalon-framework.jar, batik-all.jar, commons-io.jar, commons-logging.jar, serializer.jar, xalan2.jar, xmlgraphics-commons.jar) not found skiping data-formating module")
+MESSAGE ( STATUS " fop: " ${FOP_JAR} "\navalon: " ${FOP_D1_JAR}
+ "\nbatik: " ${FOP_D2_JAR} "\nio: " ${FOP_D3_JAR}
+ "\nlogging: " ${FOP_D4_JAR} "\nserializer: " ${FOP_D5_JAR} " "
+ "\nxalan: " ${FOP_D6_JAR} "\nxmlgraphics: " ${FOP_D7_JAR} )
ENDIF ( ALL_FOP )
=== modified file 'test/ExpQueryResults/data-formatting/xslfo.xml.res'
--- test/ExpQueryResults/data-formatting/xslfo.xml.res 2012-03-12 22:08:04 +
+++ test/ExpQueryResults/data-formatting/xslfo.xml.res 2012-05-08 21:12:20 +
@@ -1,1 +1,1 @@
-6484JVBERi0xLjAolJUVPRgo=
+trueJVBERi0xLj
=== modified file 'test/Queries/data-formatting/xslfo.xq'
--- test/Queries/data-formatting/xslfo.xq 2012-03-12 22:08:04 +
+++ test/Queries/data-formatting/xslfo.xq 2012-05-08 21:12:20 +
@@ -21,7 +21,6 @@
let $len := fn:string-length($pdf)
return
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138
no node copying during insertion into collection if the nodes are freshly
constructed nodes
--
https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-05-07 23:43:04 +
+++ ChangeLog 2012-05-08 21:59:21 +
@@ -25,6 +25,10 @@
* Added XQJ support.
* Added CollectionManager and DocumentManager support for XQJ.
+Optimizations:
+ * optimized insertion into a collection (don't copy it if the node was created by an element constructor
+and is not used anywhere else in the query
+
Bug Fixes/Other Changes:
* Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
* Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-05-05 02:39:12 +
+++ src/compiler/translator/translator.cpp 2012-05-08 21:59:21 +
@@ -2195,7 +2195,7 @@
{
TRACE_VISIT();
- if (v.get_encoding().length() != 0 &&
+ if (v.get_encoding() != "utf-8" &&
!utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$"))
RAISE_ERROR(err::XQST0087, loc, ERROR_PARAMS(v.get_encoding()));
=== modified file 'src/runtime/base/plan_iterator.h'
--- src/runtime/base/plan_iterator.h 2012-05-03 12:31:51 +
+++ src/runtime/base/plan_iterator.h 2012-05-08 21:59:21 +
@@ -346,6 +346,8 @@
TypeManager* getTypeManager() const;
+ virtual bool isConstructor() const { return false; }
+
/**
* Accept method for the PlanIterator-Tree-Visitor
*
=== modified file 'src/runtime/collections/collections_base.h'
--- src/runtime/collections/collections_base.h 2012-05-03 12:31:51 +
+++ src/runtime/collections/collections_base.h 2012-05-08 21:59:21 +
@@ -128,6 +128,9 @@
getCopyMode(lCopyMode, this->theSctx);
+lCopyMode.theDoCopy = !
+this->theChildren[this->theChildren.size()-1]->isConstructor();
+
while (this->consumeNext(node, this->theChildren[this->theChildren.size()-1].getp(), planState))
{
checkNodeType(this->theSctx, node, collectionDecl, this->loc, theDynamicCollection);
=== modified file 'src/runtime/core/constructors.h'
--- src/runtime/core/constructors.h 2012-05-03 12:31:51 +
+++ src/runtime/core/constructors.h 2012-05-08 21:59:21 +
@@ -67,6 +67,8 @@
bool copyInputNodes() const { return theCopyInputNodes; }
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
void openImpl(PlanState& planState, uint32_t& offset);
@@ -141,6 +143,8 @@
bool copyInputNodes() const { return theCopyInputNodes; }
+ bool isConstructor() const { return true; }
+
uint32_t getStateSizeOfSubtree() const;
void accept(PlanIterVisitor&) const;
@@ -193,6 +197,8 @@
store::Item* getQName() const { return theQName.getp(); }
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -234,6 +240,8 @@
PlanIter_t& aChild,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -275,6 +283,8 @@
PlanIter_t& aComment,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -314,6 +324,8 @@
PlanIter_t& aContent,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2012-05-03 12:31:51 +
+++ src/store/naive/node_items.cpp 2012-05-08 21:59:21 +
@@ -614,8 +614,14 @@
pos = parent->numChildren();
}
} // have parent
-
- return copyInternal(parent, parent, pos, NULL, copymode);
+ else if (copymode.theDoCopy)
+ {
+return copyInternal(parent, parent, pos, NULL, copymode);
+ }
+ else
+ {
+return const_cast(this);
+ }
}
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996793] [NEW] using http-client to execute an html form
Public bug reported:
I was implementing some XQuery code for uploading a file and some form
data. Fiddling with Multipart request and the http-client wasn't really
usable, the http-client added some extra multipart content-type header
and didn't work well. In the end I was implementing multipart requests
manually:
{
concat (
"6d6f6d615f08
",
'Content-Disposition: form-data; name="file";',
' filename="test.jpg"
',
"Content-Type: multipart/form-data
",
"
",
base64:decode(file:read-binary ($filename)),"
",
"6d6f6d615f08
",
'Content-Disposition: form-data; name="description"
',
"
",
"A test file
",
"6d6f6d615f08
",
'Content-Disposition: form-data; name="category"
',
"
",
"main
",
"6d6f6d615f08--
"
)
}
As this is not usable for common users, I propose 2 changes:
1. the multipart implementation of the http client can be done in XQuery only
(see example above) which would make this implementation more stable
2. a helper module where one just passes an html form and gets an http request
for execution, for example:
http-client:send-request(
html-forms:create-request(
http://www.example.com/upload";
method="post"
enctype="multipart/form-data">
)
)
** Affects: zorba
Importance: Medium
Assignee: Matthias Brantner (matthias-brantner)
Status: New
** Tags: new-functionality-requirement usability
** Tags added: new-functionality-requirement
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996793
Title:
using http-client to execute an html form
Status in Zorba - The XQuery Processor:
New
Bug description:
I was implementing some XQuery code for uploading a file and some form
data. Fiddling with Multipart request and the http-client wasn't
really usable, the http-client added some extra multipart content-type
header and didn't work well. In the end I was implementing multipart
requests manually:
{
concat (
"6d6f6d615f08
",
'Content-Disposition: form-data; name="file";',
' filename="test.jpg"
',
"Content-Type: multipart/form-data
",
"
",
base64:decode(file:read-binary ($filename)),"
",
"6d6f6d615f08
",
'Content-Disposition: form-data; name="description"
',
"
",
"A test file
",
"6d6f6d615f08
",
'Content-Disposition: form-data; name="category"
',
"
",
"main
",
"6d6f6d615f08--
"
)
}
As this is not usable for common users, I propose 2 changes:
1. the multipart implementation of the http client can be done in XQuery only
(see example above) which would make this implementation more stable
2. a helper module where one just passes an html form and gets an http
request for execution, for example:
http-client:send-request(
html-forms:create-request(
http://www.example.com/upload";
method="post"
enctype="multipart/form-data">
)
)
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996793/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Commit Message changed to: no node copying during insertion into collection if the nodes are freshly constructed nodes For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996793] Re: using http-client to execute an html form
** Description changed:
I was implementing some XQuery code for uploading a file and some form
data. Fiddling with Multipart request and the http-client wasn't really
usable, the http-client added some extra multipart content-type header
and didn't work well. In the end I was implementing multipart requests
manually:
- {
- concat (
- "--6d6f6d615f08
",
- 'Content-Disposition: form-data; name="file";
filename="test.jpg"
',
- "Content-Type: multipart/form-data
",
- "
",
- base64:decode(file:read-binary ($filename)),"
",
- "--6d6f6d615f08
",
- 'Content-Disposition: form-data; name="description"
',
- "
",
- "A test file
",
- "--6d6f6d615f08
",
- 'Content-Disposition: form-data; name="category"
',
- "
",
- "main
",
- "--6d6f6d615f08--
"
- )
+ {
+ concat (
+ "6d6f6d615f08
",
+ 'Content-Disposition: form-data; name="file";',
+ ' filename="test.jpg"
',
+ "Content-Type: multipart/form-data
",
+ "
",
+ base64:decode(file:read-binary ($filename)),"
",
+ "6d6f6d615f08
",
+ 'Content-Disposition: form-data; name="description"
',
+ "
",
+ "A test file
",
+ "6d6f6d615f08
",
+ 'Content-Disposition: form-data; name="category"
',
+ "
",
+ "main
",
+ "6d6f6d615f08--
"
+ )
}
As this is not usable for common users, I propose 2 changes:
1. the multipart implementation of the http client can be done in XQuery only
(see example above) which would make this implementation more stable
2. a helper module where one just passes an html form and gets an http
request for execution, for example:
- html-forms:create-request(
- http://www.example.com/upload"; method="post"
enctype="multipart/form-data">
-
-
-
-
+ http-client:send-request(
+ html-forms:create-request(
+ http://www.example.com/upload";
+ method="post"
+ enctype="multipart/form-data">
+
+
+
+
+ )
)
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996793
Title:
using http-client to execute an html form
Status in Zorba - The XQuery Processor:
New
Bug description:
I was implementing some XQuery code for uploading a file and some form
data. Fiddling with Multipart request and the http-client wasn't
really usable, the http-client added some extra multipart content-type
header and didn't work well. In the end I was implementing multipart
requests manually:
{
concat (
"6d6f6d615f08
",
'Content-Disposition: form-data; name="file";',
' filename="test.jpg"
',
"Content-Type: multipart/form-data
",
"
",
base64:decode(file:read-binary ($filename)),"
",
"6d6f6d615f08
",
'Content-Disposition: form-data; name="description"
',
"
",
"A test file
",
"6d6f6d615f08
",
'Content-Disposition: form-data; name="category"
',
"
",
"main
",
"6d6f6d615f08--
"
)
}
As this is not usable for common users, I propose 2 changes:
1. the multipart implementation of the http client can be done in XQuery only
(see example above) which would make this implementation more stable
2. a helper module where one just passes an html form and gets an http
request for execution, for example:
http-client:send-request(
html-forms:create-request(
http://www.example.com/upload";
method="post"
enctype="multipart/form-data">
)
)
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996793/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/collection-insert-without-copy-2012-05-08T22-02-17.793Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job collection-insert-without-copy-2012-05-08T22-02-17.793Z is finished. The final status was: 546 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105138 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] Re: http client throws error with no content-type header in http response
When I run the sample query, I get:
:108,1: static error [err:XQST0059]: "http://www.zorba-
xquery.com/modules/converters/html-options": target namespace not found
for schema/module "http://www.zorba-xquery.com/modules/converters/html-
options.xsd": Could not create stream resource; raised at
/Users/pjl/src/flwor/zorba/repo/bug-996593/zorba/src/compiler/translator/translator.cpp:2069
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996593] Re: http client throws error with no content-type header in http response
Also, what should happen if a Content-Type and charset are provided, but
the charset is not supported by ICU?
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/996593
Title:
http client throws error with no content-type header in http response
Status in Zorba - The XQuery Processor:
New
Bug description:
in modules/com/zorba-xquery/www/modules/http-
client.xq.src/http_response_parser.cpp the function
HttpResponseParser::parse() throws an error if the response doesn't
contain a content-type. In this case theCurrentCharset is "".
the surprising part is that in the following code
transcode::is_necessary("") returns true and an icu_streambuf is
created internally with an empty charset:
if ( transcode::is_necessary( theCurrentCharset.c_str() ) ) {
lStream.reset(
new transcode::stream(
theCurrentCharset.c_str(), theStreamBuffer
)
);
}
in the constructor of the icu_streambuf (src/util/icu_streambuf.cpp)
the following code throws the error:
external_conv_( no_conv_ ? nullptr : create_conv( charset ) )
the correct behavior would be if the http-client would not throw an
error if the content-type header is missing.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/996593/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:zorba. Check out http://trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148
no node copying during insertion into collection if the nodes are freshly
constructed nodes
--
https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-05-07 23:43:04 +
+++ ChangeLog 2012-05-08 23:34:21 +
@@ -25,6 +25,10 @@
* Added XQJ support.
* Added CollectionManager and DocumentManager support for XQJ.
+Optimizations:
+ * optimized insertion into a collection (don't copy it if the node was created by an element constructor
+and is not used anywhere else in the query
+
Bug Fixes/Other Changes:
* Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
* Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-05-05 02:39:12 +
+++ src/compiler/translator/translator.cpp 2012-05-08 23:34:21 +
@@ -2195,7 +2195,7 @@
{
TRACE_VISIT();
- if (v.get_encoding().length() != 0 &&
+ if (v.get_encoding() != "utf-8" &&
!utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$"))
RAISE_ERROR(err::XQST0087, loc, ERROR_PARAMS(v.get_encoding()));
=== modified file 'src/runtime/base/plan_iterator.h'
--- src/runtime/base/plan_iterator.h 2012-05-03 12:31:51 +
+++ src/runtime/base/plan_iterator.h 2012-05-08 23:34:21 +
@@ -346,6 +346,8 @@
TypeManager* getTypeManager() const;
+ virtual bool isConstructor() const { return false; }
+
/**
* Accept method for the PlanIterator-Tree-Visitor
*
=== modified file 'src/runtime/collections/collections_base.h'
--- src/runtime/collections/collections_base.h 2012-05-03 12:31:51 +
+++ src/runtime/collections/collections_base.h 2012-05-08 23:34:21 +
@@ -128,6 +128,9 @@
getCopyMode(lCopyMode, this->theSctx);
+lCopyMode.theDoCopy = !
+this->theChildren[this->theChildren.size()-1]->isConstructor();
+
while (this->consumeNext(node, this->theChildren[this->theChildren.size()-1].getp(), planState))
{
checkNodeType(this->theSctx, node, collectionDecl, this->loc, theDynamicCollection);
=== modified file 'src/runtime/core/constructors.h'
--- src/runtime/core/constructors.h 2012-05-03 12:31:51 +
+++ src/runtime/core/constructors.h 2012-05-08 23:34:21 +
@@ -67,6 +67,8 @@
bool copyInputNodes() const { return theCopyInputNodes; }
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
void openImpl(PlanState& planState, uint32_t& offset);
@@ -141,6 +143,8 @@
bool copyInputNodes() const { return theCopyInputNodes; }
+ bool isConstructor() const { return true; }
+
uint32_t getStateSizeOfSubtree() const;
void accept(PlanIterVisitor&) const;
@@ -193,6 +197,8 @@
store::Item* getQName() const { return theQName.getp(); }
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -234,6 +240,8 @@
PlanIter_t& aChild,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -275,6 +283,8 @@
PlanIter_t& aComment,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
@@ -314,6 +324,8 @@
PlanIter_t& aContent,
bool isRoot);
+ bool isConstructor() const { return true; }
+
void accept(PlanIterVisitor& v) const;
bool nextImpl(store::Item_t& result, PlanState& planState) const;
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2012-05-03 12:31:51 +
+++ src/store/naive/node_items.cpp 2012-05-08 23:34:21 +
@@ -615,7 +615,14 @@
}
} // have parent
- return copyInternal(parent, parent, pos, NULL, copymode);
+ if (copymode.theDoCopy)
+ {
+return copyInternal(parent, parent, pos, NULL, copymode);
+ }
+ else
+ {
+return const_cast(this);
+ }
}
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Commit Message changed to: no node copying during insertion into collection if the nodes are freshly constructed nodes For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/collection-insert-without-copy-2012-05-08T23-35-58.8Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module
Review: Needs Fixing I don't think you should have removed the XSL_FOP_HOME/build and XSL_FOP_HOME/lib directories from the PATHS of FIND_FILE(). Those are where they will be located if you download the binary distribution of FOP from Apache. However, the bigger problem is the version numbers in the jar filenames in the binary distribution, as well as in the files from Macports and other places. FIND_FILE() cannot find these, and that's bad. After some discussion with Matthias today, we decided the only viable approach was effectively to re-implement FIND_FILE() with the ability to do glob patterns. I am going to see if I can add a macro to do that for jar files to the util-jvm package; if not I'll just embed it in the FOP module for now. -- https://code.launchpad.net/~zorba-coders/zorba/dataf-module-fix/+merge/105131 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Validation queue job collection-insert-without-copy-2012-05-08T23-35-58.8Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/collection-insert-without-copy-2012-05-09T00-13-03.711Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:zorba. Check out http://trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
Validation queue job collection-insert-without-copy-2012-05-09T00-13-03.711Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/collection-insert-without-copy into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 -- https://code.launchpad.net/~zorba-coders/zorba/collection-insert-without-copy/+merge/105148 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155
- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned
by fetch are seekable.
--
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-05-09 00:44:36 +
+++ ChangeLog 2012-05-09 00:52:21 +
@@ -18,6 +18,7 @@
- fn:has-children#0
- fn:nilled#0
- fn:path
+ * Added base64:decode#2 function which also does transcoding
* Extended API for Python, Java, PHP and Ruby.
* Add jvm classpath to zorbacmd and to Zorba API. Tracked by #931816
* Added full-text module.
@@ -53,6 +54,7 @@
* Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
* Fixed bug #921458 (file:read-text-lines() blocking)
* Fixed bug #981405 (do not hoist expr containing try-catch variables out of the associated try-catch expression)
+ * Fixed bug #996084 (crash in Streamable*Item with file module)
* Fixed bug #947627 (throw XQST0099 if more than one declarations of context item type in same module)
* Fixed bug #980526 (no-copy rule bug due to global var being set in "distant" udf)
* Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).
=== modified file 'include/zorba/uri_resolvers.h'
--- include/zorba/uri_resolvers.h 2012-05-03 12:31:51 +
+++ include/zorba/uri_resolvers.h 2012-05-09 00:52:21 +
@@ -84,9 +84,11 @@
* @param aStreamReleaser A function pointer which is invoked once
*the StreamResource is destroyed. Normally this function will delete
*the std::istream object passed to it.
+ * @param aIsStreamSeekable Determines whether the given stream is seekable.
*/
static StreamResource* create(std::istream* aStream,
-StreamReleaser aStreamReleaser);
+StreamReleaser aStreamReleaser,
+bool aIsStreamSeekable = false);
/**
* @brief Retrieve the istream associated with this Resource.
@@ -99,6 +101,8 @@
virtual StreamReleaser getStreamReleaser() = 0;
virtual ~StreamResource() = 0;
+
+ virtual bool isStreamSeekable() const = 0;
};
/**
=== modified file 'modules/com/zorba-xquery/www/modules/converters/base64.xq'
--- modules/com/zorba-xquery/www/modules/converters/base64.xq 2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/converters/base64.xq 2012-05-09 00:52:21 +
@@ -25,6 +25,8 @@
:)
module namespace base64 = "http://www.zorba-xquery.com/modules/converters/base64";;
+declare namespace zerr = "http://www.zorba-xquery.com/errors";;
+
declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
declare option ver:module-version "2.0";
@@ -32,7 +34,7 @@
: Decode a xs:base64Binary.
:
: The function assumes that the content after decoding is valid
- : UTF-8.
+ : UTF-8.
:
: @param $base64 The xs:base64Binary item to decode
: @return the base64 decoded value as string
@@ -41,6 +43,24 @@
as xs:string external;
(:~
+ : Decode a xs:base64Binary.
+ :
+ : The function assumes that the content after decoding has
+ : the given encoding.
+ :
+ : @param $base64 The xs:base64Binary item to decode
+ : @param $encoding The encoding of the string after base64 decoding it.
+ :
+ : @return the base64 decoded value as string
+ :
+ : @error zerr:ZXQP0006 if the given encoding is invalid or not supported.
+ :)
+declare function base64:decode(
+ $base64 as xs:base64Binary,
+ $encoding as xs:string)
+as xs:string external;
+
+(:~
: Encode a xs:string as xs:base64Binary.
:
: @param $string The item whose string-value should be encoded
=== modified file 'modules/com/zorba-xquery/www/modules/fetch.xq'
--- modules/com/zorba-xquery/www/modules/fetch.xq 2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/fetch.xq 2012-05-09 00:52:21 +
@@ -96,5 +96,28 @@
: @see URI Resolvers.
: @see Documentation of Zorba's annotations.
:)
-
-declare %an:streamable function fetch:content($uri as xs:string, $entityKind as xs:string) as xs:string external;
+declare %an:streamable function fetch:content($uri as xs:string, $entityKind as xs:string)
+as xs:string
+{
+ fetch:content($uri, $entityKind, "UTF-8")
+};
+
+(:~
+ :)
+declare %an:streamable function fetch:content(
+ $uri as xs:string,
+ $entityKind as xs:string,
+ $encoding as xs:string)
+as xs:string external;
+
+(:~
+ :)
+declare %an:streamable function fetch:content-binary($uri as xs:string) as xs:b
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-996084-reuse-stream-2012-05-09T00-51-58.501Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155 -- https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:zorba. Check out http://trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Validation queue job bug-996084-reuse-stream-2012-05-09T00-51-58.501Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 -- https://code.launchpad.net/~zorba-coders/zorba/bug-996084-reuse-stream/+merge/105025 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-09T01-28-08.563Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved => Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Rejected => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:zorba. Check out http://trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/104960 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 996084] Re: crash in Streamable*Item with file module
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/996084 Title: crash in Streamable*Item with file module Status in Zorba - The XQuery Processor: Fix Committed Bug description: I was trying to 1. read a data file 2. get the md5 of the file content 3. return both the md5 and content in one XML node: .. Executing the complete example (see attachment) with any data.txt file leads to a crash. It seems that the streamreleaser in ~StreamableBase64BinaryItem() and ~StreamableStringItem() tries to delete the same ifstream. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/996084/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job feature-fetch_binary-2012-05-09T01-28-08.563Z is finished. The final status was: 13 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155 -- https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105155 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
