Zorba

Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Merged at revision: 11572
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 72 lines (+10/-7)
5 files modified
include/zorba/pregenerated/diagnostic_list.h (+1/-1)
src/diagnostics/diagnostic_en.xml (+2/-2)
src/diagnostics/pregenerated/diagnostic_list.cpp (+1/-1)
src/diagnostics/pregenerated/dict_en.cpp (+1/-1)
src/store/naive/store.cpp (+5/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+178016@code.launchpad.net

Commit message

Fixed an error message

Description of the change

Fixed an error message

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016

Stage "TestZorbaUbuntu" failed.
3 tests failed (8404 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/145/testReport/ to view the results.

lp:~zorba-coders/zorba/markos-scratch updated
11174. By Markos Zaharioudakis

fixed an error message

11175. By Markos Zaharioudakis

fixed an error message

11176. By Markos Zaharioudakis

fixed an error message

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/176/parsed_console to view the results.

lp:~zorba-coders/zorba/markos-scratch updated
11177. By Markos Zaharioudakis

fixed an error message

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-07-29 23:55:03 +0000
+++ include/zorba/pregenerated/diagnostic_list.h 2013-08-01 09:33:31 +0000
@@ -542,7 +542,7 @@
542542
543extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS;543extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS;
544544
545extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE;545extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC;
546546
547extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE;547extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE;
548548
549549
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-07-29 23:55:03 +0000
+++ src/diagnostics/diagnostic_en.xml 2013-08-01 09:33:31 +0000
@@ -2540,8 +2540,8 @@
2540 <value>"$1": document already exists in store</value>2540 <value>"$1": document already exists in store</value>
2541 </diagnostic>2541 </diagnostic>
25422542
2543 <diagnostic code="ZAPI0021" name="ITEM_TO_LOAD_IS_NOT_NODE">2543 <diagnostic code="ZAPI0021" name="ITEM_TO_LOAD_IS_NOT_XML_DOC">
2544 <value>"$1": item to load is not a node</value>2544 <value>"$1": item to add to the store is not an XML document node</value>
2545 </diagnostic>2545 </diagnostic>
25462546
2547 <diagnostic code="ZAPI0023" name="NON_ATOMIC_CONTEXT_SIZE_VALUE">2547 <diagnostic code="ZAPI0023" name="NON_ATOMIC_CONTEXT_SIZE_VALUE">
25482548
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp 2013-07-29 23:55:03 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2013-08-01 09:33:31 +0000
@@ -792,7 +792,7 @@
792ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS( "ZAPI0020" );792ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS( "ZAPI0020" );
793793
794794
795ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE( "ZAPI0021" );795ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC( "ZAPI0021" );
796796
797797
798ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE( "ZAPI0023" );798ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE( "ZAPI0023" );
799799
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-07-29 23:55:03 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-08-01 09:33:31 +0000
@@ -281,7 +281,7 @@
281 { "ZAPI0015", "\"$1\": createModule() function not found${: 2}" },281 { "ZAPI0015", "\"$1\": createModule() function not found${: 2}" },
282 { "ZAPI0019", "\"$1\": external module already registered" },282 { "ZAPI0019", "\"$1\": external module already registered" },
283 { "ZAPI0020", "\"$1\": document already exists in store" },283 { "ZAPI0020", "\"$1\": document already exists in store" },
284 { "ZAPI0021", "\"$1\": item to load is not a node" },284 { "ZAPI0021", "\"$1\": item to add to the store is not an XML document node" },
285 { "ZAPI0023", "non-atomic value can not be assigned to the context size" },285 { "ZAPI0023", "non-atomic value can not be assigned to the context size" },
286 { "ZAPI0024", "\"$1\": wrong type for context size value (must be integer)" },286 { "ZAPI0024", "\"$1\": wrong type for context size value (must be integer)" },
287 { "ZAPI0025", "non-atomic value can not be assigned to the context position" },287 { "ZAPI0025", "non-atomic value can not be assigned to the context position" },
288288
=== modified file 'src/store/naive/store.cpp'
--- src/store/naive/store.cpp 2013-07-02 21:32:23 +0000
+++ src/store/naive/store.cpp 2013-08-01 09:33:31 +0000
@@ -1047,9 +1047,12 @@
1047{1047{
1048 ZORBA_ASSERT(!uri.empty());1048 ZORBA_ASSERT(!uri.empty());
10491049
1050 if (node == NULL || !node->isNode())1050 if (node == NULL ||
1051 !node->isNode() ||
1052 node->getNodeKind() != store::StoreConsts::documentNode)
1051 {1053 {
1052 RAISE_ERROR_NO_LOC(zerr::ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE, ERROR_PARAMS(uri));1054 RAISE_ERROR_NO_LOC(zerr::ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC,
1055 ERROR_PARAMS(uri));
1053 }1056 }
10541057
1055 XmlNode_t root = reinterpret_cast<XmlNode*>(node.getp());1058 XmlNode_t root = reinterpret_cast<XmlNode*>(node.getp());

Subscribers

People subscribed via source and target branches