[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-18 Thread Matthias Brantner
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/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-18T22-36-05.288Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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/feature-fetch_binary into lp:zorba

2012-05-18 Thread Chris Hillery
Review: Approve

Still looks good to me.
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread Zorba Build Bot
Validation queue job feature-fetch_binary-2012-05-18T22-36-05.288Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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/feature-fetch_binary into lp:zorba

2012-05-18 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1. Got: 2 Approve, 1 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread Zorba Build Bot
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/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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/feature-fetch_binary into lp:zorba

2012-05-18 Thread Till Westmann
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread Till Westmann
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/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-19T00-09-00.993Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread Zorba Build Bot
Validation queue job feature-fetch_binary-2012-05-19T00-09-00.993Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-18 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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/feature-fetch_binary into lp:zorba

2012-05-17 Thread Till Westmann
Review: Approve

Looks good - even the transcoding stuff seems to work :)

Some remarks (nothing blocking):
- It would be nice to keep fetch-binary functions together in the module.
- Is internal::StreamResource::create ever used with 3 parameters?
- fetch_impl.cpp:
  - 104 
Why is lEncodingStr initialized if it is always overwritten in line 115? 
Also, as the lEncodingStr is only accessed using c_str(), the zstring is 
probably not necessary at all.
  - 115
It seems that dynamic_castinternal::StreamResource* and the error 
handling 
could be moved into getFetchResource.
- It would be great to have at least one http-Test (but of course that adds 
  flakiness to the test run …)

-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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/feature-fetch_binary into lp:zorba

2012-05-17 Thread Matthias Brantner
 Looks good - even the transcoding stuff seems to work :)
 
 Some remarks (nothing blocking):
 - It would be nice to keep fetch-binary functions together in the module.
fixed

 - Is internal::StreamResource::create ever used with 3 parameters?
for http stuff when coming from the api

 - fetch_impl.cpp:
   - 104
 Why is lEncodingStr initialized if it is always overwritten in line 115?
 Also, as the lEncodingStr is only accessed using c_str(), the zstring is
 probably not necessary at all.
fixed

   - 115
 It seems that dynamic_castinternal::StreamResource* and the error
 handling
 could be moved into getFetchResource.
fixed

 - It would be great to have at least one http-Test (but of course that adds
   flakiness to the test run …)
not fixed for this reason
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-17 Thread Matthias Brantner
Matthias Brantner has proposed merging 
lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)
  Till Westmann (tillw)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
- extended the C++ api to be symmetric to the fetch module
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-05-16 06:45:13 +
+++ ChangeLog	2012-05-18 02:59:20 +
@@ -25,6 +25,10 @@
   * Added support for NO_ICU (to not use ICU for unicode processing)
   * Added XQJ support.
   * Added CollectionManager and DocumentManager support for XQJ.
