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. */ #include <stdlib.h> #include <cx/map.h> #include <cx/hash_map.h> #include "../public/nsapi.h" #include "../util/pblock.h" #include "func.h" CxMap *function_map; void func_init() { function_map = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 256); } void add_function(FuncStruct *func) { struct FuncStruct *f = malloc(sizeof(FuncStruct)); *f = *func; char *name = strdup(func->name); for(int i=0;name[i]!='\0';i++) { if(name[i] == '_') { name[i] = '-'; } } f->name = name; log_ereport(LOG_VERBOSE, "add_function %s", f->name); cxMapPut(function_map, cx_hash_key_str(f->name), f); } void add_functions(FuncStruct *funcs) { int i = 0; while(funcs[i].func != NULL) { add_function(&funcs[i]); i++; } } FuncStruct* get_function(const char *name) { char *name_dup = strdup(name); for(int i=0;name_dup[i]!='\0';i++) { if(name_dup[i] == '_') { name_dup[i] = '-'; } } void *ret = cxMapGet(function_map, cx_hash_key_str(name_dup)); free(name_dup); return ret; } FuncStruct* func_resolve(pblock *pb, Session *sn, Request *rq) { char *name = pblock_findkeyval(pb_key_fn, pb); if(name == NULL) { // TODO: error return NULL; } FuncStruct *func = get_function(name); if(func == NULL) { // TODO: error } return func; } int func_exec(pblock *pb, Session *sn, Request *rq) { FuncStruct *func = func_resolve(pb, sn, rq); if(func == NULL) { return REQ_ABORTED; } return func->func(pb, sn, rq); } // public API struct FuncStruct func_insert(char *name, FuncPtr fn) { struct FuncStruct fc; ZERO(&fc, sizeof(FuncStruct)); fc.func = fn; fc.name = strdup(name); add_function(&fc); return *get_function(name); }