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

Proposed by Markos Zaharioudakis on 2013-08-01
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 on 2013-08-01
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.
review: Approve
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

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.

11174. By Markos Zaharioudakis on 2013-08-01

fixed an error message

11175. By Markos Zaharioudakis on 2013-08-01

fixed an error message

11176. By Markos Zaharioudakis on 2013-08-01

fixed an error 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

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.

11177. By Markos Zaharioudakis on 2013-08-01

fixed an error 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

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
1=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
2--- include/zorba/pregenerated/diagnostic_list.h 2013-07-29 23:55:03 +0000
3+++ include/zorba/pregenerated/diagnostic_list.h 2013-08-01 09:33:31 +0000
4@@ -542,7 +542,7 @@
5
6 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS;
7
8-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE;
9+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC;
10
11 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE;
12
13
14=== modified file 'src/diagnostics/diagnostic_en.xml'
15--- src/diagnostics/diagnostic_en.xml 2013-07-29 23:55:03 +0000
16+++ src/diagnostics/diagnostic_en.xml 2013-08-01 09:33:31 +0000
17@@ -2540,8 +2540,8 @@
18 <value>"$1": document already exists in store</value>
19 </diagnostic>
20
21- <diagnostic code="ZAPI0021" name="ITEM_TO_LOAD_IS_NOT_NODE">
22- <value>"$1": item to load is not a node</value>
23+ <diagnostic code="ZAPI0021" name="ITEM_TO_LOAD_IS_NOT_XML_DOC">
24+ <value>"$1": item to add to the store is not an XML document node</value>
25 </diagnostic>
26
27 <diagnostic code="ZAPI0023" name="NON_ATOMIC_CONTEXT_SIZE_VALUE">
28
29=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
30--- src/diagnostics/pregenerated/diagnostic_list.cpp 2013-07-29 23:55:03 +0000
31+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2013-08-01 09:33:31 +0000
32@@ -792,7 +792,7 @@
33 ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS( "ZAPI0020" );
34
35
36-ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE( "ZAPI0021" );
37+ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC( "ZAPI0021" );
38
39
40 ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE( "ZAPI0023" );
41
42=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
43--- src/diagnostics/pregenerated/dict_en.cpp 2013-07-29 23:55:03 +0000
44+++ src/diagnostics/pregenerated/dict_en.cpp 2013-08-01 09:33:31 +0000
45@@ -281,7 +281,7 @@
46 { "ZAPI0015", "\"$1\": createModule() function not found${: 2}" },
47 { "ZAPI0019", "\"$1\": external module already registered" },
48 { "ZAPI0020", "\"$1\": document already exists in store" },
49- { "ZAPI0021", "\"$1\": item to load is not a node" },
50+ { "ZAPI0021", "\"$1\": item to add to the store is not an XML document node" },
51 { "ZAPI0023", "non-atomic value can not be assigned to the context size" },
52 { "ZAPI0024", "\"$1\": wrong type for context size value (must be integer)" },
53 { "ZAPI0025", "non-atomic value can not be assigned to the context position" },
54
55=== modified file 'src/store/naive/store.cpp'
56--- src/store/naive/store.cpp 2013-07-02 21:32:23 +0000
57+++ src/store/naive/store.cpp 2013-08-01 09:33:31 +0000
58@@ -1047,9 +1047,12 @@
59 {
60 ZORBA_ASSERT(!uri.empty());
61
62- if (node == NULL || !node->isNode())
63+ if (node == NULL ||
64+ !node->isNode() ||
65+ node->getNodeKind() != store::StoreConsts::documentNode)
66 {
67- RAISE_ERROR_NO_LOC(zerr::ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE, ERROR_PARAMS(uri));
68+ RAISE_ERROR_NO_LOC(zerr::ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC,
69+ ERROR_PARAMS(uri));
70 }
71
72 XmlNode_t root = reinterpret_cast<XmlNode*>(node.getp());

Subscribers

People subscribed via source and target branches