+  * New API EntityKind SOME_CONTENT
+  * API StreamResource is able to specify whether a stream is seekable
+  * New functions in the fetch module and the StaticContext to fetch
+resources as binary
 
 Optimizations:
   * optimized insertion into a collection (don't copy it if the node was created by an element constructor

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-05-16 06:45:13 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-05-18 02:59:20 +
@@ -420,7 +420,7 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0024_XML_DOES_NOT_MATCH_SCHEMA;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_ITEM_CREATION_FAILED;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_COULD_NOT_FETCH_RESOURCE;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0026_INVALID_ENUM_VALUE;
 

=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h	2012-05-07 19:41:09 +
+++ include/zorba/static_context.h	2012-05-18 02:59:20 +
@@ -697,7 +697,8 @@
* registered, the built-in ones are used. 
*
* The default EntityKind for resources fetched by this function
-   * is SOME_CONTENT.
+   * is SOME_CONTENT. The default encoding that is used to read the
+   * resource is UTF-8.
*
* @param aURI the name of the resource to fetch
*
@@ -712,6 +713,8 @@
* in this static context. If no such mappers or resolvers have been
* registered, the built-in ones are used. 
*
+   * The default encoding that is used to read the * resource is UTF-8.
+   *
* @param aURI the name of the resource to fetch
*
* @param aEntityKind the kind of the entity to fetch (i.e.
@@ -722,12 +725,70 @@
 
   virtual Item
   fetch(const String aURI, const String aEntityKind) const = 0;
+ TREE
   /** \brief Clears the base URI and sets it to undefined state.
* (see http://www.w3.org/TR/xquery/#static_context)
*/
   virtual void
   clearBaseURI() = 0;
 
+===
+
+  /** \brief Fetches an resource refered to by the given URI.
+   *
+   * Resolution is done using the URI mappers and resolvers registered
+   * in this static context. If no such mappers or resolvers have been
+   * registered, the built-in ones are used. 
+   *
+   * @param aURI the name of the resource to fetch
+   * @param aEncoding the encoding to use when reading the resource.
+   *
+   * @param aEntityKind the kind of the entity to fetch (i.e.
+   *   SOME_CONTENT, SCHEMA, MODULE, THESAURUS, or STOP_WORDS)
+   *
+   * @return the fetched resource
+   */
+  virtual Item
+  fetch(
+  const String aURI,
+  const String aEntityKind,
+  const String aEncoding) const = 0;
+
+  /** \brief Fetches an resource refered to by the given URI
+   *   and returns it as a base64binary.
+   *
+   * Resolution is done using the URI mappers and resolvers registered
+   * in this static context. If no such mappers or resolvers have been
+   * registered, the built-in ones are used. 
+   *
+   * The default EntityKind for resources fetched by this function
+   * is SOME_CONTENT.
+   *
+   * @param aURI the name of the resource to fetch
+   *
+   * @return the fetched resource
+   */
+  virtual Item
+  fetchBinary(const String aURI) const = 0;
+
+  /** \brief Fetches an resource refered to by the given URI
+   *   and returns it as a base64binary.
+   *
+   * Resolution is done using the URI mappers and resolvers registered
+   * in this static context. If no such mappers or resolvers have been
+   * registered, the built-in ones are used. 
+   *
+   * @param aURI the name of the resource to fetch
+   *
+   * @param aEntityKind the kind of the entity to fetch (i.e.
+   *   SOME_CONTENT, SCHEMA, MODULE, THESAURUS, or STOP_WORDS)
+   *
+   * @return the fetched resource
+   */
+  virtual Item
+  fetchBinary(const String aURI, const String aEntityKind) const = 0;
+
+ MERGE-SOURCE
 };
 
 } /* namespace zorba */

=== modified file 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-17 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Commit Message changed to:

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
- extended the C++ api to be symmetric to the fetch module

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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/feature-fetch_binary into lp:zorba

2012-05-17 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-17 Thread Matthias Brantner
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/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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

2012-05-17 Thread Zorba Build Bot
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/106300
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/106300
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/feature-fetch_binary into lp:zorba

2012-05-15 Thread Chris Hillery
Review: Approve

