Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_zorba-query-module into lp:zorba
Review: Approve I cleaned up a few more references to "XQuery" in the doc, and a couple other doc bits. Looks good now. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 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-942161 into lp:zorba
> - Why is "normalized" in ZORBA_NORMALIZATION_FORM_FULLY_normalized in lower- > case? I have no idea. It's that way on the trunk. > - ./bin/zorba -q '"üöä"' -z "encoding=bar" "method=text" > foo > terminate called after throwing an instance of 'zorba::XQueryException' > what(): "bar": value for parameter "encoding" invalid; $valid values are: > xml, html, xhtml, text, binary, json, jsoniq > > - Why the "$" in "$valid"? Because the person who made the diagnostic_en.xml entry made a mistake > - Why is "xml" a valid encoding value It's not. The error was wrong. > - ./bin/zorba -q '"üöä"' -z "encoding=ISO-8859-1" -z "method=text" > foo > mbrantner@santacruz:~/zorba/build$ file foo > foo: UTF-8 Unicode text, with no line terminators > > Why does it not return ISO-8859-1? Because the serializer was broken even before I touched it. I don't see how it could have ever possible worked. All of the above is now fixed. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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/update3.0_zorba-query-module into lp:zorba
Review: Needs Fixing Two small issues: 1. The module version number should be changed back to 1.0, since the name has changed so it's not the same module anymore. Don't forget to update both CMakeLists.txt and the module text itself, as well as (at least) FOTS driver where it is imported. 2. Can you try remove the word "XQuery" as much as possible from the module XQDoc? eg, instead of "XQuery program", just write "query", I think. In the main header comment, you could spell out that a query is either an XQuery or a JSONiq query. Sorin: it looks like all the changes to FOTS driver are mechanical, eg. changing xqxq: to zq:. However, please review to make sure there are no surprises there. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 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-942161 into lp:zorba
Review: Needs Fixing - Why is "normalized" in ZORBA_NORMALIZATION_FORM_FULLY_normalized in lower-case? - ./bin/zorba -q '"üöä"' -z "encoding=bar" "method=text" > foo terminate called after throwing an instance of 'zorba::XQueryException' what(): "bar": value for parameter "encoding" invalid; $valid values are: xml, html, xhtml, text, binary, json, jsoniq - Why the "$" in "$valid"? - Why is "xml" a valid encoding value - ./bin/zorba -q '"üöä"' -z "encoding=ISO-8859-1" -z "method=text" > foo mbrantner@santacruz:~/zorba/build$ file foo foo: UTF-8 Unicode text, with no line terminators Why does it not return ISO-8859-1? -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/124/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161-image into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942161 into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 :
Votes: {'Approve': 1}
https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 :
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969
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-942161 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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/update3.0_zorba-query-module into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/123/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 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/update3.0_zorba-query-module into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756
:
Votes: {'Pending': 2}
--
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756
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/update3.0_zorba-query-module into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 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/update3.0_zorba-query-module into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/122/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 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/update3.0_zorba-query-module into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756
:
Votes: {'Pending': 2}
--
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756
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/update3.0_zorba-query-module into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756 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-942161 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Stage "TestZorbaUbuntu" failed. 4 tests failed (8402 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/212/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161-image into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug-942161-image into lp:zorba/image-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942161 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-942161 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161-image into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942161-image into lp:zorba/image-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-942161-image into
lp:zorba/image-module.
Commit message:
Added missing #include.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980
Added missing #include.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.
=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_function.h'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_function.h 2012-11-08 14:05:29 +
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_function.h 2013-08-13 19:10:47 +
@@ -22,6 +22,8 @@
#include
#include
#include
+#include
+
#include
namespace zorba { namespace imagemodule {
--
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-942161 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-942161 into lp:zorba has been updated. Description changed to: Reworked public Zorba_SerializerOption so it's better between C & C++. Now allow any ICU-supported encoding. https://code.launchpad.net/~zorba-coders/zorba/bug-942161-image/+merge/179980 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/250/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/249/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/248/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969 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-942161 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-942161 into
lp:zorba.
Commit message:
Reworked public Zorba_SerializerOption so it's better between C & C++.
Now allow any ICU-supported encoding.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #942161 in Zorba: "serializer to support arbitrary encodings"
https://bugs.launchpad.net/zorba/+bug/942161
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969
Reworked public Zorba_SerializerOption so it's better between C & C++.
Now allow any ICU-supported encoding.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-942161/+merge/179969
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2013-08-06 17:58:01 +
+++ bin/zorbacmd.cpp 2013-08-13 17:44:44 +
@@ -715,8 +715,8 @@
lHints.lib_module = true;
}
- Zorba_SerializerOptions lSerOptions =
- Zorba_SerializerOptions::SerializerOptionsFromStringParams(properties.getSerializerParameters());
+ Zorba_SerializerOptions lSerOptions;
+ lSerOptions.set(properties.getSerializerParameters());
createSerializerOptions(lSerOptions, properties);
@@ -1259,9 +1259,8 @@
lHost = "127.0.0.1";
}
-Zorba_SerializerOptions lSerOptions =
-Zorba_SerializerOptions::SerializerOptionsFromStringParams(
-properties.getSerializerParameters());
+Zorba_SerializerOptions lSerOptions;
+lSerOptions.set(properties.getSerializerParameters());
createSerializerOptions(lSerOptions, properties);
if (!properties.hasNoLogo())
=== modified file 'include/zorba/options.h'
--- include/zorba/options.h 2013-06-15 02:57:08 +
+++ include/zorba/options.h 2013-08-13 17:44:44 +
@@ -13,15 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#ifndef ZORBA_OPTIONS_H
#define ZORBA_OPTIONS_H
#include
#ifdef __cplusplus
+#include /* for pair */
#include
-#include
-#endif
-
+#endif /* __cplusplus */
+
+/*/
+
+#ifdef __cplusplus
+typedef bool Zorba_opt_bool_t;
+#else
+typedef char Zorba_opt_bool_t;
+#endif /* __cplusplus */
/** \brief The optimization level used for optimizing the query. */
typedef enum {
@@ -36,10 +44,6 @@
*/
} Zorba_opt_level_t;
-#if !defined(__cplusplus)
- typedef enum { false = 0, true = 1 } bool;
-#endif
-
/** \brief Set of hints that can be passed to the query compiler.
*
* An instance of this class can be passed to the compileQuery function
@@ -55,15 +59,16 @@
{
/** \brief The optimization level that is used */
Zorba_opt_level_t opt_level;
+
/** \brief Treat the query as a library module */
- bool lib_module;
+ Zorba_opt_bool_t lib_module;
/**
* \brief By default, this flag is set to false. Applications may set it to
* true if they plan to execute the query only via one of the methods that
* serialize the query result.
*/
- bool for_serialization_only;
+ Zorba_opt_bool_t for_serialization_only;
#ifdef __cplusplus
/** \brief Default constructor for CompilerHints which assigns default values to all hints (C++ only).
@@ -73,9 +78,24 @@
* - library module: false
*/
ZORBA_DLL_PUBLIC Zorba_CompilerHints();
-#endif
+#endif /* __cplusplus */
} Zorba_CompilerHints_t;
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/** \brief Helper function for C to set default values ComplilerHints struct.
+ *
+ * \retval Zorba_CompilerHints_t with default member values
+ */
+ZORBA_DLL_PUBLIC void Zorba_CompilerHints_default(Zorba_CompilerHints_t*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif /* __cplusplus */
+
+/*/
typedef enum
{
@@ -88,68 +108,61 @@
ZORBA_SERIALIZATION_METHOD_JSON_XML_HYBRID
} Zorba_serialization_method_t;
-
typedef enum
{
- ZORBA_BYTE_ORDER_MARK_YES,
- ZORBA_BYTE_ORDER_MARK_NO
+ ZORBA_BYTE_ORDER_MARK_NO,
+ ZORBA_BYTE_ORDER_MARK_YES
} Zorba_byte_order_mark_t;
-
typedef enum
{
- ZORBA_ESCAPE_URI_ATTRIBUTES_YES,
- ZORBA_ESCAPE_URI_ATTRIBUTES_NO
+ ZORBA_ESCAPE_URI_ATTRIBUTES_NO,
+ ZORBA_ESCAPE_URI_ATTRIBUTES_YES
} Zorba_escape_uri_attributes_t;
typedef enum {
- ZORBA_INCLUDE_CONTENT_TYPE_YES,
- ZORBA_INCLUDE_CONTENT_TYPE_NO
+ ZORBA_INCLUDE_CONTENT_TYPE_NO,
+ ZORBA_INCLUDE_CONTENT_TYPE_YES
} Zorba_include_content_type_t;
typedef enum {
- ZORBA_INDENT_YES,
- ZORBA_INDENT_NO
+ ZORBA_INDENT_NO,
+ ZORBA_INDENT_YES
} Zorba_indent_t;
typedef enum {
+ ZORBA_NORMALIZATION_FORM_NONE,
ZORBA_NORMALIZATION_FORM_NFC,
ZORBA_NORMALIZATION_FORM_NFD,
ZORBA_NORMALIZATION_FORM_NFKC,
ZORBA_NORMALIZATION_FORM_NFKD,
- ZORBA_NORMALIZATION_FORM_FULLY_normalized,
- ZORBA_NORMALIZATION_FORM_NO
