Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/temp-csx-schema-2012-04-26T20-17-19.67Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Validation queue job temp-csx-schema-2012-04-26T20-17-19.67Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Description changed to: For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Commit Message changed to: Add zorba::Item::getTypeCode(), and make corresponding SchemaTypeCode enum part of the public API. Add zorba::ItemFactory::assignElementTypedValue() to allow construction of elements with typed values in the public API. As discussed, this API is not the prettiest, but it is the least intrusive while being the easiest for end-users to make use of. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
I've cleaned this up a bit, and IMHO it's ready to merge. Markos, I've added you as a reviewer since we discussed these changes in email a while ago (late February / early March, email subjects Zorba public API problem and SchemaTypeCode). At the time, you said that you thought the SchemaTypeCode enum should perhaps go into identtypes.h rather than store_consts.h. Do you still feel that way strongly enough that I should move it, and if so, what C++ namespace should it be in? I originally chose store_consts.h because the enum was zorba::store::SchemaTypeCode, and there were already other zorba::store::Xxx enums in store_consts.h. -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Review: Needs Information Wouldn't it be better if the new functions in the ItemFactory (e.g. assignElementTypedValue) would be members of Item? -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
IMHO, it's better on ItemFactory, although it doesn't really fit either place very well. Putting it on ItemFactory at least makes it clearer that it should be used while constructing a new tree, while you're making other ItemFactory calls. I'd be afraid that putting it on Item would make it seem like a general-purpose update method. -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/temp-csx-schema into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Chris Hillery (ceejatec)
Related bugs:
Bug #935666 in Zorba: Item types need to have their own class
https://bugs.launchpad.net/zorba/+bug/935666
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035
Ignore for now
--
https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/item.h'
--- include/zorba/item.h 2012-02-28 20:45:43 +
+++ include/zorba/item.h 2012-03-06 01:49:21 +
@@ -131,6 +131,11 @@
bool
isAtomic() const;
+ /**
+ * @return the type of this item based on the enum values in store_const.h
+ */
+ store::SchemaTypeCode getTypeCode() const;
+
/** \brief Get the type of the Item.
*
* See http://www.w3.org/TR/xpath-datamodel/#types.
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-02-28 20:45:43 +
+++ include/zorba/item_factory.h 2012-03-06 01:49:21 +
@@ -628,7 +628,6 @@
bool aHasTypedValue,
bool aHasEmptyValue,
NsBindings aNsBindings) = 0;
-
/**
* Create a new attribute node N and place it among the
* attributes of a given parent node. If no parent is given, N becomes the
@@ -698,7 +697,39 @@
virtual Item createTextNode(
Item parent,
String content) = 0;
-}; // class ItemFactory
+
+ /**
+ * @brief Assigns a simple typed value to an element node.
+ *
+ * Creates a simple typed value for an element. Note that this may only
+ * be done once per element. This method should only be used during
+ * creation of a new tree. Using this method to modify elements after
+ * processing has begun has undefined results.
+ *
+ *
+ * @param aElement The element for the typed value; may not be NULL.
+ * @param aTypedValueThe typed value for the element.
+ */
+ virtual void
+ assignElementTypedValue(Item aElement,
+ Item aTypedValue) = 0;
+ /**
+ * @brief Assigns a simple typed value to an element node.
+ *
+ * Creates a simple typed value for an element. Note that this may only
+ * be done once per element. This method should only be used during
+ * creation of a new tree. Using this method to modify elements after
+ * processing has begun has undefined results.
+ *
+ *
+ * @param aElement The element for the typed value; may not be NULL.
+ * @param aTypedValueThe typed value for the element.
+ */
+ virtual void
+ assignElementTypedValue(Item aElement,
+ std::vectorItem aTypedValue) = 0;
+
+ }; // class ItemFactory
} // namespace zorba
#endif
=== modified file 'include/zorba/store_consts.h'
--- include/zorba/store_consts.h 2011-06-14 17:26:33 +
+++ include/zorba/store_consts.h 2012-03-06 01:49:21 +
@@ -21,6 +21,71 @@
namespace zorba { namespace store {
+/***
+ !!! ATTENTION: The order of thr enum values within SchemaTypeCode is important.
+ !!! DO NOT change this order
+/
+enum SchemaTypeCode
+{
+ XS_ANY_ATOMIC= 0,
+
+ XS_STRING= 1,
+ XS_NORMALIZED_STRING = 2,
+ XS_TOKEN = 3,
+ XS_LANGUAGE = 4,
+ XS_NMTOKEN = 5,
+ XS_NAME = 6,
+ XS_NCNAME= 7,
+ XS_ID= 8,
+ XS_IDREF = 9,
+ XS_ENTITY= 10,
+
+ XS_UNTYPED_ATOMIC= 11,
+
+ XS_DATETIME = 12,
+ XS_DATE = 13,
+ XS_TIME = 14,
+ XS_DURATION = 15,
+ XS_DT_DURATION = 16,
+ XS_YM_DURATION = 17,
+
+ XS_FLOAT = 18,
+ XS_DOUBLE= 19,
+
+ XS_DECIMAL = 20,
+ XS_INTEGER = 21,
+ XS_NON_POSITIVE_INTEGER = 22,
+ XS_NEGATIVE_INTEGER = 23,
+ XS_LONG = 24,
+ XS_INT = 25,
+ XS_SHORT = 26,
+ XS_BYTE = 27,
+ XS_NON_NEGATIVE_INTEGER = 28,
+ XS_UNSIGNED_LONG = 29,
+ XS_UNSIGNED_INT = 30,
+ XS_UNSIGNED_SHORT= 31,
+ XS_UNSIGNED_BYTE = 32,
+ XS_POSITIVE_INTEGER = 33,
+
+ XS_GYEAR_MONTH = 34,
+ XS_GYEAR = 35,
+ XS_GMONTH_DAY= 36,
+ XS_GDAY = 37,
+ XS_GMONTH= 38,
+
+ XS_BOOLEAN = 39,
+
+ XS_BASE64BINARY = 40,
+ XS_HEXBINARY = 41,
+
+ XS_ANY_URI
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Commit Message changed to: ignore for now For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Review: Needs Fixing -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/temp-csx-schema-2012-03-06T01-56-13.404Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Validation queue job temp-csx-schema-2012-03-06T01-56-13.404Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Needs Fixing, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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
