Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug924987 into lp:zorba

2012-03-06 Thread Markos Zaharioudakis
Till I have made some small changes to the branch. Take a look. If you approve, 
then let's merge the branch.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-06 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-06 Thread Till Westmann
Looks good.

Thanks!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-06 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-06 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug924987-2012-03-06T14-10-21.545Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-06 Thread Zorba Build Bot
Validation queue job bug924987-2012-03-06T14-10-21.545Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-06 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-03-05 Thread Zorba Build Bot
There are additional revisions which have not been approved in review. Please 
seek review and approval of these new revisions.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-03-05 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-03-05 Thread Till Westmann
Till Westmann has proposed merging lp:~zorba-coders/zorba/bug924987 into 
lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #924987 in Zorba: Failure getting type of a collection via the 
StaticCollectionManager
  https://bugs.launchpad.net/zorba/+bug/924987

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047

fixes bug 924987
- extended TypeIdentifier to also support schema-element, schema-attribute 
  and namespace-node sequence types
- fixed TypeOps::get_type_identifier
- added a test to the staticcollectionmanager unit test
- added operator for TypeIdentifier
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/identtypes.h'
--- include/zorba/identtypes.h	2011-09-21 14:49:55 +
+++ include/zorba/identtypes.h	2012-03-06 03:42:48 +
@@ -17,6 +17,7 @@
 #define ZORBA_TYPEIDENT_TYPES_API_H
 
 #include zorba/config.h
+#include iostream
 
 namespace zorba {
 class ZORBA_DLL_PUBLIC IdentTypes {
@@ -32,17 +33,30 @@
 ANY_NODE_TYPE, // node()
 ITEM_TYPE, // item()
 EMPTY_TYPE,// empty-sequence()
-INVALID_TYPE,
+SCHEMA_ELEMENT_TYPE,
+SCHEMA_ATTRIBUTE_TYPE,
+INVALID_TYPE
   } kind_t;
+  
+  static char const *const kind_string_of[];
 
   typedef enum {
 QUANT_ONE,
 QUANT_QUESTION,
 QUANT_PLUS,
-QUANT_STAR,
+QUANT_STAR
   } quantifier_t;
+  
+  static char const *const quantifier_string_of[];
 };
 }
 
+namespace std {
+
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::IdentTypes::kind_t ik);
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::IdentTypes::quantifier_t iq);
+
+}
+
 #endif
 /* vim:set et sw=2 ts=2: */

=== modified file 'include/zorba/typeident.h'
--- include/zorba/typeident.h	2011-06-14 17:26:33 +
+++ include/zorba/typeident.h	2012-03-06 03:42:48 +
@@ -20,6 +20,7 @@
 #include zorba/api_shared_types.h
 #include zorba/identtypes.h
 #include zorba/zorba_string.h
+#include iostream
 
 namespace zorba {
 
@@ -61,7 +62,7 @@
 createAttributeType(
 const String uri,
 bool uriWildcard,
-const String localNameName,
+const String localName,
 bool localNameWildcard,
 TypeIdentifier_t contentType,
 IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
@@ -108,6 +109,22 @@
 TypeIdentifier_t
 createEmptyType();
 
+static
+TypeIdentifier_t
+createSchemaElementType(
+const String uri,
+const String localName,
+IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
+);
+  
+static
+TypeIdentifier_t
+createSchemaAttributeType(
+const String uri,
+const String localName,
+IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
+);
+  
 IdentTypes::kind_t
 getKind() const;
 
@@ -129,9 +146,18 @@
 TypeIdentifier_t
 getContentType() const;
 
+std::ostream
+emit(std::ostream) const;
+
   private:
 TypeIdentifier();
 
+std::ostream
+emitItemType(std::ostream) const;
+
+std::ostream
+emitName(std::ostream) const;
+
 IdentTypes::kind_t m_kind;
 IdentTypes::quantifier_t m_quantifier;
 String m_uri;
@@ -148,5 +174,12 @@
 
 } /* namespace zorba */
 
+namespace std {
+
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::TypeIdentifier ti);
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::TypeIdentifier_t ti);
+
+}
+
 #endif /* ZORBA_TYPES_TYPEIDENT_H */
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt	2012-02-16 14:11:02 +
+++ src/api/CMakeLists.txt	2012-03-06 03:42:48 +
@@ -27,6 +27,7 @@
 zorba_string.cpp
 itemfactoryimpl.cpp
 item.cpp
