[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-test into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-test into lp:zorba has been updated. Status: Code failed to merge = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-test/+merge/169747 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-test/+merge/169747 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/zorba-test into 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/ns-nodes into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/ns-nodes into
lp:zorba.
Commit message:
Fixed bug #1188285
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942
Fixed bug #1188285
--
https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/core/constructors.cpp'
--- src/runtime/core/constructors.cpp 2013-06-20 09:52:25 +
+++ src/runtime/core/constructors.cpp 2013-06-22 11:01:26 +
@@ -316,6 +316,7 @@
zstring baseuri;
zstring pre;
zstring ns;
+ const store::NsBindings localBindings = theLocalBindings-getLocalBindings();
ElementIteratorState* state;
DEFAULT_STACK_INIT(ElementIteratorState, state, planState);
@@ -385,7 +386,7 @@
typeName,
true,
false,
-theLocalBindings-getLocalBindings(),
+localBindings,
state-baseUri,
false);
}
@@ -443,6 +444,23 @@
break;
}
+if (childKind == store::StoreConsts::namespaceNode)
+{
+ csize numLocalBindings = localBindings.size();
+
+ for (csize i = 0; i numLocalBindings; ++i)
+ {
+const zstring pre = localBindings[i].first;
+const zstring ns = localBindings[i].second;
+
+if (pre == child-getNamespacePrefix() ns != child-getNamespaceUri())
+{
+ RAISE_ERROR(err::XQDY0102, loc,
+ ERROR_PARAMS(child-getNamespaceUri(), pre, ns));
+}
+ }
+}
+
if (child-getParent() != result.getp())
child-copy(result, copymode);
}
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2013-06-11 23:38:49 +
+++ src/store/naive/node_items.cpp 2013-06-22 11:01:26 +
@@ -3412,6 +3412,11 @@
{
if (!ns.empty())
{
+ if (prefix.empty() theName-getNamespace().empty())
+ {
+throw XQUERY_EXCEPTION(err::XQDY0102, ERROR_PARAMS(ns2, prefix, ns));
+ }
+
addLocalBinding(prefix, ns);
return;
}
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-06-20 12:00:37 +
+++ test/fots/CMakeLists.txt 2013-06-22 11:01:26 +
@@ -230,7 +230,6 @@
EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-27 1110217)
EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 1110217)
EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 1188302)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-042 1188285)
EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)
EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-007 1114221)
EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-008 1114221)
--
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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-06-22T11-07-02.352Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
Validation queue job ns-nodes-2013-06-22T11-07-02.352Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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-1158052-archive into lp:zorba/archive-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-archive into lp:zorba/archive-module. Commit message: Corresponding changes for bug #1158052. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-archive/+merge/170943 Corresponding changes for bug #1158052. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-archive/+merge/170943 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. === modified file 'src/archive_module.xq.src/archive_module.cpp' --- src/archive_module.xq.src/archive_module.cpp 2013-06-12 14:17:54 + +++ src/archive_module.xq.src/archive_module.cpp 2013-06-22 13:08:26 + @@ -1344,7 +1344,7 @@ lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s); } -aRes = theFactory-createBase64Binary(lResult[0], lResult.size()); +aRes = theFactory-createBase64Binary(reinterpret_castchar const*(lResult[0]), lResult.size(), false); return true; } @@ -1461,7 +1461,7 @@ lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s); } - aRes = theFactory-createBase64Binary(lResult[0], lResult.size()); + aRes = theFactory-createBase64Binary(reinterpret_castchar const*(lResult[0]), lResult.size(), false); } return true; @@ -1643,7 +1643,7 @@ lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s); } - aRes = theFactory-createBase64Binary(lResult[0], lResult.size()); + aRes = theFactory-createBase64Binary(reinterpret_castchar const*(lResult[0]), lResult.size(), false); } // else? if the entry represents a directory what are we // going to return?? -- 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-1158052-archive into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-archive/+merge/170943 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-geo into lp:zorba/geo-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-geo into lp:zorba/geo-module. Commit message: Corresponding changes for bug #1158052. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-geo/+merge/170945 Corresponding changes for bug #1158052. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-geo/+merge/170945 Your team Zorba Coders is subscribed to branch lp:zorba/geo-module. === modified file 'src/org/expath/ns/geo.xq.src/geo_functions.cpp' --- src/org/expath/ns/geo.xq.src/geo_functions.cpp 2012-01-11 18:21:00 + +++ src/org/expath/ns/geo.xq.src/geo_functions.cpp 2013-06-22 13:11:26 + @@ -2870,7 +2870,11 @@ binary_bin[i] = ((hex_to_bin(hex_str[i*2]) 4) | hex_to_bin(hex_str[i*2+1])); } - zorba::Item base64_item = theModule-getItemFactory()-createBase64Binary(binary_bin, binary_len); + zorba::Item base64_item( +theModule-getItemFactory()-createBase64Binary( + reinterpret_castchar const*(binary_bin), binary_len, false +) + ); delete[] binary_bin; return ItemSequence_t(new SingletonItemSequence(base64_item)); @@ -4504,4 +4508,6 @@ } -} /* namespace geomodule */ } /* namespace zorba */ +} /* namespace geomodule */ +} /* namespace zorba */ +/* vim:set et sw=2 ts=2: */ -- 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-1158052-data-formatting into lp:zorba/data-formatting-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-data-formatting/+merge/170944 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-image into lp:zorba/image-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-image into lp:zorba/image-module. Commit message: Corresponding changes for bug #1158052. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-image/+merge/170946 Corresponding changes for bug #1158052. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-image/+merge/170946 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. === modified file 'src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp' --- src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp 2011-10-06 08:18:47 + +++ src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp 2013-06-22 13:12:26 + @@ -56,7 +56,7 @@ Magick::writeImages(lImageList.begin(), lImageList.end(), lBlob, true); String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem( theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); ImageFunction::checkIfItemIsNull(lItem); return ItemSequence_t(new SingletonItemSequence(lItem)); } @@ -90,7 +90,7 @@ Magick::writeImages(lImageList.begin(), lImageList.end(), lBlob, true); String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem( theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); ImageFunction::checkIfItemIsNull(lItem); return ItemSequence_t(new SingletonItemSequence(lItem)); } === modified file 'src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp' --- src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp 2013-06-12 05:12:20 + +++ src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp 2013-06-22 13:12:26 + @@ -119,7 +119,7 @@ String lType = ImageFunction::getOneStringArg(aArgs, 1); lImage.magick(lType.c_str()); String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem( theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); ImageFunction::checkIfItemIsNull(lItem); return ItemSequence_t(new SingletonItemSequence(lItem)); @@ -150,7 +150,7 @@ lImage.magick(lType.c_str()); // Set output format String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem( theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); ImageFunction::checkIfItemIsNull(lItem); return ItemSequence_t(new SingletonItemSequence(lItem)); @@ -182,7 +182,7 @@ } lImage.quality(lQuality); // Set output format String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem( theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); ImageFunction::checkIfItemIsNull(lItem); return ItemSequence_t(new SingletonItemSequence(lItem)); @@ -209,7 +209,7 @@ lBlankImage.magick(lType.c_str()); // Set output format String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lBlankImage); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem( theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); ImageFunction::checkIfItemIsNull(lItem); return ItemSequence_t(new SingletonItemSequence(lItem)); @@ -285,5 +285,4 @@ return new zorba::imagemodule::basicmodule::BasicModule(); } - - +/* vim:set et sw=2 ts=2: */ === modified file 'src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp' --- src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp 2011-10-06 08:18:47 + +++ src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp 2013-06-22 13:12:26 + @@ -42,7 +42,7 @@ const unsigned int lNewHeight = ImageFunction::getOneUnsignedIntArg(aArgs, 2); lImage.size(Magick::Geometry(lNewWidth, lNewHeight)); String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); - Item lItem = theModule-getItemFactory()-createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); + Item lItem(
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-image into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-image/+merge/170946 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-jdbc into lp:zorba/jdbc-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-jdbc into
lp:zorba/jdbc-module.
Commit message:
Corresponding changes for bug #1158052.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-jdbc/+merge/170947
Corresponding changes for bug #1158052.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-jdbc/+merge/170947
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== modified file 'src/jdbc.xq.src/jsonitemsequence.cpp'
--- src/jdbc.xq.src/jsonitemsequence.cpp 2013-06-11 20:47:52 +
+++ src/jdbc.xq.src/jsonitemsequence.cpp 2013-06-22 13:14:25 +
@@ -109,8 +109,8 @@
CHECK_EXCEPTION
jbyteArray bytes = (jbyteArray) env-CallObjectMethod(oBlob, jBlob.getBytes, 1, length);
CHECK_EXCEPTION
-const unsigned char* byteString = reinterpret_castconst unsigned char*(env-GetByteArrayElements(bytes, 0));
-aValue = itemFactory-createBase64Binary(byteString, length);
+const char* byteString = reinterpret_castconst char*(env-GetByteArrayElements(bytes, 0));
+aValue = itemFactory-createBase64Binary(byteString, length, false);
} else {
aValue = itemFactory-createJSONNull();
}
--
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-1158052-oracle-nosql-db into lp:zorba/oracle-nosql-db-module
Paul J. Lucas has proposed merging
lp:~zorba-coders/zorba/bug-1158052-oracle-nosql-db into
lp:zorba/oracle-nosql-db-module.
Commit message:
Corresponding changes for bug #1158052.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-oracle-nosql-db/+merge/170948
Corresponding changes for bug #1158052.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-oracle-nosql-db/+merge/170948
Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module.
=== modified file 'src/nosqldb.xq.src/nosqldb.cpp'
--- src/nosqldb.xq.src/nosqldb.cpp 2013-06-12 13:59:19 +
+++ src/nosqldb.xq.src/nosqldb.cpp 2013-06-22 13:15:32 +
@@ -844,7 +844,7 @@
// assemble result { value : the value , version : 123 }
std::string ssString(buf, jbaSize);
- Item val = NoSqlDBModule::getItemFactory()-createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size());
+ Item val( NoSqlDBModule::getItemFactory()-createBase64Binary(ssString.c_str(), ssString.size(), false) );
Item vers = NoSqlDBModule::getItemFactory()-createLong(versionLong);
std::vectorstd::pairItem, Item pairs;
@@ -1427,7 +1427,7 @@
Item keyJsonObj = NoSqlDBModule::getItemFactory()-createJSONObject(keyPairs);
std::string ssString(buf, jbaSize);
- Item val = NoSqlDBModule::getItemFactory()-createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size());
+ Item val( NoSqlDBModule::getItemFactory()-createBase64Binary(ssString.c_str(), ssString.size(), false) );
Item vers = NoSqlDBModule::getItemFactory()-createLong(version);
std::vectorstd::pairItem, Item pairs;
--
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-1158052-data-formatting into lp:zorba/data-formatting-module
Paul J. Lucas has proposed merging
lp:~zorba-coders/zorba/bug-1158052-data-formatting into
lp:zorba/data-formatting-module.
Commit message:
Corresponding changes for bug #1158052.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-data-formatting/+merge/170944
Corresponding changes for bug #1158052.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-data-formatting/+merge/170944
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp'
--- src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp 2013-06-12 13:52:59 +
+++ src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp 2013-06-22 13:09:26 +
@@ -231,8 +231,8 @@
std::string lBinaryString((const char*) dataElements, dataSize);
std::stringstream lStream(lBinaryString);
-String base64S = base64::encode(lStream);
-Item lRes = theFactory-createBase64Binary(base64S.c_str(), base64S.length());
+String base64S( base64::encode(lStream) );
+Item lRes( theFactory-createBase64Binary(base64S.c_str(), base64S.length(), true) );
return ItemSequence_t(new SingletonItemSequence(lRes));
} catch (zorba::jvm::VMOpenException) {
Item lQName = theFactory-createQName(http://www.zorba-xquery.com/modules/xsl-fo;,
--
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-1158052-jdbc into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-jdbc/+merge/170947 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-oracle-nosql-db into lp:zorba/oracle-nosql-db-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-oracle-nosql-db/+merge/170948 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-read-pdf into lp:zorba/read-pdf-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-read-pdf
into lp:zorba/read-pdf-module.
Commit message:
Corresponding changes for bug #1158052.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-read-pdf/+merge/170949
Corresponding changes for bug #1158052.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-read-pdf/+merge/170949
Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module.
=== modified file 'src/read-pdf.xq.src/read-pdf.cpp'
--- src/read-pdf.xq.src/read-pdf.cpp 2013-06-12 14:01:46 +
+++ src/read-pdf.xq.src/read-pdf.cpp 2013-06-22 13:16:27 +
@@ -537,7 +537,8 @@
std::stringstream* ss = osCreator-getSS(i);
std::string ssString = ss-str();
vec.push_back(
- itemFactory-createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size()));
+itemFactory-createBase64Binary(ssString.c_str(), ssString.size(), false)
+ );
}
osCreator-close(env);
@@ -876,3 +877,5 @@
{
return new zorba::readpdf::ReadPdfModule();
}
+
+/* vim:set et sw=2 ts=2: */
--
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-1158052-read-pdf into lp:zorba/read-pdf-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-read-pdf/+merge/170949 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-security into lp:zorba/security-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-security
into lp:zorba/security-module.
Commit message:
Corresponding changes for bug #1158052.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-security/+merge/170950
Corresponding changes for bug #1158052.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-security/+merge/170950
Your team Zorba Coders is subscribed to branch lp:zorba/security-module.
=== modified file 'src/hash.xq.src/hash.h'
--- src/hash.xq.src/hash.h 2013-06-12 05:17:59 +
+++ src/hash.xq.src/hash.h 2013-06-22 13:18:25 +
@@ -132,24 +132,28 @@
lLen = lTmpDecodedBuf.size();
}
(*hash)(
- reinterpret_castconst unsigned char*(lTmp),
- lLen,
- lBuf[0]
-);
+reinterpret_castconst unsigned char*(lTmp),
+lLen,
+lBuf[0]
+ );
}
else
{
String lTmp = aMessage.getStringValue();
(*hash)(
- reinterpret_castconst unsigned char*(lTmp.data()),
- lTmp.size(),
- lBuf[0]
-);
+reinterpret_castconst unsigned char*(lTmp.data()),
+lTmp.size(),
+lBuf[0]
+ );
}
}
- return
-zorba::ItemSequence_t(new zorba::SingletonItemSequence(
- getItemFactory()-createBase64Binary(lBuf[0], DIGEST_LENGTH)));
+ return zorba::ItemSequence_t(
+new zorba::SingletonItemSequence(
+ getItemFactory()-createBase64Binary(
+reinterpret_castchar const*(lBuf[0]), DIGEST_LENGTH, false
+ )
+)
+ );
}
};
@@ -203,3 +207,4 @@
} /* namespace zorba */
#endif
+/* vim:set et sw=2 ts=2: */
=== modified file 'src/hmac.xq.src/hmac.cpp'
--- src/hmac.xq.src/hmac.cpp 2013-06-12 05:17:59 +
+++ src/hmac.xq.src/hmac.cpp 2013-06-22 13:18:25 +
@@ -164,8 +164,13 @@
HMAC_Final(ctx, out, len);
HMAC_cleanup(ctx);
- return zorba::ItemSequence_t(new zorba::SingletonItemSequence(
-theModule-getItemFactory()-createBase64Binary(out[0], len)));
+ return zorba::ItemSequence_t(
+new zorba::SingletonItemSequence(
+ theModule-getItemFactory()-createBase64Binary(
+reinterpret_castchar const*(out[0]), len, false
+ )
+)
+ );
}
zorba::ItemSequence_t
@@ -227,8 +232,13 @@
HMAC_Final(ctx, out, len);
HMAC_cleanup(ctx);
- return zorba::ItemSequence_t(new zorba::SingletonItemSequence(
-theModule-getItemFactory()-createBase64Binary(out[0], len)));
+ return zorba::ItemSequence_t(
+new zorba::SingletonItemSequence(
+ theModule-getItemFactory()-createBase64Binary(
+reinterpret_castchar const*(out[0]), len, false
+ )
+)
+ );
}
} /* namespace security */ } /* namespace zorba */
@@ -242,3 +252,5 @@
extern C DLL_EXPORT zorba::ExternalModule* createModule() {
return new zorba::security::HMACModule();
}
+
+/* vim:set et sw=2 ts=2: */
--
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-1158052-security into lp:zorba/security-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-security/+merge/170950 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-couchbase into lp:zorba/couchbase-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-couchbase
into lp:zorba/couchbase-module.
Commit message:
Corresponding changes for bug #1158052.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-couchbase/+merge/170951
Corresponding changes for bug #1158052.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-couchbase/+merge/170951
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.
=== modified file 'src/couchbase.xq.src/couchbase.cpp'
--- src/couchbase.xq.src/couchbase.cpp 2013-06-12 12:27:29 +
+++ src/couchbase.xq.src/couchbase.cpp 2013-06-22 13:19:24 +
@@ -708,7 +708,7 @@
//unsigned char lData[resp-v.v0.nbytes];
//size_t lLen = resp-v.v0.nbytes;
//memcpy(lData, resp-v.v0.bytes, lLen);
-lRes-theItem = CouchbaseModule::getItemFactory()-createBase64Binary((const unsigned char*)resp-v.v0.bytes, resp-v.v0.nbytes);
+lRes-theItem = CouchbaseModule::getItemFactory()-createBase64Binary(reinterpret_castchar const*(resp-v.v0.bytes), resp-v.v0.nbytes, false);
}
else
{
--
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-1158052-couchbase into lp:zorba/couchbase-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-couchbase/+merge/170951 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1158052-sqlite into lp:zorba/sqlite-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1158052-sqlite into lp:zorba/sqlite-module. Commit message: Corresponding changes for bug #1158052. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-sqlite/+merge/170953 Corresponding changes for bug #1158052. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1158052-sqlite/+merge/170953 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module. === modified file 'src/sqlite_module.xq.src/sqlite_module.cpp' --- src/sqlite_module.xq.src/sqlite_module.cpp 2013-06-12 05:18:43 + +++ src/sqlite_module.xq.src/sqlite_module.cpp 2013-06-22 13:23:25 + @@ -754,7 +754,7 @@ case SQLITE_BLOB: aSize = sqlite3_column_bytes(theStmt, i); aBlobPtr = (const char *)sqlite3_column_blob(theStmt, i); - aValue = theFactory-createBase64Binary(aBlobPtr, aSize); + aValue = theFactory-createBase64Binary(aBlobPtr, aSize, true); break; default: std::string str = std::string((const char *)sqlite3_column_text(theStmt, i)); -- 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