Looks good except that the fetch module version should probably only be 2.1, 
not 3.0. I'm voting Approve now, so if you don't re-submit the proposal (and 
don't change anything else besides the version number) you should be able to 
get it merged.
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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/feature-fetch_binary into lp:zorba

2012-05-15 Thread Matthias Brantner
 Looks good except that the fetch module version should probably only be 2.1,
 not 3.0. I'm voting Approve now, so if you don't re-submit the proposal (and
 don't change anything else besides the version number) you should be able to
 get it merged.
I have changed the version 3.0 = 2.1 as suggested.
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-11 Thread Matthias Brantner
Matthias Brantner has proposed merging 
lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Till Westmann (tillw)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-05-09 01:25:37 +
+++ ChangeLog	2012-05-11 15:46:18 +
@@ -4,6 +4,8 @@
 version 2.x
 
   * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
+  * New API EntityKind SOME_CONTENT
+  * API StreamResource is able to specify whether a stream is seekable
 
 
 version 2.5

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-05-03 12:31:51 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-05-11 15:46:18 +
@@ -420,7 +420,7 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0024_XML_DOES_NOT_MATCH_SCHEMA;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_ITEM_CREATION_FAILED;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_COULD_NOT_FETCH_RESOURCE;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0026_INVALID_ENUM_VALUE;
 

=== 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-11 15:46:18 +
@@ -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;
 };
 
 /**
@@ -123,7 +127,8 @@
 THESAURUS,
 STOP_WORDS,
 COLLECTION,
-DOCUMENT
+DOCUMENT,
+SOME_CONTENT
   };
 
   /**

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-11 15:46:18 +
@@ -43,7 +43,7 @@
 DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
 DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/datetime;)
-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 3.0
   URI http://www.zorba-xquery.com/modules/fetch;)
 DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/math;)

=== 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-11 15:46:18 +
@@ -17,15 +17,13 @@
 :)
 
 (:~
- : This module provides functions to fetch the contents or the type
- : of the content for a resource identified by a URI.
- : For example, it fetches content for file or http resources if Zorba
- : allows file or http access, respectively.
- :
- : pThe errors raised by functions of this module have the namespace
- : tthttp://www.zorba-xquery.com/errors/tt (associated with prefix zerr)./p
- :
- : @see a href=www.zorba-xquery.com_errors.htmlhttp://www.zorba-xquery.com/errors/a
+ : pThis module provides functions to fetch the content of a resource identified
+ : by a URI. For example, it fetches the content of file or http resources./p
+ :
+ : pIn order to retrieve such content, the functions use the
+ : URI resolution and URL resolver process as documented at
+ : a href=../../html/uriresolvers.html
+ : URI Resolvers/a./p
  :
  : @author Matthias Brantner
  :
@@ -38,23 +36,15 @@
 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;
+declare option ver:module-version 3.0;
 
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with kind 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-11 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Commit Message changed to:

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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/feature-fetch_binary into lp:zorba

2012-05-11 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-11 Thread Matthias Brantner
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/105497
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-11 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-11T15-47-14.061Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-11 Thread Zorba Build Bot
Validation queue job feature-fetch_binary-2012-05-11T15-47-14.061Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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/feature-fetch_binary into lp:zorba

2012-05-11 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1. Got: 1 Approve, 1 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-11 Thread Zorba Build Bot
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/105497
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105497
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

2012-05-10 Thread Matthias Brantner
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/105359

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105359
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-05-03 12:31:51 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-05-10 17:24:20 +
@@ -420,7 +420,7 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0024_XML_DOES_NOT_MATCH_SCHEMA;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_ITEM_CREATION_FAILED;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_COULD_NOT_FETCH_RESOURCE;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0026_INVALID_ENUM_VALUE;
 

=== 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-10 17:24:20 +
@@ -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/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-10 17:24:20 +
@@ -43,7 +43,7 @@
 DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
 DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/datetime;)
-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.1
   URI http://www.zorba-xquery.com/modules/fetch;)
 DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/math;)

=== 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-10 17:24:20 +
@@ -17,15 +17,13 @@
 :)
 
 (:~
- : This module provides functions to fetch the contents or the type
- : of the content for a resource identified by a URI.
- : For example, it fetches content for file or http resources if Zorba
- : allows file or http access, respectively.
- :
- : pThe errors raised by functions of this module have the namespace
- : tthttp://www.zorba-xquery.com/errors/tt (associated with prefix zerr)./p
- :
- : @see a href=www.zorba-xquery.com_errors.htmlhttp://www.zorba-xquery.com/errors/a
+ : pThis module provides functions to fetch the content of a resource identified
+ : by a URI. For example, it fetches the content of file or http resources./p
+ :
+ : pIn order to retrieve such content, the functions use the
+ : URI resolution and URL resolver process as documented at
+ : a href=../../html/uriresolvers.html
+ : URI Resolvers/a./p
  :
  : @author Matthias Brantner
  :
@@ -38,23 +36,15 @@
 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;
+declare option ver:module-version 2.1;
 
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with kind ttEntityData::SOME_CONTENT/tt./p
+ : pIt queries all URI mappers and resolvers with kind
+ : ttEntityData::SOME_CONTENT/tt./p
  :
- : pThe function is annotated with the ttan:streamable/tt
- : annotation, that is it returns a streamable string. A streamable
- : string can only be consumed once. Please see section Streamable Strings
- : in the a href=../../html/options_and_annotations.html
- : documentation of Zorba's annotations/a.
- : /p
+ : pThe content is assumed to be UTF-8 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-10 Thread Matthias Brantner
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/105359
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105359
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/feature-fetch_binary into lp:zorba

2012-05-10 Thread Zorba Build Bot
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-10T17-26-13.72Z 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/105359
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

2012-05-10 Thread Zorba Build Bot
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/105359
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105359
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

2012-05-10 Thread Matthias Brantner
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/105359
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105359
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

2012-05-10 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-10T21-26-27.53Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105359
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/feature-fetch_binary into lp:zorba

2012-05-10 Thread Zorba Build Bot
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-10T21-26-27.53Z 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/105359
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

2012-05-10 Thread Zorba Build Bot
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/105359
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105359
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

2012-05-10 Thread Matthias Brantner
Matthias Brantner has proposed merging 
lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-05-03 12:31:51 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-05-11 03:03:25 +
@@ -420,7 +420,7 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0024_XML_DOES_NOT_MATCH_SCHEMA;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_ITEM_CREATION_FAILED;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_COULD_NOT_FETCH_RESOURCE;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0026_INVALID_ENUM_VALUE;
 

=== 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-11 03:03:25 +
@@ -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/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-11 03:03:25 +
@@ -43,7 +43,7 @@
 DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
 DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/datetime;)
-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 3.0
   URI http://www.zorba-xquery.com/modules/fetch;)
 DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/math;)

=== 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-11 03:03:25 +
@@ -17,15 +17,13 @@
 :)
 
 (:~
- : This module provides functions to fetch the contents or the type
- : of the content for a resource identified by a URI.
- : For example, it fetches content for file or http resources if Zorba
- : allows file or http access, respectively.
- :
- : pThe errors raised by functions of this module have the namespace
- : tthttp://www.zorba-xquery.com/errors/tt (associated with prefix zerr)./p
- :
- : @see a href=www.zorba-xquery.com_errors.htmlhttp://www.zorba-xquery.com/errors/a
+ : pThis module provides functions to fetch the content of a resource identified
+ : by a URI. For example, it fetches the content of file or http resources./p
+ :
+ : pIn order to retrieve such content, the functions use the
+ : URI resolution and URL resolver process as documented at
+ : a href=../../html/uriresolvers.html
+ : URI Resolvers/a./p
  :
  : @author Matthias Brantner
  :
@@ -38,23 +36,15 @@
 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;
+declare option ver:module-version 3.0;
 
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with kind ttEntityData::SOME_CONTENT/tt./p
+ : pIt queries all URI mappers and resolvers with kind
+ : ttEntityData::SOME_CONTENT/tt./p
  :
- : pThe function is annotated with the ttan:streamable/tt
- : annotation, that is it returns a streamable string. A streamable
- : string can only be consumed once. Please see section Streamable Strings
- : in the a href=../../html/options_and_annotations.html
- : documentation of Zorba's annotations/a.
- : /p
+ : pThe content 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-10 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Commit Message changed to:

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
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/feature-fetch_binary into lp:zorba

2012-05-10 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
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

2012-05-10 Thread Matthias Brantner
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/105430
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
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/feature-fetch_binary into lp:zorba

2012-05-10 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in src/context/static_context.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
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

2012-05-10 Thread Zorba Build Bot
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/105430
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105430
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

2012-05-09 Thread Matthias Brantner
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/105274

- 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/105274
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
=== 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 21:53:23 +
@@ -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/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-09 21:53:23 +
@@ -43,7 +43,7 @@
 DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
 DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/datetime;)
-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.1
   URI http://www.zorba-xquery.com/modules/fetch;)
 DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/math;)

=== 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 21:53:23 +
@@ -17,15 +17,13 @@
 :)
 
 (:~
- : This module provides functions to fetch the contents or the type
- : of the content for a resource identified by a URI.
- : For example, it fetches content for file or http resources if Zorba
- : allows file or http access, respectively.
- :
- : pThe errors raised by functions of this module have the namespace
- : tthttp://www.zorba-xquery.com/errors/tt (associated with prefix zerr)./p
- :
- : @see a href=www.zorba-xquery.com_errors.htmlhttp://www.zorba-xquery.com/errors/a
+ : pThis module provides functions to fetch the content of a resource identified
+ : by a URI. For example, it fetches the content of file or http resources./p
+ :
+ : pIn order to retrieve such content, the functions use the
+ : URI resolution and URL resolver process as documented at
+ : a href=../../html/uriresolvers.html
+ : URI Resolvers/a./p
  :
  : @author Matthias Brantner
  :
@@ -38,23 +36,15 @@
 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;
+declare option ver:module-version 2.1;
 
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with kind ttEntityData::SOME_CONTENT/tt./p
+ : pIt queries all URI mappers and resolvers with kind
+ : ttEntityData::SOME_CONTENT/tt./p
  :
- : pThe function is annotated with the ttan:streamable/tt
- : annotation, that is it returns a streamable string. A streamable
- : string can only be consumed once. Please see section Streamable Strings
- : in the a href=../../html/options_and_annotations.html
- : documentation of Zorba's annotations/a.
- : /p
+ : pThe content is assumed to be UTF-8 encoded./p
  :
  : @param $uri the resource to fetch.
  : @return the resource referred to by the given URI as streamble string.
@@ -73,28 +63,85 @@
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with the specified entity kind./p
- :
- : pThe function is annotated with the ttan:streamable/tt
- : annotation, 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-09 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Commit Message changed to:

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105274
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105274
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

2012-05-09 Thread Matthias Brantner
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/105275

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
=== 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 22:19:26 +
@@ -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/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-09 22:19:26 +
@@ -43,7 +43,7 @@
 DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
 DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/datetime;)
-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.1
   URI http://www.zorba-xquery.com/modules/fetch;)
 DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/math;)

=== 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 22:19:26 +
@@ -17,15 +17,13 @@
 :)
 
 (:~
- : This module provides functions to fetch the contents or the type
- : of the content for a resource identified by a URI.
- : For example, it fetches content for file or http resources if Zorba
- : allows file or http access, respectively.
- :
- : pThe errors raised by functions of this module have the namespace
- : tthttp://www.zorba-xquery.com/errors/tt (associated with prefix zerr)./p
- :
- : @see a href=www.zorba-xquery.com_errors.htmlhttp://www.zorba-xquery.com/errors/a
+ : pThis module provides functions to fetch the content of a resource identified
+ : by a URI. For example, it fetches the content of file or http resources./p
+ :
+ : pIn order to retrieve such content, the functions use the
+ : URI resolution and URL resolver process as documented at
+ : a href=../../html/uriresolvers.html
+ : URI Resolvers/a./p
  :
  : @author Matthias Brantner
  :
@@ -38,23 +36,15 @@
 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;
+declare option ver:module-version 2.1;
 
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with kind ttEntityData::SOME_CONTENT/tt./p
+ : pIt queries all URI mappers and resolvers with kind
+ : ttEntityData::SOME_CONTENT/tt./p
  :
- : pThe function is annotated with the ttan:streamable/tt
- : annotation, that is it returns a streamable string. A streamable
- : string can only be consumed once. Please see section Streamable Strings
- : in the a href=../../html/options_and_annotations.html
- : documentation of Zorba's annotations/a.
- : /p
+ : pThe content is assumed to be UTF-8 encoded./p
  :
  : @param $uri the resource to fetch.
  : @return the resource referred to by the given URI as streamble string.
@@ -73,28 +63,85 @@
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with the specified entity kind./p
- :
- : pThe function is annotated with 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-09 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Commit Message changed to:

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- fixed two warnings in nodes_impl.cpp

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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

2012-05-09 Thread Matthias Brantner
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/105275
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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/feature-fetch_binary into lp:zorba

2012-05-09 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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

2012-05-09 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-09T23-08-15.802Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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/feature-fetch_binary into lp:zorba

2012-05-09 Thread Zorba Build Bot
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-09T23-08-15.802Z 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/105275
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

2012-05-09 Thread Zorba Build Bot
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/105275
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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

2012-05-09 Thread Matthias Brantner
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/105275
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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

2012-05-09 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-10T00-17-13.996Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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/feature-fetch_binary into lp:zorba

2012-05-09 Thread Zorba Build Bot
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-10T00-17-13.996Z 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/105275
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

2012-05-09 Thread Zorba Build Bot
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/105275
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105275
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

2012-05-09 Thread Matthias Brantner
Matthias Brantner has proposed merging 
lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Till Westmann (tillw)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- improved error messages
- fixed some warnings
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-05-03 12:31:51 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-05-10 02:25:28 +
@@ -420,7 +420,7 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0024_XML_DOES_NOT_MATCH_SCHEMA;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_ITEM_CREATION_FAILED;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0025_COULD_NOT_FETCH_RESOURCE;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0026_INVALID_ENUM_VALUE;
 

=== 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-10 02:25:28 +
@@ -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/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-03 12:31:51 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-05-10 02:25:28 +
@@ -43,7 +43,7 @@
 DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
 DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/datetime;)
-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.1
   URI http://www.zorba-xquery.com/modules/fetch;)
 DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/math;)

=== 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-10 02:25:28 +
@@ -17,15 +17,13 @@
 :)
 
 (:~
- : This module provides functions to fetch the contents or the type
- : of the content for a resource identified by a URI.
- : For example, it fetches content for file or http resources if Zorba
- : allows file or http access, respectively.
- :
- : pThe errors raised by functions of this module have the namespace
- : tthttp://www.zorba-xquery.com/errors/tt (associated with prefix zerr)./p
- :
- : @see a href=www.zorba-xquery.com_errors.htmlhttp://www.zorba-xquery.com/errors/a
+ : pThis module provides functions to fetch the content of a resource identified
+ : by a URI. For example, it fetches the content of file or http resources./p
+ :
+ : pIn order to retrieve such content, the functions use the
+ : URI resolution and URL resolver process as documented at
+ : a href=../../html/uriresolvers.html
+ : URI Resolvers/a./p
  :
  : @author Matthias Brantner
  :
@@ -38,23 +36,15 @@
 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;
+declare option ver:module-version 2.1;
 
 (:~
  : pTries to fetch the resource referred to by the given URI./p
  :
- : pIn order to retrieve the content, the functions uses the
- : URI resolution and URL resolver process as documented at
- : a href=../../html/uriresolvers.html
- : URI Resolvers/a. Therefore, it queries all URI mappers
- : and resolvers with kind ttEntityData::SOME_CONTENT/tt./p
+ : pIt queries all URI mappers and resolvers with kind
+ : ttEntityData::SOME_CONTENT/tt./p
  :
- : pThe function is annotated with the ttan:streamable/tt
- : annotation, that is it returns a streamable string. A streamable
- : string can only be consumed once. Please see section Streamable Strings
- : in the a href=../../html/options_and_annotations.html
- : documentation of Zorba's annotations/a.
- : /p
+ : pThe 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-09 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba 
has been updated.

Commit Message changed to:

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned 
by fetch are seekable.
- improved error messages
- fixed some warnings

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
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

2012-05-09 Thread Matthias Brantner
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/105290
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
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/feature-fetch_binary into lp:zorba

2012-05-09 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
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

2012-05-09 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/feature-fetch_binary-2012-05-10T02-26-20.751Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
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/feature-fetch_binary into lp:zorba

2012-05-09 Thread Zorba Build Bot
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-10T02-26-20.751Z 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/105290
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

2012-05-09 Thread Zorba Build Bot
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/105290
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fetch_binary/+merge/105290
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

2012-05-08 Thread Matthias Brantner
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 a href=../../html/uriresolvers.htmlURI Resolvers/a.
  : @see a href=../../html/options_and_annotations.htmlDocumentation of Zorba's annotations/a.
  :)
-
-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;
+
+(:~
+ :)

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-08 Thread Matthias Brantner
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


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-08 Thread Zorba Build Bot
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


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-fetch_binary into lp:zorba

2012-05-08 Thread Zorba Build Bot
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