+identtypesimpl.cpp
 typeidentimpl.cpp
 unmarshaller.cpp
 xmldatamanagerimpl.cpp

=== added file 'src/api/identtypesimpl.cpp'
--- src/api/identtypesimpl.cpp	1970-01-01 00:00:00 +
+++ src/api/identtypesimpl.cpp	2012-03-06 03:42:48 +
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include zorba/identtypes.h
+
+namespace zorba {
+  
+char const *const IdentTypes::kind_string_of[] = {
+  NAMED,
+  element,
+  attribute,
+  document-node,
+  processing-instruction,
+  text,
+  comment,
+  node,
+ 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug924987 into lp:zorba

2012-03-05 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Commit Message changed to:

fixes bug 924987
- extended TypeIdentifier to also support schema-element, schema-attribute
  and namespace-node sequence types
- fixed TypeOps::get_type_identifier
- added a test to the staticcollectionmanager unit test
- added operator for TypeIdentifier

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug924987-2012-03-06T03-44-04.388Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Till Westmann
All points should be fixed.


For 4. I've introduced a new parameter 'nested' that specifies, if the call to 
TypeOps::get_type_identifier is a nested call. If it is a nested call (from 
another invocation of TypeOps::get_type_identifier) the 'nested' is true and it 
is allowed to create type identifiers for non-atomic user-defined types. 
Otherwise the 'nested' is false and we assert, that the type in question is 
atomic. The default values of 'nested' is 'false', so that all existing calls 
to TypeOps::get_type_identifier will behave as required for sequence types.

Is this solution ok?

-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Zorba Build Bot
Validation queue job bug924987-2012-03-06T03-44-04.388Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1. Got: 1 Approve, 2 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-03-05 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/96047
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/bug924987 into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
1. Zorba does not support the (optional) namespace nodes and associated 
sequence types. So, the releted code should be removed.

2. Why do the createSchemaElementType and createSchemaAttributeType have a 
contentType param? This is not according to the sequence type syntax and should 
be removed.

3. Just curious: why doesn't the emit() method print out the type using the w3c 
sequence type syntax?

4. An XQType of USER_DEFINED_KIND (i.e., an instance of the UserDefinedXQType 
class) represents a sequence type only if the type is atomic. So, in 
TypeOps::get_type_identifier(), a TypeIdentifier should be created only is the 
type is atomic; otherwise an error should be thrown (or an assertion triggered).

5. To be complete, the TypeManagerImpl::create_type(const TypeIdentifier 
ident) method should also be fixed. It's up to you whether you want to do it or 
not.

-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
Review: Needs Fixing


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-02 Thread Till Westmann
1. ok

2. I see your point, but I think that I need information about the content 
type. Is there a way to get that from the public API? (I looked over the public 
static context and didn't see something obvious.)

3. Good question. Actually, the type doesn't really reflect the structure of a 
sequence type. But as it is, it is an extension of the existing on and thus 
probably compatible.

4. That's interesting. It seems that the schema types also end up there. At 
least that's how I used it. I had a as schema-element(...) declaration and 
the content type of the ELEMENT_KIND was a USER_DEFINED_KIND.

5. I'll look at that, but first we need to make sure that points 2-4 are 
clarified.


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-01 Thread Till Westmann
Till Westmann has proposed merging lp:~zorba-coders/zorba/bug924987 into 
lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #924987 in Zorba: Failure getting type of a collection via the 
StaticCollectionManager
  https://bugs.launchpad.net/zorba/+bug/924987

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144

fixes bug 924987
- extended TypeIdentifier to also support schema-element, schema-attribute 
  and namespace-node sequence types
- fixed TypeOps::get_type_identifier
- added a test to the staticcollectionmanager unit test
- added operator for TypeIdentifier
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/identtypes.h'
--- include/zorba/identtypes.h	2011-09-21 14:49:55 +
+++ include/zorba/identtypes.h	2012-02-01 18:52:21 +
@@ -17,6 +17,7 @@
 #define ZORBA_TYPEIDENT_TYPES_API_H
 
 #include zorba/config.h
+#include iostream
 
 namespace zorba {
 class ZORBA_DLL_PUBLIC IdentTypes {
@@ -32,8 +33,13 @@
 ANY_NODE_TYPE, // node()
 ITEM_TYPE, // item()
 EMPTY_TYPE,// empty-sequence()
+SCHEMA_ELEMENT_TYPE,
+SCHEMA_ATTRIBUTE_TYPE,
+NAMESPACE_TYPE,
 INVALID_TYPE,
   } kind_t;
+  
+  static char const *const kind_string_of[];
 
   typedef enum {
 QUANT_ONE,
@@ -41,8 +47,17 @@
 QUANT_PLUS,
 QUANT_STAR,
   } quantifier_t;
+  
+  static char const *const quantifier_string_of[];
 };
 }
 
+namespace std {
+
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::IdentTypes::kind_t ik);
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::IdentTypes::quantifier_t iq);
+
+}
+
 #endif
 /* vim:set et sw=2 ts=2: */

