Fri, 01 Nov 2024 12:25:52 +0100
fix pgext uses a wrong field number, if the column has the same name as a resource or property column
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef OBJCONF_H #define OBJCONF_H #include "conf.h" #include "serverconfig.h" #ifdef __cplusplus extern "C" { #endif #define CFG_LEVEL_PREPEND(list, level) \ cx_linked_list_prepend((void**)list, NULL, -1, offsetof(ConfigParserLevel, next), level) typedef struct _conf_object { ConfigLine *begin; ConfigLine *end; cxmutstr name; cxmutstr ppath; // directives ConfigDirectiveList *directives[7]; } ConfigObject; /* * representing a xml like level in the obj.conf tree */ typedef struct ConfigParserLevel ConfigParserLevel; struct ConfigParserLevel { ConfigTag *iftag; // last if tag ConfigTag *tag; // root of this level int levelnum; ConfigParserLevel *next; }; typedef struct _obj_conf { ConfigParser parser; char *file; //UcxDlist *lines; //UcxList *conditions; CxList *objects; // private parser temp var ConfigObject *obj; // add directives to this object // private parser temp var ConfigParserLevel *levels; // tree levels (stack) } ObjectConfig; // TODO: rename to ObjectConfig after old ObjectConfig is removed typedef struct ObjectConfig2 { CxMempool *mp; ConfigNode *root; } ObjectConfig2; ObjectConfig2* objectconf_load(const char *file); void objectconf_free(ObjectConfig2 *objconf); int objectconf_validate_directive(ConfigParser2 *parser, ConfigNode *node); int objectconf_validate_objbegin(ConfigParser2 *parser, ConfigNode *node); int objectconf_validate_objend(ConfigParser2 *parser, ConfigNode *node); ObjectConfig *load_object_config(char *file); void free_object_config(ObjectConfig *conf); int objconf_parse(void *p, ConfigLine *begin, ConfigLine *end, cxmutstr line); int objconf_on_begin_tag(ObjectConfig *conf, ConfigTag *tag); int objconf_on_end_tag(ObjectConfig *conf, cxmutstr tagname); int objconf_on_directive(ObjectConfig *conf, ConfigDirective *dir); #ifdef __cplusplus } #endif #endif /* OBJCONF_H */