Changeset 431

Timestamp:

07/08/2005 10:29:40 PM (3 years ago)

Author:

jan

Message:

replace mysql my memcache prototypes, fixes parameter handling

Location:

branches/lighttpd-1.3.x/src

Files:

• mod_cml.h (modified) (1 diff)
• mod_cml_funcs.c (modified) (3 diffs)
• mod_cml_logic.c (modified) (2 diffs)

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

@@ -87 +87 @@
 CACHE_FUNC_PROTO(f_unix_time_now);
 CACHE_FUNC_PROTO(f_file_mtime);
-CACHE_FUNC_PROTO(f_mysql_escape);
-CACHE_FUNC_PROTO(f_mysql_connect);
-CACHE_FUNC_PROTO(f_mysql_query);
+CACHE_FUNC_PROTO(f_memcache_get);
+CACHE_FUNC_PROTO(f_memcache_exists);
 
 #endif

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

@@ -62 +62 @@
 }
 
-CACHE_FUNC_PROTO(f_mysql_escape) {
+CACHE_FUNC_PROTO(f_memcache_exists) {
         UNUSED(srv);
         UNUSED(con);
@@ -68 +68 @@
         if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) {
                 log_error_write(srv, __FILE__, __LINE__, "sd", 
-                                "f_mysql_escape: I need a string:", 
+                                "f_memcache_exists: I need a string:", 
                                 p->params->ptr[0]->type);
                 
-                return -1;
-        }
-        
-        tnode_prepare_string(result);
-        buffer_copy_string_buffer(VAL_STRING(result), p->params->ptr[0]->data.str);
-        
-        return 0;
-}
-
-CACHE_FUNC_PROTO(f_mysql_query) {
-        UNUSED(srv);
-        UNUSED(con);
-        
-        if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) {
-                log_error_write(srv, __FILE__, __LINE__, "sd", 
-                                "f_mysql_query: I need a string:", 
-                                p->params->ptr[0]->type);
                 return -1;
         }
@@ -97 +80 @@
 }
 
-CACHE_FUNC_PROTO(f_mysql_connect) {
+CACHE_FUNC_PROTO(f_memcache_get) {
         UNUSED(srv);
         UNUSED(con);
         
-        if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) return -1;
-        if (p->params->ptr[1]->type != T_NODE_VALUE_STRING) return -1;
-        if (p->params->ptr[2]->type != T_NODE_VALUE_STRING) return -1;
-        if (p->params->ptr[3]->type != T_NODE_VALUE_STRING) return -1;
+        if (p->params->ptr[0]->type != T_NODE_VALUE_STRING) {
+                log_error_write(srv, __FILE__, __LINE__, "sd", 
+                                "f_memcache_get: I need a string:", 
+                                p->params->ptr[0]->type);
+                return -1;
+        }
         
-        tnode_prepare_long(result);
-        VAL_LONG(result) = 0;
+        tnode_prepare_string(result);
+        buffer_copy_string_buffer(VAL_STRING(result), p->params->ptr[0]->data.str);
         
         return 0;
 }
-

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

@@ -164 +164 @@
         
         cache_trigger_functions f[] = {
-                { "file.mtime",    1, f_file_mtime },
-                { "unix.time.now", 0, f_unix_time_now },
-                { "mysql.escape",  1, f_mysql_escape },
-                { "mysql.connect", 4, f_mysql_connect },
-                { "mysql.query",   1, f_mysql_query },
+                { "file.mtime",     1, f_file_mtime },
+                { "unix.time.now",  0, f_unix_time_now },
+                { "memcache.exits", 1, f_memcache_exists },
+                { "memcache.get",   1, f_memcache_get },
                 { NULL, 0, NULL },
         };
@@ -341 +340 @@
                                         
                                         /* parse parameters */
+                                        
+                                        tnode_val_array_reset(p->params);
                                         
                                         if (0 != cache_parse_parameters(srv, con, p, br_open + 1, t->used - slen - 3, p->params)) {