Changes between Version 13 and Version 14 of FDORfc17


Ignore:
Timestamp:
Mar 25, 2008, 8:08:05 AM (16 years ago)
Author:
gregboone
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • FDORfc17

    v13 v14  
    3636{{{
    3737// Utilities
    38 #define BEGIN_NAMESPACE_OSGEO_FDO_UTILITIES namespace OSGeo { namespace FDO { namespace Utilities {
    39 #define BEGIN_NAMESPACE_OSGEO_FDO_UTILITIES }}}}
     38#define BEGIN::OSGeo::FDO::Utilities namespace OSGeo { namespace FDO { namespace Utilities {
     39#define BEGIN::OSGeo::FDO::Utilities }}}}
    4040
    4141// Expression Engine
    42 #define BEGIN_NAMESPACE_OSGEO_FDO_UTILITIES_EXPRESSIONENGINE namespace OSGeo { namespace FDO { namespace Utilities { namespace ExpressionEngine {
    43 #define END_NAMESPACE_ASGEO_FDO_UTILITIES_EXPRESSIONENGINE }}}}}
    44 
    45 // Namespaces
    46 #define NAMESPACE_OSGEO_FDO_UTILITIES OSGeo::FDO::Utilities
    47 #define NAMESPACE_OSGEO_FDO_UTILITIES_EXPRESSIONENGINE OSGeo::FDO::Utilities::ExpressionEngine
     42#define BEGIN::OSGeo::FDO::Utilities::ExpressionEngine namespace OSGeo { namespace FDO { namespace Utilities { namespace ExpressionEngine {
     43#define END::NAMESPACE::ASGEO::FDO::Utilities::ExpressionEngine }}}}}
    4844}}}
    4945
    … …  
    5248{{{
    5349
    54 public __gc class ExpressionEngine : public NAMESPACE_OSGEO_RUNTIME::Disposable
     50public __gc class ExpressionEngine : public OSGeo::Runtime::Disposable
    5551{
    5652public:
    … …  
    6763    /// Input User defined functions
    6864    ///
    69     ExpressionEngine(OSGEO_FDO_COMMANDS_FEATURE::IReader* reader,
    70                      OSGEO_FDO_SCHEMA::ClassDefinition* classDef,
    71                      OSGEO_FDO_UTILITIES_EXPRESSIONENGINE::FunctionCollection *userDefinedFunctions);
     65    ExpressionEngine(OSGeo::FDO::Commands::FEATURE::IReader* reader,
     66                     OSGeo::FDO::Schema::ClassDefinition* classDef,
     67                     OSGeo::FDO::Utilities::ExpressionEngine::FunctionCollection* userDefinedFunctions);
    7268
    7369    /// \brief
    … …  
    8985    /// Returns ExpressionEngine
    9086    ///
    91     ExpressionEngine(OSGEO_FDO_COMMANDS_FEATURE::IReader* reader,
    92                      OSGEO_FDO_SCHEMA::ClassDefinition* classDef,
    93                      OSGEO_FDO_COMMANDS::IdentifierCollection* identifiers,
    94                      OSGEO_FDO_UTILITIES_EXPRESSIONENGINE::FunctionCollection *userDefinedFunctions);
     87    ExpressionEngine(OSGeo::FDO::Commands::FEATURE::IReader* reader,
     88                     OSGeo::FDO::Schema::ClassDefinition* classDef,
     89                     OSGeo::FDO::Commands::IdentifierCollection* identifiers,
     90                     OSGeo::FDO::Utilities::ExpressionEngine::FunctionCollection* userDefinedFunctions);
    9591
    9692    /// \brief
    … …  
    10399    /// Returns a literal value. This value is valid until the next Evaluate call
    104100    ///
    105     OSGEO_FDO_EXPRESSION::LiteralValue* Evaluate(OSGEO_FDO_EXPRESSION::Expression *expression);
     101    OSGeo::FDO::Expression::LiteralValue* Evaluate(OSGeo::FDO::Expression::Expression* expression);
    106102
    107103    /// \brief
    … …  
    114110    /// Returns a literal value. This value is valid until the next Evaluate call
    115111    ///
    116     OSGEO_FDO_EXPRESSION::LiteralValue* Evaluate(System::String* name);
     112    OSGeo::FDO::Expression::LiteralValue* Evaluate(System::String* name);
    117113
    118114    /// \brief
    … …  
    125121    /// Returns a literal value. This value is valid until the next Evaluate call
    126122    ///
    127     OSGEO_FDO_EXPRESSION::LiteralValue* Evaluate(OSGEO_FDO_EXPRESSION::Identifier* expr);
    128 
     123    OSGeo::FDO::Expression::LiteralValue* Evaluate(OSGeo::FDO::Expression::Identifier* expr);
    129124
    130125    /// \brief
    … …  
    134129    /// Returns the aggragate results
    135130    ///
    136     OSGEO_FDO_COMMANDS::PropertyValueCollection* RunQuery();
     131    OSGeo::FDO::Commands::PropertyValueCollection* RunQuery();
    137132
    138133    /// \brief
    … …  
    145140    /// Returns true id passes the filter, otherwise false
    146141    ///
    147     System::Boolean ProcessFilter(OSGEO_FDO_FILTER::Filter *filter);
     142    System::Boolean ProcessFilter(OSGeo::FDO::Filter::Filter* filter);
    148143
    149144    /// \brief
    … …  
    153148    /// Returns the functions
    154149    ///
    155     OSGEO_FDO_CONNECTIONS_CAPABILITIES::FunctionDefinitionCollection *GetAllFunctions();
     150    OSGeo::FDO::Connections::Capabilities::FunctionDefinitionCollection* GetAllFunctions();
    156151
    157152    /// \brief
    … …  
    161156    /// Returns the functions
    162157    ///
    163     static OSGEO_FDO_CONNECTIONS_CAPABILITIES::FunctionDefinitionCollection *GetStandardFunctions();
     158    static OSGeo::FDO::Connections::Capabilities::FunctionDefinitionCollection* GetStandardFunctions();
    164159
    165160    /// \brief
    … …  
    181176    /// Throws an exception is filter is not valid
    182177    ///
    183     static System::Void ValidateFilter(OSGEO_FDO_SCHEMA::ClassDefinition *cls,
    184                                        OSGEO_FDO_FILTER::Filter *filter,
    185                                        OSGEO_FDO_COMMANDS::IdentifierCollection *selIds = NULL,
    186                                        OSGEO_FDO_CONNECTIONS_CAPABILITIES::IFilterCapabilities *filterCapabilities = NULL);
     178    static System::Void ValidateFilter(OSGeo::FDO::Schema::ClassDefinition *cls,
     179                                       OSGeo::FDO::Filter::Filter *filter,
     180                                       OSGeo::FDO::Commands::IdentifierCollection *selIds,
     181                                       OSGeo::FDO::Connections::Capabilities::IFilterCapabilities *filterCapabilities);
    187182
    188183    /// \brief
    … …  
    195190    /// The optimized filter
    196191    ///
    197     static OSGEO_FDO_FILTER::Filter* OptimizeFilter( OSGEO_FDO_FILTER::Filter *filter );
     192    static OSGeo::FDO::Filter::Filter* OptimizeFilter( OSGeo::FDO::Filter::Filter *filter );
    198193
    199194    /// \brief
    … …  
    209204    /// True if the function is an aggregate function otherwise false
    210205    ///
    211     static System::Boolean IsAggregateFunction(OSGEO_FDO_CONNECTIONS_CAPABILITIES::FunctionDefinitionCollection *funcDefs, System::String *name);
     206    static System::Boolean IsAggregateFunction(OSGeo::FDO::Connections::Capabilities::FunctionDefinitionCollection *funcDefs, System::String *name);
    212207
    213208    /// \brief
    … …  
    229224    /// Returns nothing
    230225    ///
    231     static System::Void GetExpressionType(OSGEO_FDO_CONNECTIONS_CAPABILITIES::FunctionDefinitionCollection *functionDefinitions,
    232                                           OSGEO_FDO_SCHEMA::ClassDefinition* originalClassDef,
    233                                           OSGEO_FDO_EXPRESSION::Expression *expr,
    234                                           OSGEO_FDO_SCHEMA::PropertyType &retPropType,
    235                                           OSGEO_FDO_SCHEMA::DataType &retDataType);
     226    static System::Void GetExpressionType(OSGeo::FDO::Connections::Capabilities::FunctionDefinitionCollection *functionDefinitions,
     227                                          OSGeo::FDO::Schema::ClassDefinition *originalClassDef,
     228                                          OSGeo::FDO::Expression::Expression *expr,
     229                                          OSGeo::FDO::Schema::PropertyType *retPropType,
     230                                          OSGeo::FDO::Schema::DataType *retDataType);
    236231
    237232    /// \brief
    … …  
    250245    /// Returns nothing
    251246    ///
    252     static System::Void GetExpressionType(OSGEO_FDO_SCHEMA::ClassDefinition* originalClassDef,
    253                                           OSGEO_FDO_EXPRESSION::Expression *expr,
    254                                           OSGEO_FDO_SCHEMA::PropertyType &retPropType,
    255                                           OSGEO_FDO_SCHEMA::DataType &retDataType);
     247    static System::Void GetExpressionType(OSGeo::FDO::Schema::ClassDefinition* originalClassDef,
     248                                          OSGeo::FDO::Expression::Expression *expr,
     249                                          OSGeo::FDO::Schema::PropertyType *retPropType,
     250                                          OSGeo::FDO::Schema::DataType *retDataType);
    256251
    257252    /// \brief
    … …  
    264259    /// Returns nothing
    265260    ///
    266     static System::Void RegisterFunctions(OSGEO_FDO_UTILITIES_EXPRESSIONENGINE::FunctionCollection *userDefinedFunctions);
    267 
     261    static System::Void RegisterFunctions(OSGeo::FDO::Utilities::ExpressionEngine::FunctionCollection *userDefinedFunctions);
    268262};
    269263
    … …  
    277271///
    278272public __gc class CopyFilter :
    279     public virtual OSGEO_FDO_EXPRESSION::IExpressionProcessor,
    280     public virtual OSGEO_FDO_FILTER::IFilterProcessor
     273    public virtual OSGeo::FDO::Expression::IExpressionProcessor,
     274    public virtual OSGeo::FDO::Filter::IFilterProcessor
    281275{
    282276public:
    … …  
    289283    /// Static methods needed for copy/constructing filter and expression objects
    290284    ///
    291     static OSGEO_FDO_FILTER::Filter* Copy( OSGEO_FDO_FILTER::Filter *filter );
    292     static OSGEO_FDO_EXPRESSION::Expression* Copy( OSGEO_FDO_EXPRESSION::Expression *expression );
    293     static OSGEO_FDO_FILTER::Filter* Copy( OSGEO_FDO_FILTER::Filter *filter, OSGEO_FDO_COMMANDS::IdentifierCollection* idList  );
    294     static OSGEO_FDO_EXPRESSION::Expression* Copy( OSGEO_FDO_EXPRESSION::Expression *expression, OSGEO_FDO_COMMANDS::IdentifierCollection* idList  );
     285    static OSGeo::FDO::Filter::Filter* Copy( OSGeo::FDO::Filter::Filter *filter );
     286    static OSGeo::FDO::Expression::Expression* Copy( OSGeo::FDO::Expression::Expression *expression );
     287    static OSGeo::FDO::Filter::Filter* Copy( OSGeo::FDO::Filter::Filter *filter, OSGeo::FDO::Commands::IdentifierCollection* idList  );
     288    static OSGeo::FDO::Expression::Expression* Copy( OSGeo::FDO::Expression::Expression *expression, OSGeo::FDO::Commands::IdentifierCollection* idList  );
    295289       
    296290    /// \brief
    297291    /// Gets the FDO Expression associated to the CopyFilter
    298292    ///
    299     OSGEO_FDO_EXPRESSION::Expression* GetExpression();
     293    OSGeo::FDO::Expression::Expression* GetExpression();
    300294
    301295    /// \brief
    302296    /// Gets the FDO Filter associated to the CopyFilter
    303297    ///
    304     OSGEO_FDO_FILTER::Filter* GetFilter();
     298    OSGeo::FDO::Filter::Filter* GetFilter();
    305299};
    306300}}}