[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-19T06-06-26.347Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug923686 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 bug923686-2012-09-19T06-06-26.347Z is finished. The final status was: Undetermined, probably an error - please email chill...@lambda.nu with the number of this job! Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-19T06-33-57.964Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug923686 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 bug923686-2012-09-19T06-33-57.964Z is finished. The final status was: Undetermined, probably an error - please email chill...@lambda.nu with the number of this job! Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Stupid Launchpad problem with the email module. Trying again. -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-19T08-21-15.404Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug923686 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 bug923686-2012-09-19T08-21-15.404Z is finished. The final status was: 75 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/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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-1015964 into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1015964 into lp:zorba. Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1015964 in Zorba: Add warning re: SWIG 2.0.7 for PHP binding https://bugs.launchpad.net/zorba/+bug/1015964 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/build_prerequisites.dox' --- doc/zorba/build_prerequisites.dox 2012-09-17 00:36:37 + +++ doc/zorba/build_prerequisites.dox 2012-09-19 09:17:25 + @@ -95,6 +95,19 @@ at least Swig 1.3.40 or later (http://www.swig.org/download.html). All bindings are generated using Swig. +\note There is a known bug in many versions of Swig + (http://sourceforge.net/tracker/index.php?func=detailaid=3479190group_id=1645atid=101645) + that affects a small number of platforms, including at least + FreeBSD. If you get compilation errors that look similar to this: + +\code + build/swig/php/zorba_apiPHP5_wrap.cxx:953: error: invalid conversion from 'const char*' to 'char*' +\endcode + + then you may have run into this bug. Our experience is that Swig + version at least 2.0.7 has corrected this bug, so please try upgrading + to that version. + For a particular language binding, you need the corresponding language tools and development headers. CMake will automatically enable the language bindings for any language that is detected. -- 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-1015964 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015964 into lp:zorba has been updated. Commit Message changed to: Add note to doc regarding bug in Swig on some platforms. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-1015964 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-1015964 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015964 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-1015964 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1015964-2012-09-19T09-18-54.055Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-1015964 into lp:zorba
Validation queue job bug-1015964-2012-09-19T09-18-54.055Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-1015964 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-1015964 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015964 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015964/+merge/125137 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-pragma_no_copy into lp:zorba
Review: Needs Fixing -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
Why is the processPragma method defined only for static_collections_dml_apply_insert_nodes_last. Should it be defined for the other collection-insert functions as well? ChangeLog needs updating Tiny optimization: if you want to erase the last N entries in a vector, you can just use resize(). This applies to the code in translator.cpp:8470 -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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/hashmap into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/hashmap into
lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hashmap/+merge/125187
HashMap optimizations
--
https://code.launchpad.net/~zorba-coders/zorba/hashmap/+merge/125187
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2012-09-17 00:36:37 +
+++ src/context/static_context.h 2012-09-19 12:44:24 +
@@ -42,6 +42,7 @@
#include zorbautils/hashmap_zstring.h
#include zorbautils/hashmap_itemp.h
+#include zorbautils/checked_vector.h
#include common/shared_types.h
=== modified file 'src/store/naive/qname_pool.cpp'
--- src/store/naive/qname_pool.cpp 2012-09-17 00:36:37 +
+++ src/store/naive/qname_pool.cpp 2012-09-19 12:44:24 +
@@ -63,12 +63,12 @@
/
QNamePool::~QNamePool()
{
- csize n = theHashSet.theHashTab.size();
+ csize n = theHashSet.capacity();
for (csize i = 0; i n; ++i)
{
if (!theHashSet.theHashTab[i].isFree()
-theHashSet.theHashTab[i].theItem-isOverflow())
- delete theHashSet.theHashTab[i].theItem;
+theHashSet.theHashTab[i].key()-isOverflow())
+ delete theHashSet.theHashTab[i].key();
}
if (theCache != NULL)
@@ -297,12 +297,12 @@
bool found;
entry = theHashSet.hashInsert(qn, hval, found);
- entry-theItem = qn;
+ entry-key() = qn;
ZORBA_FATAL(!found, );
}
else
{
- qn = entry-theItem;
+ qn = entry-key();
cachePin(qn);
}
@@ -389,12 +389,12 @@
bool found;
entry = theHashSet.hashInsert(qn, hval, found);
- entry-theItem = qn;
+ entry-key() = qn;
ZORBA_FATAL(!found, );
}
else
{
- qn = entry-theItem;
+ qn = entry-key();
cachePin(qn);
}
@@ -478,7 +478,7 @@
while (entry != NULL)
{
-QNameItem* qn = entry-theItem;
+QNameItem* qn = entry-key();
if (ztd::equals(qn-getLocalName(), ln, lnlen)
ztd::equals(qn-getNamespace(), ns, nslen)
=== modified file 'src/store/naive/string_pool.cpp'
--- src/store/naive/string_pool.cpp 2012-09-17 00:36:37 +
+++ src/store/naive/string_pool.cpp 2012-09-19 12:44:24 +
@@ -28,13 +28,14 @@
StringPool::~StringPool()
{
csize count = 0;
- csize n = theHashTab.size();
+ csize n = capacity();
for (csize i = 0; i n; ++i)
{
-if (theHashTab[i].theItem.is_shared())
+if (!theHashTab[i].isFree() theHashTab[i].key().is_shared())
{
- std::cerr ID: i Referenced URI: theHashTab[i].theItem std::endl;
+ std::cerr ID: i Referenced URI:
+ theHashTab[i].key() std::endl;
//delete theHashTab[i].theString.getp();
count++;
}
@@ -57,7 +58,8 @@
bool found = false;
zstring::size_type len = strlen(str);
- ulong hval = hashfun::h32(str, len, FNV_32_INIT) % theHashTabSize;
+
+ ulong hval = hashfun::h32(str, len, FNV_32_INIT) % bucket_count();
{
SYNC_CODE(AutoMutex lock(theMutex);)
@@ -68,7 +70,7 @@
{
while (entry != NULL)
{
-if (ztd::equals(entry-theItem, str, len))
+if (ztd::equals(entry-key(), str, len))
{
found = true;
break;
@@ -79,7 +81,7 @@
if (found)
{
- outStr = entry-theItem;
+ outStr = entry-key();
return false;
}
}
@@ -97,76 +99,78 @@
/
void StringPool::garbageCollect()
{
- HashEntryzstring, DummyHashValue* entry;
+ HashEntryzstring, DummyHashValue* currEntry;
HashEntryzstring, DummyHashValue* freeList = NULL;
- zstring::size_type size = theHashTabSize;
+ csize size = bucket_count();
- for (ulong i = 0; i size; ++i)
+ for (csize i = 0; i size; ++i)
{
-entry = theHashTab[i];
+currEntry = theHashTab[i];
// If the current hash bucket is empty, move to the next one
-if (entry-isFree())
+if (currEntry-isFree())
{
- ZORBA_FATAL(entry-theNext == 0, );
+ ZORBA_FATAL(currEntry-theNext == 0, );
continue;
}
// Handle the 1st hash entry of the current hash bucket
-while (!entry-theItem.is_shared())
+while (!currEntry-key().is_shared())
{
- if (entry-theNext == 0)
+ if (currEntry-theNext == 0)
{
-entry-setFree();
-theNumEntries--;
+currEntry-setFree();
+--theNumEntries;
break;
}
else
{
-HashEntryzstring, DummyHashValue* nextEntry = entry-getNext();
-*entry = *nextEntry;
-entry-setNext(nextEntry-getNext());
+HashEntryzstring, DummyHashValue* nextEntry = currEntry-getNext();
+assert(!nextEntry-isFree());
+*currEntry = *nextEntry;
+
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/hashmap into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hashmap/+merge/125187 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/bug1052242 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 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/jsoniq_demo into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/jsoniq_demo into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq_demo/+merge/114238 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq_demo/+merge/114238 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/jsoniq_demo. -- 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-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Commit Message changed to: Removed fn:parse-xml#2 Fix for bug 950621 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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-950621 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-950621-2012-09-19T15-33-07.413Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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-950621 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-950621 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 bug-950621-2012-09-19T15-33-07.413Z is finished. The final status was: 2 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/bug-950621/+merge/123655 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-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/bug1052242 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 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/bug1052242 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1052242 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 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/bug1052242 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1052242-2012-09-19T16-02-04.637Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Merged = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/120024 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/120024 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/util-jvm-module-bug1006311 into lp:zorba/util-jvm-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/util-jvm-module-bug1006311/+merge/118647 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/bug1052242 into lp:zorba
Validation queue job bug1052242-2012-09-19T16-02-04.637Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 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/bug1052242 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1052242 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 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/zorba-2.6 into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/zorba-2.6 into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-2.6/+merge/120278 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-2.6/+merge/120278 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.6. -- 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/zorba-2.6 into lp:~zorba-coders/zorba/zorba-experimental
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-2.6/+merge/120278 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.6. -- 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/XUDY00021 into lp:zorba
Markos, can you please review? -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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-1044260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/125297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/125297 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-1044260 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1044260-2012-09-19T18-38-42.91Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/125297 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-1044260 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/125297 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-1044260 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1044260 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 bug-1044260-2012-09-19T18-38-42.91Z is finished. The final status was: 37 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/bug-1044260/+merge/125297 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-1044260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/125297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/125297 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-pragma_no_copy into lp:zorba
Why is the processPragma method defined only for static_collections_dml_apply_insert_nodes_last. Should it be defined for the other collection-insert functions as well? ChangeLog needs updating Tiny optimization: if you want to erase the last N entries in a vector, you can just use resize(). This applies to the code in translator.cpp:8470 All of the are fixed. -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-pragma_no_copy into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy 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/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-pragma_no_copy into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
I am going to approve, but it would be nice if you added an iter test to make sure that the optimization is applied and we won't loose it somehow in the future. To do so, you must first make PrinterVisitor print theNeedToCpy data member of the various ZorbaInsertNodesXXX iterators. This will probably involve messing with the runtime code generator (ouch!). Then you print the iterators plan of your no_copy_01.xq, and save it in test/rbkt/ExpCompilerResults/IterPlans/zorba/collections/no_copy_01.iter. -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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/bug923686 into lp:zorba
Rodolfo, you will need to fix all the iter tests that fail. The tests fail because the var ids assigned to variables have changed. -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332
Add java.library.path property when starting the jvm
--
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.
=== modified file 'include/JavaVMSingleton.h'
--- include/JavaVMSingleton.h 2012-05-22 09:56:29 +
+++ include/JavaVMSingleton.h 2012-09-19 20:32:20 +
@@ -1,12 +1,12 @@
/*
* Copyright 2006-2008 The FLWOR Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,12 +44,16 @@
namespace zorba { namespace jvm {
+#define NO_OF_JVM_OPTIONS 3
+
+
class VMOpenException {};
class UTIL_JVM_DLL_PUBLIC JavaVMSingleton
{
public:
- static JavaVMSingleton* getInstance(const char* classPath);
+ //static JavaVMSingleton* getInstance(const char* classPath);
+ static JavaVMSingleton* getInstance(const char* classPath, const char* javaLibPath);
static JavaVMSingleton* getInstance(const zorba::StaticContext* aStaticContext);
virtual ~JavaVMSingleton();
@@ -57,19 +61,27 @@
JNIEnv* getEnv();
protected:
- JavaVMSingleton(const char* classPath);
+ JavaVMSingleton(const char* classPath, const char* javaLibPath);
JavaVMSingleton(JavaVM *jvm, JNIEnv *env) : m_vm(jvm), m_env(env) {}
static String computeClassPath(const zorba::StaticContext* aStaticContext);
+ static String computeLibPath(const zorba::StaticContext* aStaticContext);
static JavaVMSingleton* instance;
JavaVM* m_vm;
JNIEnv* m_env;
JavaVMInitArgs args;
- JavaVMOption options[2];
+ JavaVMOption options[NO_OF_JVM_OPTIONS];
+
+ char* classPathOption;
char* awtOption;
- char* classPathOption;
+ char* jlpOption;
};
+
}} //namespace zorba, jvm
#endif // JAVA_VM_SINGLETON
+
+
+
+
=== modified file 'src/JavaVMSingleton.cpp'
--- src/JavaVMSingleton.cpp 2012-05-25 17:50:10 +
+++ src/JavaVMSingleton.cpp 2012-09-19 20:32:20 +
@@ -1,12 +1,12 @@
/*
* Copyright 2006-2008 The FLWOR Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,13 +32,13 @@
namespace zorba { namespace jvm {
JavaVMSingleton* JavaVMSingleton::instance = NULL;
-JavaVMSingleton::JavaVMSingleton(const char* classPath)
+JavaVMSingleton::JavaVMSingleton(const char* classPath, const char* javaLibPath)
{
//std::cout JavaVMSingleton::JavaVMSingleton classPath: classPath \n; std::cout.flush();
memset(args, 0, sizeof(args));
jint r;
- jint nOptions = 2;
+ jint nOptions = NO_OF_JVM_OPTIONS;
std::string classpathOption;
std::ostringstream os;
@@ -47,15 +47,28 @@
classPathOption = new char[classpathOption.size() + 1];
memset(classPathOption, 0, sizeof(char) * (classpathOption.size() + 1));
memcpy(classPathOption, classpathOption.c_str(), classpathOption.size() * sizeof(char));
+
std::string lAwtArgStr = -Djava.awt.headless=true;
awtOption = new char[lAwtArgStr.size() + 1];
memset(awtOption, 0, sizeof(char) * (lAwtArgStr.size() + 1));
memcpy(awtOption, lAwtArgStr.c_str(), sizeof(char) * lAwtArgStr.size());
awtOption[lAwtArgStr.size()] = 0;
+
+ std::string jlpStr = -Djava.library.path=/home/cezar/dev/repo/fpdf/fpdf/build/zorba_modules/zorba_util-jvm_module/src/:/home/cezar/dev/repo/fpdf/fpdf/build/LIB_PATH/com/zorba-xquery/www/modules/;
+ // javaLibPath are only base pathes, the full path will be computed at runtime in the Java class
+ std::string jlpStr = -Djava.library.path= + std::string(javaLibPath);
+ jlpOption = new char[jlpStr.size() + 1];
+ memset(jlpOption, 0, sizeof(char) * (jlpStr.size() + 1));
+ memcpy(jlpOption, jlpStr.c_str(), sizeof(char) * jlpStr.size());
+ jlpOption[jlpStr.size()] = 0;
+
options[0].optionString = classPathOption;
options[0].extraInfo = NULL;
options[1].optionString = awtOption;
options[1].extraInfo = NULL;
+ options[2].optionString = jlpOption;
+ options[2].extraInfo = NULL;
+
memset(args, 0,
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module has been updated. Commit Message changed to: Add java.library.path property when starting the jvm For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fread-pdf-utiljvm-module-2012-09-19T20-32-43.622Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-trunk into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/fread-pdf-trunk into
lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
--
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-09-17 00:36:37 +
+++ cmake_modules/ZorbaModule.cmake 2012-09-19 20:49:20 +
@@ -114,9 +114,20 @@
# relative to CMAKE_CURRENT_SOURCE_DIR)
# LINK_LIBRARIES - (optional) List of libraries to link external
# function library against
+# CONFIG_FILES - (optional) List of files to configure with package
+# information; see below
# TEST_ONLY - (optional) Module is for testcases only and should not
# be installed
#
+# CONFIG_FILES - any files specific here will be copied to
+# CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
+# the following @VARIABLES@ which will be substituted:
+# ZORBA_MODULE_RELATIVE_DIR - directory portion of mangled URI
+# ZORBA_MODULE_LIBFILE_WE - filename (without extension) portion of
+# mangled URI
+# The input files should have a .in extension. The resulting file in
+# the build directory will have the .in removed.
+#
# QQQ this currently doesn't support modules with multiple component
# .xq files. (Neither does Zorba's automatic loading mechanism, so
# this probably isn't a huge deal, but worth thinking about.)
@@ -125,7 +136,7 @@
# file enough to deduce the URI and version?
MACRO (DECLARE_ZORBA_MODULE)
# Parse and validate arguments
- PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES
+ PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES
URI;FILE;VERSION TEST_ONLY ${ARGN})
IF (NOT MODULE_FILE)
MESSAGE (FATAL_ERROR 'FILE' argument is required for ZORBA_DECLARE_MODULE())
@@ -353,6 +364,20 @@
${version_infix} 1 ${MODULE_TEST_ONLY})
ENDFOREACH (version_infix)
+ # Configure any module-specified config files.
+ SET (ZORBA_MODULE_RELATIVE_DIR ${module_path})
+ SET (ZORBA_MODULE_LIBFILE_WE ${module_filewe})
+ FOREACH (_config_file ${MODULE_CONFIG_FILES})
+# Strip off .in - can't use GET_FILENAME_COMPONENT as it always removes
+# the longest possible extension
+STRING (REGEX REPLACE \\.in$ _config_filename_we ${_config_file})
+IF (NOT IS_ABSOLUTE ${_config_file})
+ SET (_config_file ${CMAKE_CURRENT_SOURCE_DIR}/${_config_file})
+ENDIF (NOT IS_ABSOLUTE ${_config_file})
+CONFIGURE_FILE (${_config_file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_config_filename_we} @ONLY)
+ ENDFOREACH (_config_file)
+
# Last but not least, whip up a test case that ensures the module
# can at least be compiled. Don't bother for test-only modules
# (presumably they're there to be tested!).
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-09-17 00:36:37 +
+++ include/zorba/item_factory.h 2012-09-19 20:49:20 +
@@ -123,8 +123,8 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aBinData a pointer to the base6c4 binary data.
- * @param aLength the length of the base64 binary data.
+ * @param aBinData a pointer to the base64 encoded data. The data is copied from aBinData.
+ * @param aLength the length of the base64 encoded data.
* @return The Base64Binary Item.
*/
virtual Item
@@ -133,7 +133,7 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aStream A stream containing the Base64 encoded data.
+ * @param aStream A stream containing the Base64 encoded data. The data is copied from aStream imediately.
* @return the Base64Binary Item.
*/
virtual Item
@@ -142,11 +142,11 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aBinData the data in binary form. The data is copied from aBinData.
- * @param aLength the length of the data
+ * @param aBinData the data in binary form (not encoded). The data is copied from aBinData.
+ * @param aLength the length of the binary data
* @return the Base64Binary Item.
*/
- virtual Item
+ virtual Item
createBase64Binary(const unsigned char* aBinData, size_t aLength) = 0;
/** \brief Creates a streamable Base64Binary Item
@@ -735,7 +735,7 @@
* @param aNames A vector containing the name and value of
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Commit Message changed to: Make doc comments for createBaser64Binary more explicit on what parameters they expect and what they do. Change, return value to xs_int for getIntValue() method. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
Review: Needs Fixing You changed the URIs of the test modules back to www.zorba-xquery.com, instead of zorba-tests.28msec.us. That will cause test failures. Make sure you've merged from the trunk recently. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
(Other than that the changes look fine) -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Validation queue job fread-pdf-utiljvm-module-2012-09-19T20-32-43.622Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
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/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fread-pdf-utiljvm-module-2012-09-19T21-04-41.287Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-trunk into lp:zorba
You still haven't corrected the URIs of the test modules, though (test/rbkt/modules/CMakeLists.txt). -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
Review: Needs Fixing Let me add the new module. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
Validation queue job fread-pdf-utiljvm-module-2012-09-19T21-04-41.287Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-utiljvm-module into lp:zorba/util-jvm-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-utiljvm-module/+merge/125332 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/feature-pragma_no_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-pragma_no_copy into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
I am going to approve, but it would be nice if you added an iter test to make sure that the optimization is applied and we won't loose it somehow in the future. To do so, you must first make PrinterVisitor print theNeedToCpy data member of the various ZorbaInsertNodesXXX iterators. This will probably involve messing with the runtime code generator (ouch!). Then you print the iterators plan of your no_copy_01.xq, and save it in test/rbkt/ExpCompilerResults/IterPlans/zorba/collections/no_copy_01.iter. done -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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-pragma_no_copy into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-pragma_no_copy-2012-09-19T21-42-49.059Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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/fread-pdf-trunk into lp:zorba
The ref to the new module is in, please review it too: lp:zorba/read-pdf-module at https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-the-module . -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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-pragma_no_copy into lp:zorba
Validation queue job feature-pragma_no_copy-2012-09-19T21-42-49.059Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Commit Message changed to: Testing doc for new read-pdf module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-pragma_no_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-pragma_no_copy into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 -- https://code.launchpad.net/~zorba-coders/zorba/feature-pragma_no_copy/+merge/112816 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
Back to zorba-tests.28msec.us in test/rbkt/modules/CMakeLists.txt and mention in Changelog. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
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/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- 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/fread-pdf-trunk into lp:zorba
Review: Approve Great, thanks. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
Review: Needs Fixing It looks nice (without being able to testing it ;-) - The module should follow XQuery coding conventions. For example, no camel-case but function and variable names using dashes. - The read-pdf:renderToImages-internal function is not documented. This will probably cause the xqdoc test to fail. - There is a conflict in the ChangeLog. - The schema contains some commented out code = remove? - The declaration of the $options variable for the -internal functions should not allow for an optional occurrence indicator. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/1025564 into lp:zorba
Review: Needs Fixing
Works great. Some minor issues:
- the --help documentation should mention that the argument is deprecated
- also, the --help documentation should mention the syntax to pass the file
- please respect coding guidelines. For example,
if(qBeforeF()){ = if (qBeforeF())
{
- remove commented out code
--
https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256
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/fread-pdf-trunk into lp:zorba
I fixed all the comments with the exception of the optional occurrence indicator for internal functions. I tested it with empty sequence and works fine. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
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/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- 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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- 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/fread-pdf-trunk into lp:zorba
Validation queue job fread-pdf-trunk-2012-09-20T03-03-43.261Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125338 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
