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

[Markos Zaharioudakis]

Fixed an error message

Fixed an error message

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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)]

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]

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)]

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)]

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]

11177. By Markos Zaharioudakis on 2013-08-01

fixed an error message

[Zorba Build Bot (zorba-buildbot)]

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)]

Validation queue succeeded - proposal merged!

=== 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 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE;
 

=== 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 @@
       <value>"$1": document already exists in store</value>
     </diagnostic>
 
-    <diagnostic code="ZAPI0021" name="ITEM_TO_LOAD_IS_NOT_NODE">
-      <value>"$1": item to load is not a node</value>
+    <diagnostic code="ZAPI0021" name="ITEM_TO_LOAD_IS_NOT_XML_DOC">
+      <value>"$1": item to add to the store is not an XML document node</value>
     </diagnostic>
 
     <diagnostic code="ZAPI0023" name="NON_ATOMIC_CONTEXT_SIZE_VALUE">

=== 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 @@
 ZorbaErrorCode ZAPI0020_DOCUMENT_ALREADY_EXISTS( "ZAPI0020" );
 
 
-ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE( "ZAPI0021" );
+ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC( "ZAPI0021" );
 
 
 ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE( "ZAPI0023" );

=== 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 @@
   { "ZAPI0015", "\"$1\": createModule() function not found${: 2}" },
   { "ZAPI0019", "\"$1\": external module already registered" },
   { "ZAPI0020", "\"$1\": document already exists in store" },
-  { "ZAPI0021", "\"$1\": item to load is not a node" },
+  { "ZAPI0021", "\"$1\": item to add to the store is not an XML document node" },
   { "ZAPI0023", "non-atomic value can not be assigned to the context size" },
   { "ZAPI0024", "\"$1\": wrong type for context size value (must be integer)" },
   { "ZAPI0025", "non-atomic value can not be assigned to the context position" },

=== 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 @@
 {
   ZORBA_ASSERT(!uri.empty());
 
-  if (node == NULL || !node->isNode())
+  if (node == NULL ||
+      !node->isNode() ||
+      node->getNodeKind() != store::StoreConsts::documentNode)
   {
-    RAISE_ERROR_NO_LOC(zerr::ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE, ERROR_PARAMS(uri));
+    RAISE_ERROR_NO_LOC(zerr::ZAPI0021_ITEM_TO_LOAD_IS_NOT_XML_DOC,
+    ERROR_PARAMS(uri));
   }
 
   XmlNode_t root = reinterpret_cast<XmlNode*>(node.getp());