Changeset 441

Timestamp:

07/11/2005 11:03:12 AM (3 years ago)

Author:

jan

Message:

added string-compare (NE, EQ), fixed handling of trigger.handler

Location:

branches/lighttpd-1.3.x/src

Files:

• mod_cml.h (modified) (2 diffs)
• mod_cml_logic.c (modified) (10 diffs)

branches/lighttpd-1.3.x/src/mod_cml.h

@@ -61 +61 @@
         
         buffer *basedir;
+        buffer *baseurl;
         
         buffer *trigger_handler;
@@ -99 +100 @@
 CACHE_FUNC_PROTO(f_memcache_get_string);
 CACHE_FUNC_PROTO(f_memcache_get_long);
+CACHE_FUNC_PROTO(f_http_request_get_param);
+CACHE_FUNC_PROTO(f_crypto_md5);
 
 #endif

branches/lighttpd-1.3.x/src/mod_cml_logic.c

@@ -171 +171 @@
                 { "memcache.get_long",     1, f_memcache_get_long },
 #endif
+                { "http.get_parameter",    1, f_http_request_get_param },
+                { "crypto.md5",            1, f_crypto_md5 },
                 { NULL, 0, NULL },
         };
@@ -392 +394 @@
 }
 
-int cache_ops_long(tnode *res, tnode *l, tnode *r) {
+int cache_ops_long(server *srv, tnode *res, tnode *l, tnode *r) {
         if (!IS_LONG(l) || !IS_LONG(r)) {
                 return -1;
@@ -432 +434 @@
 }
 
-int cache_ops_string(tnode *res, tnode *l, tnode *r) {
+int cache_ops_string(server *srv, tnode *res, tnode *l, tnode *r) {
         if (!IS_STRING(l) || !IS_STRING(r)) {
                 return -1;
@@ -448 +450 @@
                 
                 break;
+        case EQ:
+                tnode_prepare_long(res);
+                
+                VAL_LONG(res) = buffer_is_equal(VAL_STRING(l), VAL_STRING(r));
+                
+                res->value.type = T_NODE_VALUE_LONG;
+                res->op = UNSET;
+                
+                break;
+        case NE:
+                tnode_prepare_long(res);
+                
+                VAL_LONG(res) = !buffer_is_equal(VAL_STRING(l), VAL_STRING(r));
+                
+                res->value.type = T_NODE_VALUE_LONG;
+                res->op = UNSET;
+                
+                break;
         default:
                 return -1;
         }
+        
+        return 0;
+}
+
+int cache_print_tree(server *srv, connection *con, plugin_data *p, tnode *t, int indent) {
+        char s[255];
+        size_t i;
+        
+        for (i = 0; i < indent; i++) {
+                s[i] = ' ';
+        }
+        
+        s[i] = '\0';
+        
+        if (IS_LONG(t))   log_error_write(srv, __FILE__, __LINE__, "ssd", s, "l:", VAL_LONG(t)); 
+        if (IS_STRING(t)) log_error_write(srv, __FILE__, __LINE__, "ssb", s, "s:", VAL_STRING(t)); 
+        
+        
+        if (t->l) {
+                log_error_write(srv, __FILE__, __LINE__, "ss", s, "left"); 
+                cache_print_tree(srv, con, p, t->l, indent + 1);
+        }
+        
+        if (t->r) {
+                log_error_write(srv, __FILE__, __LINE__, "ss", s, "right"); 
+                cache_print_tree(srv, con, p, t->r, indent + 1);
+        }
+        
         
         return 0;
@@ -478 +526 @@
         /* left and right are simple datatypes now */
         if (IS_LONG(t->l) && IS_LONG(t->r)) {
-                if (-1 == cache_ops_long(t, t->l, t->r)) {
-                        fprintf(stderr, "%s.%d\n", __FILE__, __LINE__);
+                if (-1 == cache_ops_long(srv, t, t->l, t->r)) {
+                        log_error_write(srv, __FILE__, __LINE__, "s", 
+                                        "cache_ops_long failed");
                         return -1;
                 }
         } else if (IS_STRING(t->l) && IS_STRING(t->r)) {
-                if (-1 == cache_ops_string(t, t->l, t->r)) {
+                if (-1 == cache_ops_string(srv, t, t->l, t->r)) {
                         log_error_write(srv, __FILE__, __LINE__, "s", 
                                         "cache_ops_string failed");
@@ -489 +538 @@
                 }
         } else {
-                log_error_write(srv, __FILE__, __LINE__, "s", 
-                                "typemismatch");
+                log_error_write(srv, __FILE__, __LINE__, "sdd", 
+                                "typemismatch", t->l->value.type, t->r->value.type);
                 
                 return -1;
@@ -516 +565 @@
 
                 if (IS_LONG(t)) {
-#if 0
-                        fprintf(stderr, "eval: %s = %ld\n", p->trigger_if->ptr[i]->ptr, VAL_LONG(t));
-#endif
+                        log_error_write(srv, __FILE__, __LINE__, "sbd", 
+                                        "eval:", p->trigger_if->ptr[i], VAL_LONG(t));
                         if (VAL_LONG(t) != 0) {
                                 tnode_free(t);
@@ -525 +573 @@
                         }
                 } else if (IS_STRING(t)) {
-#if 0
-                        fprintf(stderr, "eval: %s = '%s'\n", p->trigger_if->ptr[i]->ptr, VAL_STRING(t)->ptr);
-#endif
+                        log_error_write(srv, __FILE__, __LINE__, "sbb", 
+                                        "eval:", p->trigger_if->ptr[i], VAL_STRING(t));
+                        
                         if (VAL_STRING(t)->used > 1) {
                                 tnode_free(t);
@@ -651 +699 @@
                                  */
                                 
-                                buffer *b;
-                                
-                                b = p->trigger_handler;
-                                
-                                buffer_copy_string_buffer(b, p->basedir);
-                                buffer_append_string(b, value); 
+                                buffer_copy_string(p->trigger_handler, value);
                         } else {
                                 log_error_write(srv, __FILE__, __LINE__, "db", key_len, srv->tmp_buf);
@@ -685 +728 @@
                 
                 /* rewrite filename */
-                buffer_copy_string_buffer(con->physical.path, p->trigger_handler);
+                buffer_copy_string_buffer(con->uri.path, p->baseurl);
+                buffer_append_string_buffer(con->uri.path, p->trigger_handler);
+        
+                buffer_copy_string_buffer(con->physical.path, p->basedir);
+                buffer_append_string_buffer(con->physical.path, p->trigger_handler);
                 
                 chunkqueue_reset(con->write_queue);