=== modified file 'include/zorba/typeident.h'
--- include/zorba/typeident.h	2011-06-14 17:26:33 +
+++ include/zorba/typeident.h	2012-02-01 18:52:21 +
@@ -20,6 +20,7 @@
 #include zorba/api_shared_types.h
 #include zorba/identtypes.h
 #include zorba/zorba_string.h
+#include iostream
 
 namespace zorba {
 
@@ -61,7 +62,7 @@
 createAttributeType(
 const String uri,
 bool uriWildcard,
-const String localNameName,
+const String localName,
 bool localNameWildcard,
 TypeIdentifier_t contentType,
 IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
@@ -108,6 +109,30 @@
 TypeIdentifier_t
 createEmptyType();
 
+static
+TypeIdentifier_t
+createSchemaElementType(
+const String uri,
+const String localName,
+TypeIdentifier_t contentType,
+IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
+);
+  
+static
+TypeIdentifier_t
+createSchemaAttributeType(
+const String uri,
+const String localName,
+TypeIdentifier_t contentType,
+IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
+);
+  
+static
+TypeIdentifier_t
+createNamespaceType(
+IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
+);
+  
 IdentTypes::kind_t
 getKind() const;
 
@@ -129,6 +154,9 @@
 TypeIdentifier_t
 getContentType() const;
 
+std::ostream
+emit(std::ostream) const;
+
   private:
 TypeIdentifier();
 
@@ -148,5 +176,12 @@
 
 } /* namespace zorba */
 
+namespace std {
+
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::TypeIdentifier ti);
+ZORBA_DLL_PUBLIC ostream operator(ostream o, const zorba::TypeIdentifier_t ti);
+
+}
+
 #endif /* ZORBA_TYPES_TYPEIDENT_H */
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt	2011-08-31 13:17:59 +
+++ src/api/CMakeLists.txt	2012-02-01 18:52:21 +
@@ -27,6 +27,7 @@
 zorba_string.cpp
 itemfactoryimpl.cpp
 item.cpp
+identtypesimpl.cpp
 typeidentimpl.cpp
 unmarshaller.cpp
 xmldatamanagerimpl.cpp

=== added file 'src/api/identtypesimpl.cpp'
--- src/api/identtypesimpl.cpp	1970-01-01 00:00:00 +
+++ src/api/identtypesimpl.cpp	2012-02-01 18:52:21 +
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include zorba/identtypes.h
+
+namespace zorba {
+  
+char const *const IdentTypes::kind_string_of[] = {
+  NAMED_TYPE,
+  ELEMENT_TYPE,
+  ATTRIBUTE_TYPE,
+  DOCUMENT_TYPE,
+  PI_TYPE,
+  TEXT_TYPE,
+  COMMENT_TYPE,
+  

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug924987 into lp:zorba

2012-02-01 Thread Till Westmann
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-01 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Commit Message changed to:

fixes bug 924987
- extended TypeIdentifier to also support schema-element, schema-attribute
  and namespace-node sequence types
- fixed TypeOps::get_type_identifier
- added a test to the staticcollectionmanager unit test
- added operator for TypeIdentifier

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-01 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-01 Thread Zorba Build Bot
Validation queue job bug924987-2012-02-01T22-33-57.831Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-01 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Approve, 2 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-01 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug924987 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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