libidav/davqlexec.c

Sun, 02 Jul 2017 21:35:01 +0200

author
Mike Becker <universe@uap-core.de>
date
Sun, 02 Jul 2017 21:35:01 +0200
changeset 263
f24b730cb75e
parent 249
50fb9c9f6671
child 289
0f83fe5e2b07
permissions
-rw-r--r--

token parser checks if token of class DAVQL_TOKEN_NUMBER consists of digits only

104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
185
cd42cccee550 updated copyright notice
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 157
diff changeset
4 * Copyright 2016 Olaf Wintermann. All rights reserved.
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31 #include <string.h>
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
32 #include <inttypes.h>
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34 #include <ucx/utils.h>
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
35 #include <ucx/map.h>
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include "davqlexec.h"
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
37 #include "utils.h"
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
38 #include "methods.h"
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
39 #include "session.h"
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
40 #include "resource.h"
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
42 DavResult dav_statement_exec(DavSession *sn, DavQLStatement *st, ...) {
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43 va_list ap;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44 va_start(ap, st);
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
45 DavResult result = dav_statement_execv(sn, st, ap);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46 va_end(ap);
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 return result;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
48 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
50 DavResult dav_statement_execv(DavSession *sn, DavQLStatement *st, va_list ap) {
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
51 DavResult result;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
52 result.result = NULL;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
53 result.status = 1;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
55 // make sure the statement was successfully parsed
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56 if(st->type == DAVQL_ERROR) {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
57 DavResult result;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
58 return result;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
59 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60
127
7072a2b4ae35 renamed GET to SELECT in davql syntax
Mike Becker <universe@uap-core.de>
parents: 126
diff changeset
61 if(st->type == DAVQL_SELECT) {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
62 return dav_exec_select(sn, st, ap);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63 } else {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
64 // TODO
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
65 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
66
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
67 return result;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
68 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
69
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
70 sstr_t dav_format_string(UcxAllocator *a, sstr_t fstr, va_list ap, davqlerror_t *error) {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
71 UcxBuffer *buf = ucx_buffer_new(NULL, 128, UCX_BUFFER_AUTOEXTEND);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
72
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
73 int placeholder = 0;
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
74 for(int i=0;i<fstr.length;i++) {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
75 char c = fstr.ptr[i];
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
76 if(placeholder) {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
77 if(c == '%') {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
78 // no placeholder, %% transposes to %
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
79 ucx_buffer_putc(buf, c);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
80 } else {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
81 // detect placeholder type and insert arg
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
82 int err = 0;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
83 switch(c) {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
84 case 's': {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
85 char *arg = va_arg(ap, char*);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
86 ucx_buffer_puts(buf, arg);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
87 break;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
88 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
89 case 'd': {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
90 int arg = va_arg(ap, int);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
91 ucx_bprintf(buf, "%d", arg);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
92 break;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
93 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
94 case 'u': {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
95 unsigned int arg = va_arg(ap, unsigned int);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
96 ucx_bprintf(buf, "%u", arg);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
97 break;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
98 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
99 case 't': {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
100 // time arguments not supported for strings
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
101 err = 1;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
102 break;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
103 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
104 default: {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
105 *error = DAVQL_UNKNOWN_FORMATCHAR;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
106 err = 1;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
107 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
108 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
109 if(err) {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
110 ucx_buffer_free(buf);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
111 sstr_t n;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
112 n.ptr = NULL;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
113 n.length = 0;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
114 return n;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
115 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
116 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
117 placeholder = 0;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
118 } else {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
119 if(c == '%') {
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
120 placeholder = 1;
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
121 } else {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
122 ucx_buffer_putc(buf, c);
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
123 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
124 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
125 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
126 *error = DAVQL_OK;
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
127
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
128 sstr_t ret = sstrdup_a(a, sstrn(buf->space, buf->size));
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
129 ucx_buffer_free(buf);
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
130 return ret;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
131 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
132
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
133 static int fl_add_properties(DavSession *sn, UcxMempool *mp, UcxMap *map, DavQLExpression *expression) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
134 if(!expression) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
135 return 0;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
136 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
137
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
138 if(expression->type == DAVQL_IDENTIFIER) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
139 DavProperty *property = ucx_mempool_malloc(mp, sizeof(DavProperty));
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
140
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
141 char *name;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
142 DavNamespace *ns = dav_get_property_namespace(
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
143 sn->context,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
144 sstrdup_a(mp->allocator, expression->srctext).ptr,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
145 &name);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
146 if(!ns) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
147 return -1;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
148 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
149
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
150 property->ns = ns;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
151 property->name = name;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
152 property->value = NULL;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
153
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
154 ucx_map_sstr_put(map, expression->srctext, property);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
155 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
156
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
157 if(expression->left) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
158 if(fl_add_properties(sn, mp, map, expression->left)) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
159 return -1;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
160 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
161 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
162 if(expression->right) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
163 if(fl_add_properties(sn, mp, map, expression->right)) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
164 return -1;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
165 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
166 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
167
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
168 return 0;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
169 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
170
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
171 static UcxBuffer* fieldlist2propfindrequest(DavSession *sn, UcxMempool *mp, UcxList *fields, int *isallprop) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
172 UcxMap *properties = ucx_map_new(32);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
173 *isallprop = 0;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
174
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
175 UCX_FOREACH(elm, fields) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
176 DavQLField *field = elm->data;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
177 if(!sstrcmp(field->name, S("*"))) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
178 ucx_map_free(properties);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
179 *isallprop = 1;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
180 return create_allprop_propfind_request();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
181 } else if(!sstrcmp(field->name, S("-"))) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
182 ucx_map_free(properties);
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
183 return create_propfind_request(sn, NULL);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
184 } else {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
185 if(fl_add_properties(sn, mp, properties, field->expr)) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
186 // TODO: set error
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
187 ucx_map_free(properties);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
188 return NULL;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
189 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
190 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
191 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
192
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
193 UcxMapIterator i = ucx_map_iterator(properties);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
194 UcxKey key;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
195 DavProperty *value;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
196 UcxList *list = NULL;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
197 UCX_MAP_FOREACH(key, value, i) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
198 list = ucx_list_append(list, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
199 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
200
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
201 UcxBuffer *reqbuf = create_propfind_request(sn, list);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
202 ucx_list_free(list);
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
203 ucx_map_free(properties);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
204 return reqbuf;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
205 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
206
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
207 static int reset_properties(DavSession *sn, DavResult *result, DavResource *res, UcxList *fields) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
208 UcxMap *new_properties = ucx_map_new_a(sn->mp->allocator, 32);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
209 DavResourceData *data = (DavResourceData*)res->data;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
210
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
211 // add basic properties
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
212 char *value;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
213
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
214 UcxKey cl_key = dav_property_key("DAV:", "getcontentlength");
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
215 value = ucx_map_get(data->properties, cl_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
216 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
217 ucx_map_put(new_properties, cl_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
218 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
219
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
220 UcxKey cd_key = dav_property_key("DAV:", "creationdate");
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
221 value = ucx_map_get(data->properties, cd_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
222 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
223 ucx_map_put(new_properties, cd_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
224 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
225
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
226 UcxKey lm_key = dav_property_key("DAV:", "getlastmodified");
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
227 value = ucx_map_get(data->properties, lm_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
228 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
229 ucx_map_put(new_properties, lm_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
230 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
231
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
232 UcxKey ct_key = dav_property_key("DAV:", "getcontenttype");
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
233 value = ucx_map_get(data->properties, ct_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
234 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
235 ucx_map_put(new_properties, ct_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
236 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
237
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
238 UcxKey rt_key = dav_property_key("DAV:", "resourcetype");
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
239 value = ucx_map_get(data->properties, rt_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
240 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
241 ucx_map_put(new_properties, rt_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
242 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
243
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
244 UcxKey cn_key = dav_property_key(DAV_NS, "crypto-name");
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
245 value = ucx_map_get(data->properties, cn_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
246 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
247 ucx_map_put(new_properties, cn_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
248 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
249
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
250 UcxKey ck_key = dav_property_key(DAV_NS, "crypto-key");
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
251 value = ucx_map_get(data->properties, ck_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
252 if(value) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
253 ucx_map_put(new_properties, ck_key, value);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
254 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
255
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
256 UcxKey ch_key = dav_property_key(DAV_NS, "crypto-hash");
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
257 value = ucx_map_get(data->properties, ch_key);
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
258 if(value) {
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
259 ucx_map_put(new_properties, ch_key, value);
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
260 }
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
261
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
262 // add properties from field list
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
263 UCX_FOREACH(elm, fields) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
264 DavCompiledField *field = elm->data;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
265 DavQLStackObj field_result;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
266 if(!dav_exec_expr(field->code, res, &field_result)) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
267 sstr_t str;
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
268 str.ptr = NULL;
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
269 str.length = 0;
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
270 if(field_result.type == 0) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
271 str = ucx_asprintf(
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
272 sn->mp->allocator,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
273 "%d",
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
274 field_result.data.integer);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
275 } else {
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
276 if(field_result.data.string) {
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
277 str = sstrdup_a(sn->mp->allocator, sstrn(
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
278 field_result.data.string,
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
279 field_result.length));
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
280 }
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
281 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
282 if(str.ptr) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
283 UcxKey key = dav_property_key(field->ns, field->name);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
284 ucx_map_put(new_properties, key, str.ptr);
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
285 free(key.data);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
286 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
287 } else {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
288 // TODO: error
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
289 resource_free_properties(sn, new_properties);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
290 return -1;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
291 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
292 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
293
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
294 ucx_map_remove(data->properties, cl_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
295 ucx_map_remove(data->properties, cd_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
296 ucx_map_remove(data->properties, lm_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
297 ucx_map_remove(data->properties, ct_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
298 ucx_map_remove(data->properties, rt_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
299 ucx_map_remove(data->properties, cn_key);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
300 ucx_map_remove(data->properties, ck_key);
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
301 ucx_map_remove(data->properties, ch_key);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
302
137
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
303 resource_free_properties(sn, data->properties);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
304 data->properties = new_properties;
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
305
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
306 free(cl_key.data);
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
307 free(cd_key.data);
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
308 free(lm_key.data);
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
309 free(ct_key.data);
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
310 free(rt_key.data);
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
311 free(cn_key.data);
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
312 free(ck_key.data);
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
313 free(ch_key.data);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
314
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
315 return 0;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
316 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
317
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
318 /*
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
319 * execute a davql select statement
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
320 */
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
321 DavResult dav_exec_select(DavSession *sn, DavQLStatement *st, va_list ap) {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
322 UcxMempool *mp = ucx_mempool_new(128);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
323 DavResult result;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
324 result.result = NULL;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
325 result.status = 1;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
326
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
327 int isallprop;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
328 UcxBuffer *rqbuf = fieldlist2propfindrequest(sn, mp, st->fields, &isallprop);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
329 if(!rqbuf) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
330 ucx_mempool_destroy(mp);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
331 return result;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
332 }
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
333 ucx_mempool_reg_destr(mp, rqbuf, (ucx_destructor)ucx_buffer_free);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
334
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
335 // compile field list
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
336 UcxList *cfieldlist = NULL;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
337 UCX_FOREACH(elm, st->fields) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
338 DavQLField *field = elm->data;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
339 if(sstrcmp(field->name, S("*")) && sstrcmp(field->name, S("-"))) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
340 // compile field expression
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
341 UcxBuffer *code = dav_compile_expr(
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
342 sn->context,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
343 mp->allocator,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
344 field->expr,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
345 ap);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
346 if(!code) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
347 // TODO: set error string
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
348 return result;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
349 }
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
350 ucx_mempool_reg_destr(mp, code, (ucx_destructor)ucx_buffer_free);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
351 DavCompiledField *cfield = ucx_mempool_malloc(
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
352 mp,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
353 sizeof(DavCompiledField));
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
354
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
355 char *ns;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
356 char *name;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
357 dav_get_property_namespace_str(
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
358 sn->context,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
359 sstrdup_a(mp->allocator, field->name).ptr,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
360 &ns,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
361 &name);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
362 if(!ns || !name) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
363 // TODO: set error string
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
364 return result;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
365 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
366 cfield->ns = ns;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
367 cfield->name = name;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
368 cfield->code = code;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
369 cfieldlist = ucx_list_append_a(mp->allocator, cfieldlist, cfield);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
370 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
371 }
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
372
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
373 // get path string
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
374 davqlerror_t error;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
375 sstr_t path = dav_format_string(mp->allocator, st->path, ap, &error);
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
376 if(error) {
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
377 // TODO: cleanup
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
378 ucx_mempool_destroy(mp);
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
379 return result;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
380 }
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
381
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
382 int depth = st->depth == DAV_DEPTH_PLACEHOLDER ? va_arg(ap, int) : st->depth;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
383
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
384 UcxBuffer *where = dav_compile_expr(sn->context, mp->allocator, st->where, ap);
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
385 if(st->where && !where) {
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
386 // TODO: cleanup
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
387 ucx_mempool_destroy(mp);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
388 return result;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
389 }
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
390 if(where) {
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
391 ucx_mempool_reg_destr(mp, where, (ucx_destructor)ucx_buffer_free);
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
392 }
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
393
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
394 // compile order criterion
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
395 UcxList *ordercr = NULL;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
396 UCX_FOREACH(elm, st->orderby) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
397 DavQLOrderCriterion *oc = elm->data;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
398 DavQLExpression *column = oc->column;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
399 //printf("%.*s %s\n", column->srctext.length, column->srctext.ptr, oc->descending ? "desc" : "asc");
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
400 if(column->type == DAVQL_IDENTIFIER) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
401 // TODO: remove code duplication (add_cmd)
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
402 davqlresprop_t resprop;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
403 sstr_t propertyname = sstrchr(column->srctext, ':');
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
404 if(propertyname.length > 0) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
405 char *ns;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
406 char *name;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
407 dav_get_property_namespace_str(
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
408 sn->context,
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
409 sstrdup_a(mp->allocator, column->srctext).ptr,
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
410 &ns,
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
411 &name);
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
412 if(ns && name) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
413 DavOrderCriterion *cr = ucx_mempool_malloc(mp, sizeof(DavOrderCriterion));
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
414 cr->type = 1;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
415 cr->column.property = dav_property_key_a(mp->allocator, ns, name);
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
416 cr->descending = oc->descending;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
417 ordercr = ucx_list_append_a(mp->allocator, ordercr, cr);
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
418 } else {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
419 // error
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
420 // TODO: cleanup
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
421 ucx_mempool_destroy(mp);
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
422 return result;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
423 }
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
424 } else if(dav_identifier2resprop(column->srctext, &resprop)) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
425 DavOrderCriterion *cr = ucx_mempool_malloc(mp, sizeof(DavOrderCriterion));
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
426 cr->type = 0;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
427 cr->column.resprop = resprop;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
428 cr->descending = oc->descending;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
429 ordercr = ucx_list_append_a(mp->allocator, ordercr, cr);
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
430 } else {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
431 // error
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
432 // TODO: cleanup
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
433 ucx_mempool_destroy(mp);
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
434 return result;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
435 }
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
436
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
437 } else if(column->type == DAVQL_NUMBER) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
438 // TODO: implement
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
439 fprintf(stderr, "order by number not supported\n");
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
440 return result;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
441 } else {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
442 // something is broken
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
443 // TODO: cleanup
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
444 ucx_mempool_destroy(mp);
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
445 return result;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
446 }
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
447 }
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
448
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
449 DavResource *selroot = dav_resource_new(sn, path.ptr);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
450
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
451 UcxList *stack = NULL; // stack with DavResource* elements
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
452 // initialize the stack with the requested resource
157
8dccc3063e28 changed name of a local variable to avoid a later name collision
Mike Becker <universe@uap-core.de>
parents: 150
diff changeset
453 DavQLRes *res = ucx_mempool_malloc(mp, sizeof(DavQLRes));
8dccc3063e28 changed name of a local variable to avoid a later name collision
Mike Becker <universe@uap-core.de>
parents: 150
diff changeset
454 res->resource = selroot;
8dccc3063e28 changed name of a local variable to avoid a later name collision
Mike Becker <universe@uap-core.de>
parents: 150
diff changeset
455 res->depth = 0;
8dccc3063e28 changed name of a local variable to avoid a later name collision
Mike Becker <universe@uap-core.de>
parents: 150
diff changeset
456 stack = ucx_list_prepend(stack, res);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
457
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
458 // reuseable response buffer
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
459 UcxBuffer *rpbuf = ucx_buffer_new(NULL, 4096, UCX_BUFFER_AUTOEXTEND);
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
460 if(!rpbuf) {
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
461 // TODO: cleanup
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
462 ucx_mempool_destroy(mp);
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
463 return result;
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
464 }
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
465 ucx_mempool_reg_destr(mp, rpbuf, (ucx_destructor)ucx_buffer_free);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
466
137
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
467 result.result = selroot;
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
468 result.status = 0;
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
469
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
470 // do a propfind request for each resource on the stack
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
471 while(stack) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
472 DavQLRes *sr = stack->data; // get first element from the stack
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
473 stack = ucx_list_remove(stack, stack); // remove first element
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
474 DavResource *root = sr->resource;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
475
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
476 util_set_url(sn, dav_resource_get_href(sr->resource));
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
477 CURLcode ret = do_propfind_request(sn->handle, rqbuf, rpbuf);
205
bf756f6c3581 fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
478 long http_status = 0;
bf756f6c3581 fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
479 curl_easy_getinfo(sn->handle, CURLINFO_RESPONSE_CODE, &http_status);
137
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
480 //printf("rpbuf: %s %s\n%.*s\n\n", sr->resource->path, sr->resource->href, rpbuf->pos, rpbuf->space);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
481
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
482 if(ret == CURLE_OK && http_status == 207) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
483 // propfind request successful, now parse the response
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
484 char *url = "http://url/";
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
485 PropfindParser *parser = create_propfind_parser(rpbuf, url);
137
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
486 // TODO: test if parser is null
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
487 ResponseTag response;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
488 int r;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
489 while((r = get_propfind_response(parser, &response)) != 0) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
490 if(r == -1) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
491 // error
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
492 result.status = -1;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
493 // TODO: free resources
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
494 cleanup_response(&response);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
495 break;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
496 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
497
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
498 // the propfind multistatus response contains responses
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
499 // for the requested resource and all childs
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
500 // determine if the response is a child or not
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
501 if(hrefeq(sn, root->href, response.href)) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
502 // response is the currently requested resource
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
503 // and not a child
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
504
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
505 // add properties
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
506 add_properties(root, &response);
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
507 cleanup_response(&response);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
508
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
509 if(root == selroot) {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
510 // The current root is the root of the select query.
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
511 // In this case we have to check the where clause.
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
512 // If root is not selroot, the where clause was
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
513 // already checked for the resource before it was
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
514 // added to the stack.
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
515 DavQLStackObj where_result;
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
516 if(!dav_exec_expr(where, root, &where_result)) {
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 148
diff changeset
517 if(where_result.data.integer != 0) {
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
518 if(!reset_properties(sn, &result, root, cfieldlist)) {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
519 continue;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
520 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
521 result.status = -1;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
522 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
523 }
143
d8b01bed3d83 fixed get command and davql exec
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
524 result.result = NULL;
d8b01bed3d83 fixed get command and davql exec
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
525 result.status = -1;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
526 dav_resource_free_all(selroot);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
527 ucx_list_free(stack);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
528 break;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
529 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
530 } else {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
531 DavResource *child = response2resource(
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
532 sn,
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
533 &response,
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
534 root->path);
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
535 cleanup_response(&response);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
536 // check where clause
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
537 DavQLStackObj where_result;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
538 if(!dav_exec_expr(where, child, &where_result)) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
539 if(where_result.data.integer != 0) {
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
540 if(!reset_properties(sn, &result, child, cfieldlist)) {
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
541 //resource_add_child(root, child);
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
542 resource_add_ordered_child(root, child, ordercr);
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
543 if(child->iscollection &&
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
544 (depth < 0 || depth > sr->depth+1))
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
545 {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
546 DavQLRes *rs = ucx_mempool_malloc(
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
547 mp,
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
548 sizeof(DavQLRes));
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
549 rs->resource = child;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
550 rs->depth = sr->depth + 1;
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
551 stack = ucx_list_prepend(stack, rs);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
552 }
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
553 } else {
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
554 dav_resource_free(child);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
555 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
556 } else {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
557 dav_resource_free(child);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
558 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
559 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
560 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
561 }
148
f21ee22170bf fixed many davql exec memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 145
diff changeset
562 destroy_propfind_parser(parser);
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
563 } else {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
564 dav_session_set_error(sn, ret, http_status);
137
01cb9aabff05 fixed horrible bugs, davql hopefully just works now (without order by yet)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
565 result.result = NULL;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
566 result.status = -1;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
567 dav_resource_free_all(selroot);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
568 break;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
569 }
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
570
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
571 // reset response buffer
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
572 ucx_buffer_seek(rpbuf, SEEK_SET, 0);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
573 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
574
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
575 ucx_mempool_destroy(mp);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
576 return result;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
577 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
578
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
579 static int count_func_args(DavQLExpression *expr) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
580 int count = 0;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
581 DavQLExpression *arg = expr->right;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
582 while(arg) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
583 count++;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
584 if(arg->op == DAVQL_ARGLIST) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
585 arg = arg->right;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
586 } else {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
587 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
588 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
589 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
590 return count;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
591 }
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
592
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
593 int dav_identifier2resprop(sstr_t src, davqlresprop_t *prop) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
594 if(!sstrcmp(src, S("name"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
595 *prop = DAVQL_RES_NAME;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
596 } else if(!sstrcmp(src, S("path"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
597 *prop = DAVQL_RES_PATH;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
598 } else if(!sstrcmp(src, S("href"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
599 *prop = DAVQL_RES_HREF;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
600 } else if(!sstrcmp(src, S("contentlength"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
601 *prop = DAVQL_RES_CONTENTLENGTH;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
602 } else if(!sstrcmp(src, S("contenttype"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
603 *prop = DAVQL_RES_CONTENTTYPE;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
604 } else if(!sstrcmp(src, S("creationdate"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
605 *prop = DAVQL_RES_CREATIONDATE;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
606 } else if(!sstrcmp(src, S("lastmodified"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
607 *prop = DAVQL_RES_LASTMODIFIED;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
608 } else if(!sstrcmp(src, S("iscollection"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
609 *prop = DAVQL_RES_ISCOLLECTION;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
610 } else {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
611 return 0;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
612 }
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
613 return 1;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
614 }
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
615
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
616 static int add_cmd(DavContext *ctx, UcxAllocator *a, UcxBuffer *bcode, DavQLExpression *expr, va_list ap) {
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
617 if(!expr) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
618 return 0;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
619 }
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
620
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
621 int numcmd = 1;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
622 DavQLCmd cmd;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
623 memset(&cmd, sizeof(DavQLCmd), 0);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
624 davqlerror_t error;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
625
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
626 sstr_t src = expr->srctext;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
627 switch(expr->type) {
145
82475dc12dd4 improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 144
diff changeset
628 default: break;
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
629 case DAVQL_NUMBER: {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
630 cmd.type = DAVQL_CMD_INT;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
631 if(src.ptr[0] == '%') {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
632 cmd.data.integer = va_arg(ap, int);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
633 } else if(util_strtoint(src.ptr, &cmd.data.integer)) {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
634 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
635 } else {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
636 // error
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
637 return -1;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
638 }
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
639
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
640 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
641 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
642 case DAVQL_STRING: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
643 cmd.type = DAVQL_CMD_STRING;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
644 cmd.data.string = dav_format_string(a, src, ap, &error);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
645 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
646 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
647 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
648 case DAVQL_TIMESTAMP: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
649 if(src.ptr[0] == '%') {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
650 cmd.type = DAVQL_CMD_TIMESTAMP;
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
651 cmd.data.timestamp = va_arg(ap, time_t);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
652 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
653 } else {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
654 // error
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
655 return -1;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
656 }
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
657 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
658 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
659 case DAVQL_IDENTIFIER: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
660 sstr_t propertyname = sstrchr(src, ':');
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
661 cmd.type = DAVQL_CMD_RES_IDENTIFIER;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
662 if(propertyname.length > 0) {
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
663 cmd.type = DAVQL_CMD_PROP_IDENTIFIER;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
664 char *ns;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
665 char *name;
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
666 dav_get_property_namespace_str(
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
667 ctx,
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
668 sstrdup_a(a, src).ptr,
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
669 &ns,
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
670 &name);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
671 if(ns && name) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
672 cmd.data.property.ns = ns;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
673 cmd.data.property.name = name;
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
674 } else {
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
675 // error
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
676 return -1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
677 }
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
678 } else if(!dav_identifier2resprop(src, &cmd.data.resprop)) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
679 if(!sstrcmp(src, S("true"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
680 cmd.type = DAVQL_CMD_INT;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
681 cmd.data.integer = 1;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
682 } else if(!sstrcmp(src, S("false"))) {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
683 cmd.type = DAVQL_CMD_INT;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
684 cmd.data.integer = 0;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
685 } else {
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
686 // error, unknown identifier
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
687 return -1;
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
688 }
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
689 }
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
690 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
691 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
692 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
693 case DAVQL_UNARY: {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
694 numcmd += add_cmd(ctx, a, bcode, expr->left, ap);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
695 switch(expr->op) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
696 case DAVQL_ADD: {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
697 // noop
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
698 numcmd = 0;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
699 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
700 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
701 case DAVQL_SUB: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
702 cmd.type = DAVQL_CMD_OP_UNARY_SUB;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
703 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
704 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
705 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
706 case DAVQL_NEG: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
707 cmd.type = DAVQL_CMD_OP_UNARY_NEG;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
708 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
709 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
710 }
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
711 default: break;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
712 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
713 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
714 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
715 case DAVQL_BINARY: {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
716 numcmd += add_cmd(ctx, a, bcode, expr->left, ap);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
717 numcmd += add_cmd(ctx, a, bcode, expr->right, ap);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
718 switch(expr->op) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
719 case DAVQL_ADD: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
720 cmd.type = DAVQL_CMD_OP_BINARY_ADD;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
721 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
722 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
723 case DAVQL_SUB: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
724 cmd.type = DAVQL_CMD_OP_BINARY_SUB;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
725 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
726 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
727 case DAVQL_MUL: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
728 cmd.type = DAVQL_CMD_OP_BINARY_MUL;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
729 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
730 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
731 case DAVQL_DIV: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
732 cmd.type = DAVQL_CMD_OP_BINARY_DIV;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
733 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
734 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
735 case DAVQL_AND: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
736 cmd.type = DAVQL_CMD_OP_BINARY_AND;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
737 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
738 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
739 case DAVQL_OR: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
740 cmd.type = DAVQL_CMD_OP_BINARY_OR;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
741 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
742 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
743 case DAVQL_XOR: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
744 cmd.type = DAVQL_CMD_OP_BINARY_XOR;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
745 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
746 }
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
747 default: break;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
748 }
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
749 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
750 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
751 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
752 case DAVQL_LOGICAL: {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
753 if(expr->left && expr->right && expr->op != DAVQL_LOR) {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
754 numcmd += add_cmd(ctx, a, bcode, expr->left, ap);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
755 numcmd += add_cmd(ctx, a, bcode, expr->right, ap);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
756 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
757
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
758 switch(expr->op) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
759 case DAVQL_NOT: {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
760 numcmd += add_cmd(ctx, a, bcode, expr->left, ap);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
761 cmd.type = DAVQL_CMD_OP_LOGICAL_NOT;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
762 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
763 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
764 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
765 case DAVQL_LAND: {
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
766 cmd.type = DAVQL_CMD_OP_LOGICAL_AND;
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
767 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
768 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
769 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
770 case DAVQL_LOR: {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
771 int nleft = add_cmd(ctx, a, bcode, expr->left, ap);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
772
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
773 cmd.type = DAVQL_CMD_OP_LOGICAL_OR_L;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
774 DavQLCmd *or_l = (DavQLCmd*)(bcode->space + bcode->pos);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
775 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
776
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
777 int nright = add_cmd(ctx, a, bcode, expr->right, ap);
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
778 or_l->data.integer = nright + 1;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
779
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
780 cmd.type = DAVQL_CMD_OP_LOGICAL_OR;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
781 cmd.data.integer = 0;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
782 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
783
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
784 numcmd += nleft + nright;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
785 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
786 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
787 case DAVQL_LXOR: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
788 cmd.type = DAVQL_CMD_OP_LOGICAL_XOR;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
789 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
790 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
791 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
792 case DAVQL_EQ: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
793 cmd.type = DAVQL_CMD_OP_EQ;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
794 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
795 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
796 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
797 case DAVQL_NEQ: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
798 cmd.type = DAVQL_CMD_OP_NEQ;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
799 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
800 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
801 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
802 case DAVQL_LT: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
803 cmd.type = DAVQL_CMD_OP_LT;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
804 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
805 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
806 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
807 case DAVQL_GT: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
808 cmd.type = DAVQL_CMD_OP_GT;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
809 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
810 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
811 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
812 case DAVQL_LE: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
813 cmd.type = DAVQL_CMD_OP_LE;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
814 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
815 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
816 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
817 case DAVQL_GE: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
818 cmd.type = DAVQL_CMD_OP_GE;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
819 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
820 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
821 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
822 case DAVQL_LIKE: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
823 cmd.type = DAVQL_CMD_OP_LIKE;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
824 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
825 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
826 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
827 case DAVQL_UNLIKE: {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
828 cmd.type = DAVQL_CMD_OP_UNLIKE;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
829 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
830 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
831 }
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
832 default: break;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
833 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
834 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
835 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
836 case DAVQL_FUNCCALL: {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
837 switch(expr->op) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
838 case DAVQL_CALL: {
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
839 int nright = add_cmd(ctx, a, bcode, expr->right, ap);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
840 // TODO: count args
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
841 DavQLExpression *funcid = expr->left;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
842 if(!funcid && funcid->type != DAVQL_IDENTIFIER) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
843 // fail
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
844 return -1;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
845 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
846
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
847 // numargs
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
848 cmd.type = DAVQL_CMD_INT;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
849 cmd.data.integer = count_func_args(expr);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
850 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
851
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
852 // TODO: resolve function name
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
853 cmd.type = DAVQL_CMD_CALL;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
854 cmd.data.func = NULL;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
855 ucx_buffer_write(&cmd, sizeof(cmd), 1, bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
856
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
857 numcmd = 2;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
858 numcmd += nright;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
859 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
860 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
861 case DAVQL_ARGLIST: {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
862 numcmd = 0;
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
863 numcmd += add_cmd(ctx, a, bcode, expr->left, ap);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
864 numcmd += add_cmd(ctx, a, bcode, expr->right, ap);
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
865 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
866 }
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
867 default: break;
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
868 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
869 break;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
870 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
871 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
872 return numcmd;
104
6fb4d24d9df9 added davqlexec source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
873 }
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
874
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
875 UcxBuffer* dav_compile_expr(DavContext *ctx, UcxAllocator *a, DavQLExpression *lexpr, va_list ap) {
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
876 UcxBuffer *bcode = ucx_buffer_new(NULL, 512, UCX_BUFFER_AUTOEXTEND);
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
877 if(!bcode) {
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
878 return NULL;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
879 }
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
880
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
881 if(add_cmd(ctx, a, bcode, lexpr, ap) <= 0) {
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
882 ucx_buffer_free(bcode);
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
883 return NULL;
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
884 }
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
885
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
886 return bcode;
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
887 }
124
41939c8f3f9c expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 123
diff changeset
888
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
889 static int cmd_str_cmp(DavQLStackObj obj1, DavQLStackObj obj2, davqlcmdtype_t cmd) {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
890 sstr_t s1 = obj1.type == 1 ?
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
891 sstrn(obj1.data.string, obj1.length) :
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
892 ucx_sprintf("%" PRId64, obj1.data.integer);
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
893 sstr_t s2 = obj1.type == 1 ?
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
894 sstrn(obj2.data.string, obj2.length) :
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
895 ucx_sprintf("%" PRId64, obj2.data.integer);
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
896
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
897 int res = 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
898 switch(cmd) {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
899 case DAVQL_CMD_OP_EQ: {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
900 res = sstrcmp(s1, s2) == 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
901 break;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
902 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
903 case DAVQL_CMD_OP_NEQ: {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
904 res = sstrcmp(s1, s2) != 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
905 break;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
906 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
907 case DAVQL_CMD_OP_LT: {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
908 res = sstrcmp(s1, s2) < 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
909 break;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
910 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
911 case DAVQL_CMD_OP_GT: {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
912 res = sstrcmp(s1, s2) > 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
913 break;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
914 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
915 case DAVQL_CMD_OP_LE: {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
916 res = sstrcmp(s1, s2) <= 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
917 break;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
918 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
919 case DAVQL_CMD_OP_GE: {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
920 res = sstrcmp(s1, s2) >= 0;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
921 break;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
922 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
923 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
924
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
925 if(obj1.type == 0) {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
926 free(s1.ptr);
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
927 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
928 if(obj2.type == 0) {
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
929 free(s2.ptr);
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
930 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
931
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
932 return res;
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
933 }
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
934
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
935 int dav_exec_expr(UcxBuffer *bcode, DavResource *res, DavQLStackObj *result) {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
936 if(!bcode) {
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
937 result->type = 0;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
938 result->length = 0;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
939 result->data.integer = 1;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
940 return 0;
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
941 }
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
942
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
943 size_t count = bcode->pos / sizeof(DavQLCmd);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
944 DavQLCmd *cmds = (DavQLCmd*)bcode->space;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
945
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
946 // create execution stack
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
947 size_t stsize = 64;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
948 size_t stpos = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
949 DavQLStackObj *stack = calloc(stsize, sizeof(DavQLStackObj));
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
950 #define DAVQL_PUSH(obj) \
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
951 if(stpos == stsize) { \
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
952 stsize += 64; \
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
953 stack = realloc(stack, stsize * sizeof(DavQLStackObj)); \
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
954 } \
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
955 stack[stpos++] = obj;
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
956 #define DAVQL_PUSH_INT(intval) \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
957 { \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
958 DavQLStackObj intobj; \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
959 intobj.type = 0; \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
960 intobj.length = 0; \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
961 intobj.data.integer = intval; \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
962 DAVQL_PUSH(intobj); \
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
963 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
964 #define DAVQL_POP() stack[--stpos]
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
965
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
966 DavQLStackObj obj;
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
967 int ret = 0;
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
968 for(size_t i=0;i<count;i++) {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
969 DavQLCmd cmd = cmds[i];
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
970 switch(cmd.type) {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
971 case DAVQL_CMD_INT: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
972 //printf("int %lld\n", cmd.data.integer);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
973 obj.type = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
974 obj.length = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
975 obj.data.integer = cmd.data.integer;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
976 DAVQL_PUSH(obj);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
977 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
978 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
979 case DAVQL_CMD_STRING: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
980 //printf("string \"%.*s\"\n", cmd.data.string.length, cmd.data.string.ptr);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
981 obj.type = 1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
982 obj.length = cmd.data.string.length;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
983 obj.data.string = cmd.data.string.ptr;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
984 DAVQL_PUSH(obj);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
985 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
986 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
987 case DAVQL_CMD_TIMESTAMP: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
988 //printf("timestamp %d\n", cmd.data.timestamp);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
989 obj.type = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
990 obj.length = 0;
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
991 obj.data.integer = (int64_t)cmd.data.timestamp;
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
992 DAVQL_PUSH(obj);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
993 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
994 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
995 case DAVQL_CMD_RES_IDENTIFIER: {
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 137
diff changeset
996 //char *rid[8] = {"name", "path", "href", "contentlength", "contenttype", "creationdate", "lastmodified", "iscollection"};
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
997 //printf("resprop %s\n", rid[cmd.data.resprop]);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
998 switch(cmd.data.resprop) {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
999 case DAVQL_RES_NAME: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1000 obj.type = 1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1001 obj.length = strlen(res->name);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1002 obj.data.string = res->name;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1003 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1004 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1005 case DAVQL_RES_PATH: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1006 obj.type = 1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1007 obj.length = strlen(res->path);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1008 obj.data.string = res->path;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1009 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1010 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1011 case DAVQL_RES_HREF: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1012 obj.type = 1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1013 obj.length = strlen(res->href);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1014 obj.data.string = res->href;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1015 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1016 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1017 case DAVQL_RES_CONTENTLENGTH: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1018 obj.type = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1019 obj.length = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1020 obj.data.integer = res->contentlength;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1021 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1022 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1023 case DAVQL_RES_CONTENTTYPE: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1024 obj.type = 1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1025 obj.length = strlen(res->contenttype);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1026 obj.data.string = res->contenttype;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1027 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1028 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1029 case DAVQL_RES_CREATIONDATE: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1030 obj.type = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1031 obj.length = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1032 obj.data.integer = res->creationdate;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1033 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1034 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1035 case DAVQL_RES_LASTMODIFIED: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1036 obj.type = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1037 obj.length = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1038 obj.data.integer = res->lastmodified;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1039 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1040 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1041 case DAVQL_RES_ISCOLLECTION: {
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1042 obj.type = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1043 obj.length = 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1044 obj.data.integer = res->iscollection;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1045 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1046 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1047 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1048 DAVQL_PUSH(obj);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1049 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1050 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1051 case DAVQL_CMD_PROP_IDENTIFIER: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1052 //printf("property %s:%s\n", cmd.data.property.ns, cmd.data.property.name);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1053 char *value = dav_get_property_ns(res, cmd.data.property.ns, cmd.data.property.name);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1054 obj.type = 1;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1055 obj.length = value ? strlen(value) : 0;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1056 obj.data.string = value;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1057 DAVQL_PUSH(obj);
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1058 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1059 }
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1060 //case DAVQL_CMD_OP_UNARY_ADD: {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1061 // printf("uadd\n");
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1062 // break;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1063 //}
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1064 case DAVQL_CMD_OP_UNARY_SUB: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1065 //printf("usub\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1066 obj = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1067 if(obj.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1068 obj.data.integer = -obj.data.integer;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1069 DAVQL_PUSH(obj);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1070 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1071 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1072 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1073 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1074 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1075 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1076 case DAVQL_CMD_OP_UNARY_NEG: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1077 //printf("uneg\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1078 obj = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1079 if(obj.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1080 obj.data.integer = obj.data.integer == 0 ? 1 : 0;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1081 DAVQL_PUSH(obj);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1082 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1083 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1084 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1085 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1086 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1087 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1088 case DAVQL_CMD_OP_BINARY_ADD: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1089 //printf("add\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1090 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1091 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1092 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1093 DAVQL_PUSH_INT(obj1.data.integer + obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1094 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1095 // TODO: string concat
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1096 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1097 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1098 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1099 case DAVQL_CMD_OP_BINARY_SUB: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1100 //printf("sub\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1101 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1102 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1103 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1104 DAVQL_PUSH_INT(obj1.data.integer - obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1105 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1106 // error
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1107 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1108 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1109 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1110 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1111 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1112 case DAVQL_CMD_OP_BINARY_MUL: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1113 //printf("mul\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1114 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1115 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1116 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1117 DAVQL_PUSH_INT(obj1.data.integer * obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1118 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1119 // error
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1120 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1121 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1122 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1123 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1124 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1125 case DAVQL_CMD_OP_BINARY_DIV: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1126 //printf("div\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1127 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1128 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1129 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1130 DAVQL_PUSH_INT(obj1.data.integer / obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1131 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1132 // error
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1133 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1134 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1135 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1136 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1137 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1138 case DAVQL_CMD_OP_BINARY_AND: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1139 //printf("and\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1140 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1141 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1142 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1143 DAVQL_PUSH_INT(obj1.data.integer & obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1144 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1145 // error
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1146 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1147 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1148 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1149 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1150 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1151 case DAVQL_CMD_OP_BINARY_OR: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1152 //printf("or\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1153 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1154 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1155 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1156 DAVQL_PUSH_INT(obj1.data.integer | obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1157 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1158 // error
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1159 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1160 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1161 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1162 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1163 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1164 case DAVQL_CMD_OP_BINARY_XOR: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1165 //printf("xor\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1166 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1167 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1168 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1169 DAVQL_PUSH_INT(obj1.data.integer ^ obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1170 } else {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1171 // error
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1172 ret = -1;
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1173 i = count; // end loop
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1174 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1175 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1176 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1177 case DAVQL_CMD_OP_LOGICAL_NOT: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1178 //printf("not\n");
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1179 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1180 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1181 case DAVQL_CMD_OP_LOGICAL_AND: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1182 //printf("land\n");
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1183 DavQLStackObj obj2 = DAVQL_POP();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1184 DavQLStackObj obj1 = DAVQL_POP();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1185 int v1 = obj1.type == 0 ? (int)obj1.data.integer : (obj1.data.string ? 1 : 0);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1186 int v2 = obj2.type == 0 ? (int)obj2.data.integer : (obj2.data.string ? 1 : 0);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1187 DAVQL_PUSH_INT(v1 && v2);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1188 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1189 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1190 case DAVQL_CMD_OP_LOGICAL_OR_L: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1191 //printf("or_l %d\n", cmd.data.integer);
235
0468df02e18f fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 205
diff changeset
1192 DavQLStackObj obj1 = stack[stpos];
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1193 if((obj1.type == 0 && obj1.data.integer) || (obj1.type == 1 && obj1.data.string)) {
235
0468df02e18f fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 205
diff changeset
1194 stpos--;
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1195 DAVQL_PUSH_INT(1);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1196 i += cmd.data.integer; // jump, skip right subtree of 'or'
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1197 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1198 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1199 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1200 case DAVQL_CMD_OP_LOGICAL_OR: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1201 //printf("or\n");
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1202 DavQLStackObj obj2 = DAVQL_POP();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1203 DavQLStackObj obj1 = DAVQL_POP();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1204 int v1 = obj1.type == 0 ? (int)obj1.data.integer : (obj1.data.string ? 1 : 0);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1205 int v2 = obj2.type == 0 ? (int)obj2.data.integer : (obj2.data.string ? 1 : 0);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1206 DAVQL_PUSH_INT(v1 || v2);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1207 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1208 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1209 case DAVQL_CMD_OP_LOGICAL_XOR: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1210 //printf("lxor\n");
134
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1211 DavQLStackObj obj2 = DAVQL_POP();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1212 DavQLStackObj obj1 = DAVQL_POP();
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1213 int v1 = obj1.type == 0 ? (int)obj1.data.integer : (obj1.data.string ? 1 : 0);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1214 int v2 = obj2.type == 0 ? (int)obj2.data.integer : (obj2.data.string ? 1 : 0);
4bccc18820e8 implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
1215 DAVQL_PUSH_INT(!v1 != !v2);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1216 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1217 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1218 case DAVQL_CMD_OP_EQ: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1219 //printf("eq\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1220 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1221 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1222 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1223 DAVQL_PUSH_INT(obj1.data.integer == obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1224 } else {
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
1225 DAVQL_PUSH_INT(cmd_str_cmp(obj1, obj2, cmd.type));
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1226 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1227 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1228 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1229 case DAVQL_CMD_OP_NEQ: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1230 //printf("neq\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1231 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1232 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1233 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1234 DAVQL_PUSH_INT(obj1.data.integer != obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1235 } else {
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
1236 DAVQL_PUSH_INT(cmd_str_cmp(obj1, obj2, cmd.type));
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1237 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1238 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1239 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1240 case DAVQL_CMD_OP_LT: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1241 //printf("lt\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1242 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1243 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1244 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1245 DAVQL_PUSH_INT(obj1.data.integer < obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1246 } else {
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
1247 DAVQL_PUSH_INT(cmd_str_cmp(obj1, obj2, cmd.type));
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1248 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1249 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1250 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1251 case DAVQL_CMD_OP_GT: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1252 //printf("gt\n");
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1253 DavQLStackObj obj2 = DAVQL_POP();
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1254 DavQLStackObj obj1 = DAVQL_POP();
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1255 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1256 DAVQL_PUSH_INT(obj1.data.integer > obj2.data.integer);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1257 } else {
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
1258 DAVQL_PUSH_INT(cmd_str_cmp(obj1, obj2, cmd.type));
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1259 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1260 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1261 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1262 case DAVQL_CMD_OP_LE: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1263 //printf("le\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1264 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1265 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1266 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1267 DAVQL_PUSH_INT(obj1.data.integer <= obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1268 } else {
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
1269 DAVQL_PUSH_INT(cmd_str_cmp(obj1, obj2, cmd.type));
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1270 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1271 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1272 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1273 case DAVQL_CMD_OP_GE: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1274 //printf("ge\n");
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1275 DavQLStackObj obj2 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1276 DavQLStackObj obj1 = DAVQL_POP();
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1277 if(obj1.type == 0 && obj2.type == 0) {
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1278 DAVQL_PUSH_INT(obj1.data.integer >= obj2.data.integer);
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1279 } else {
249
50fb9c9f6671 implemented string functionality for some davql operators
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 235
diff changeset
1280 DAVQL_PUSH_INT(cmd_str_cmp(obj1, obj2, cmd.type));
133
8c37028f5024 implemented some davql integer operations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 128
diff changeset
1281 }
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1282 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1283 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1284 case DAVQL_CMD_OP_LIKE: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1285 //printf("like\n");
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1286 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1287 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1288 case DAVQL_CMD_OP_UNLIKE: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1289 //printf("unlike\n");
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1290 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1291 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1292 case DAVQL_CMD_CALL: {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
1293 //printf("call %x\n", cmd.data.func);
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1294 break;
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1295 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1296 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1297 }
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1298
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1299 if(stpos == 1) {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1300 *result = stack[0];
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1301 } else {
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1302 ret = -1;
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1303 }
128
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1304 free(stack);
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1305
649eb328674a implemented minimal executor features and added missing ucx files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 127
diff changeset
1306 return ret;
126
b156cae29e65 added expression executor prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 124
diff changeset
1307 }

mercurial