[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Added/fixed some comments for SequenceType. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 Added/fixed some comments for SequenceType. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'include/zorba/typeident.h' --- include/zorba/typeident.h 2013-09-26 20:20:24 + +++ include/zorba/typeident.h 2013-09-27 09:23:49 + @@ -85,13 +85,18 @@ static SequenceType createItemType(Quantifier q = QUANT_ONE); /** - * \brief Create an AtomicOrUnion type with quantifier + * \brief Create a generalized atomic type (see + * http://www.w3.org/TR/xquery-30/#dt-generalized-atomic-type ) with quantifier * - * An AtomicOrUnion type is specified simply as a QName, which may identify - * an XMLSchema builtin atomic type or a user-defined atomic or union type. + * A generalized atomic type is specified simply as a QName, which may identify + * an XMLSchema builtin atomic type or a user-defined atomic or pure union type. * In the case of user-defined types, the QName must be among the in-scope * type names of a given static context. Otherwise, for builtin types, the * given sctx may be NULL. + * + * If the given QName (uri and local name pair) does not specify a generalized + * atomic type among the in-scope type names of a given static context, an + * invalid SequenceType is returned. */ static SequenceType createAtomicOrUnionType( const StaticContext_t sctx, @@ -128,12 +133,18 @@ bool nillable, Quantifier quant = QUANT_ONE); + /** + * + */ static SequenceType createSchemaElementType( const StaticContext_t sctx, const String uri, const String localName, Quantifier quant = QUANT_ONE); + /** + * + */ static SequenceType createAttributeType( const StaticContext_t sctx, const String nodeUri, @@ -142,29 +153,59 @@ const String contentTypeLocalName, Quantifier quant = QUANT_ONE); + /** + * + */ static SequenceType createSchemaAttributeType( const StaticContext_t sctx, const String uri, const String localName, Quantifier quant = QUANT_ONE); + /** + * + */ static SequenceType createPIType(Quantifier q = QUANT_ONE); + /** + * + */ static SequenceType createTextType(Quantifier q = QUANT_ONE); + /** + * + */ static SequenceType createCommentType(Quantifier q = QUANT_ONE); + /** + * + */ static SequenceType createNamespaceType(Quantifier q = QUANT_ONE); + /** + * + */ static SequenceType createJSONItemType(Quantifier q = QUANT_ONE); + /** + * + */ static SequenceType createJSONObjectType(Quantifier q = QUANT_ONE); + /** + * + */ static SequenceType createJSONArrayType(Quantifier q = QUANT_ONE); public: + /** + * Constructor for an invalid (NULL) type. + */ SequenceType(); + /** + * Copy constructor + */ SequenceType(const SequenceType other); /** @@ -173,7 +214,7 @@ ~SequenceType(); /** - * + * Returns true if this a valid (non-NULL) type; otherwise, returns false. */ bool isValid() const; @@ -188,29 +229,32 @@ Quantifier getQuantifier() const; /** - * If this is an atomic or union type, this method returns the URI of + * If this is a generalized atomic type, this method returns the URI of * the type name. For other kinds of types, an empty string is returned. */ String getTypeUri() const; /** - * If this is an atomic or union type, this method returns the local part of + * If this is a generalized atomic type, this method returns the local part of * the type name. For other kinds of types, an empty string is returned. */ String getTypeLocalName() const; /** * If this is an element() or attribute() type that contains a NodeName, - * this method returns the URI of that NodeName. In all other cases, an - * empty string is returned. + * this method returns the URI of that NodeName. If this is a schema-element(N) + * or schema-attribute(N) type, the method returns the URI of N. In all other + * cases, an empty string is returned. */ String getNodeUri() const; /** * If this is an element() or attribute() type that contains a NodeName, - * this method returns the URI of that NodeName. If this is a - * processing-instruction() that contains a TargetName, that TargetName is - * returned. In all other cases, an empty string is returned. + * this method returns the local part of that NodeName. If this is a + * schema-element(N) or schema-attribute(N) type, the method returns the + * local part of N. If this is a
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 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/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/188000 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/b1197577-macDocs into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 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/b1197577-macDocs into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/b1197577-macDocs into lp:zorba has been updated. Commit Message changed to: Add documentation on how to install Zorba and run examples in Python, PHP, Ruby and Java. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 -- https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 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/b1197577-macDocs into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/b1197577-macDocs into lp:zorba. Commit message: Add documentation on how to install Zorba and run examples in Python, PHP, Ruby and Java. Requested reviews: Cezar Andrei (cezar-andrei) Chris Hillery (ceejatec) Related bugs: Bug #1197577 in Zorba: Create Mac APIs documentation https://bugs.launchpad.net/zorba/+bug/1197577 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 Add documentation on how to install Zorba and run examples in Python, PHP, Ruby and Java. -- https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/indexpage.dox.in' --- doc/zorba/indexpage.dox.in 2013-06-19 23:05:32 + +++ doc/zorba/indexpage.dox.in 2013-09-27 19:05:38 + @@ -15,6 +15,7 @@ - \ref build \section install_section Install + - \ref install_osx_tutorial - \ref php_ubuntu_tutorial - \ref php_windows_tutorial - \ref python_windows_tutorial === added file 'doc/zorba/install_osx.dox' --- doc/zorba/install_osx.dox 1970-01-01 00:00:00 + +++ doc/zorba/install_osx.dox 2013-09-27 19:05:38 + @@ -0,0 +1,237 @@ +/** \page install_osx_tutorial Zorba - Mac OSX Installation + +\section zosx_title Guide to Zorba installation on Mac OSX + +This is a guide to install Zorba on Mac OSX, it was tested on OSX 10.8.5 Mountain Lion with Xcode 5.0 and Zorba 2.9.1. Send us email with the results you had on different versions or platforms. + +There are 3 ways to get Zorba running on your Mac: + - \ref zosx_pkg (Requires macports dependencies, recommended) + - \ref zosx_mpkg (.mpkg file contains all it's .pkg dependencies, easiest) + - \ref zosx_src (the most complete) + +\section zosx_prereq Prerequisites + + - Apple Mac OSX 10.8.5 Mountain Lion + - Apple Xcode Developer Tools version 5.0 (might work with 4.4 or later too) + - For a) and c) MacPorts 2.2.0 (see below). + +\section zosx_install_macports Install MacPorts + +Install MacPorts 2.2.0: a href=http://www.macports.org/install.php;http://www.macports.org/install.php/a . The easiest way to install MacPorts on a Mac OS X system is by downloading and running the .dmg file. + +Update MacPorts +\code +$ sudo port -v selfupdate +\endcode + +Upgrade outdated packages (this might take a while depending on the outdated packages). + +\code +$ sudo port upgrade outdated +\endcode + + +\section zosx_pkg a) Install Zorba binary from .pkg file + +The zorba-2.9.1.pkg file contains only Zorba installation files but not it's dependecies. Unlike Linux and Windows distributions, it contains both Zorba runtime with core modules and most of the external modules. It does not contain the folowing external modules: image, schema-tools, read-pdf and email, due to lack of macports of these modules dependencies. If one of these modules is required, then Zorba must be installed from source. + +Make sure you have MacPorts installed and up to date. Since .pkg contains only Zorba installation files, it's dependecies need to be installed too. + +Install dependecies: +\code +sudo port install boost curl icu libiconv libxml2 libxslt xerces3 tidy fop geos libarchive sqlite3 swig swig-python swig-php swig-java swig-ruby +\endcode + +\b Note: Use MacPorts installation of the libraries, do not modify the libraries that ships with OSX. Modifying OXS libraries usualy renders your OSX installation unusable. + +Download the zorba .pkg file (aproximately 12MB) : a href=http://launchpad.net/zorba/+download;zorba-x.pkg/a. + +Install it by running it, a MacPorts gui installer will guide you. + +after installation Zorba binary should be available in: /opt/local/bin/zorba. + +To uninstall Zorba files, use the folowing script: a href=http://my.zorba-xquery.com/tmp/zorba-2.9.1-uninstall.sh;zorba-2.9.1-uninstall.sh/a. + + + +\section zosx_mpkg b) Install Zorba binary from .mpkg file + +This is the easies way to install Zorba since it doesn't require installation of MacPorts and requires download and installation of only one file. +- The Zorba .mpkg file contains both the Zorba installation files and also all it's MacPorts dependecies. This makes the zorba-2.9.1.mpkg a 175MB file. +- Similar to .pkg file, the .mpkg file contains the Zorba runtime, core modules and most of the external modules. It does not contain the folowing external modules: image, schema-tools, read-pdf and email, due to lack of macports of these modules dependencies. If one of these modules is required, then Zorba must be installed from source. + +Download the zorba .mpkg file (aproximately 175MB) : a href=http://launchpad.net/zorba/+download;zorba-x.mpkg/a. + +Install it by running it, a MacPorts gui installer will guide you. + +Zorba binary should be available in: /opt/local/bin/zorba + +To uninstall only Zorba files, use the following script: a
