[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-02T16-42-06.758Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
Validation queue job bug-fixing-2011-12-02T16-42-06.758Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
Review: Approve Works great. -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
Review: Approve I have approved the changed. A good alternative in my opinion would have been to make seekg() throw an error or to transform it into a no-op. -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Chris Hillery (ceejatec) Related bugs: Bug #898208 in Zorba: building xqdoc on cmake 2.8 https://bugs.launchpad.net/zorba/+bug/898208 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 fix for building modules outside of Zorba -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'cmake_modules/ZorbaModule.cmake' --- cmake_modules/ZorbaModule.cmake 2011-11-11 10:37:11 + +++ cmake_modules/ZorbaModule.cmake 2011-11-30 15:55:36 + @@ -676,10 +676,6 @@ # ZORBA_XHTML_REQUISITES_PATH - points to the dir containing the html requisites (images, lib, styles, templates dirs) # Zorba_EXE - points to zorba.exe (or zorba.bat) MACRO (ADD_XQDOC_TARGETS) - IF(NOT ZORBA_WITH_FILE_ACCESS) - MESSAGE(WARNING Can not build XQDoc documentation because 'File' module is not present) - ENDIF() - MESSAGE(STATUS ADD_XQDOC_TARGETS) SET(ZORBA_XQDOC_XML_XQ -- 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-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 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-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-30T15-54-16.325Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 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-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 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-fixing into lp:zorba
Validation queue job bug-fixing-2011-11-30T15-54-16.325Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: fix for bug #898064 (error when text-serializing a non-seekable streamable string) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 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-fixing into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83991 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-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-fixing into
lp:zorba.
Requested reviews:
Nicolae Brinza (nbrinza)
William Candillon (wcandillon)
Related bugs:
Bug #898064 in Zorba: Stringstream error
https://bugs.launchpad.net/zorba/+bug/898064
Bug #898208 in Zorba: building xqdoc on cmake 2.8
https://bugs.launchpad.net/zorba/+bug/898208
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992
fix for bug #898064
--
https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp 2011-11-11 07:44:01 +
+++ src/api/serialization/serializer.cpp 2011-11-30 18:40:31 +
@@ -1682,14 +1682,18 @@
std::streambuf * pbuf;
std::streamsize read_bytes;
std::istream is = item-getStream();
-
- // prepare the stream
+ std::streampos pos;
std::ios::iostate const old_exceptions = is.exceptions();
- is.exceptions( std::ios::badbit | std::ios::failbit );
- std::streampos const pos = is.tellg();
- if (pos)
-is.seekg(0, std::ios::beg);
- is.exceptions(is.exceptions() ~std::ios::failbit);
+
+ if (item-isSeekable())
+ {
+// prepare the stream
+is.exceptions( std::ios::badbit | std::ios::failbit );
+pos = is.tellg();
+if (pos)
+ is.seekg(0, std::ios::beg);
+is.exceptions(is.exceptions() ~std::ios::failbit);
+ }
// read bytes and do string expansion
do
@@ -1703,12 +1707,15 @@
// restore stream's state
is.clear(); // clear eofbit
- if (pos)
+ if (item-isSeekable())
{
-is.exceptions(is.exceptions() | std::ios::failbit);
-is.seekg(pos, std::ios::beg);
+if (pos != 0 pos != -1)
+{
+ is.exceptions(is.exceptions() | std::ios::failbit);
+ is.seekg(pos, std::ios::beg);
+}
+is.exceptions(old_exceptions);
}
- is.exceptions(old_exceptions);
}
=== modified file 'src/store/api/item.h'
--- src/store/api/item.h 2011-10-15 10:41:19 +
+++ src/store/api/item.h 2011-11-30 18:40:31 +
@@ -807,6 +807,14 @@
virtual bool isStreamable() const;
/**
+ * Checks whether the item's content is streamable
+ * and the underlying stream is seekable
+ *
+ * @return true only if it is.
+ */
+ virtual bool isSeekable() const;
+
+ /**
* Gets an istream for the item's content.
*
* @return the stream.
=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp 2011-10-15 10:41:19 +
+++ src/store/naive/item.cpp 2011-11-30 18:40:31 +
@@ -1291,6 +1291,11 @@
return false;
}
+bool Item::isSeekable() const
+{
+ return false;
+}
+
std::istream Item::getStream()
{
throw ZORBA_EXCEPTION(
--
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-fixing into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: fix for bug #898064 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 -- https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83992 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
