frontend: Let the parser support brackets in matcher expressions.

[sysdb.git] / src / frontend / connection.c

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 4ba12dcdd568cf0449c45de60b3984607e5ce17d..12812c7132b20e35da6954757ddbcb5f6f2e7a7d 100644 (file)
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -29,6 +29,7 @@
 #include "core/object.h"
 #include "core/plugin.h"
 #include "frontend/connection-private.h"
+#include "frontend/parser.h"
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
@@ -206,7 +207,7 @@ sdb_conn_get_ctx(void)
  * Send a log message originating from the current thread to the client.
  */
 static int
-connection_log(int __attribute__((unused)) prio, const char *msg,
+connection_log(int prio, const char *msg,
                sdb_object_t __attribute__((unused)) *user_data)
 {
        sdb_conn_t *conn;
@@ -217,6 +218,10 @@ connection_log(int __attribute__((unused)) prio, const char *msg,
        if ((! conn) || (! conn->username))
                return 0;
 
+       /* XXX: make the log-level configurable by the client at runtime */
+       if (prio >= SDB_LOG_DEBUG)
+               return 0;
+
        /* TODO: Use CONNECTION_LOG_<prio>? */
        if (sdb_connection_send(conn, CONNECTION_LOG,
                                (uint32_t)strlen(msg), msg) < 0)
@@ -297,16 +302,38 @@ command_handle(sdb_conn_t *conn)
                                        node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
                        }
 
-                       if (node)
+                       if (node) {
                                status = sdb_fe_exec(conn, node);
+                               sdb_object_deref(SDB_OBJ(node));
+                       }
 
                        sdb_llist_destroy(parsetree);
                        break;
                }
 
+               case CONNECTION_FETCH:
+                       status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
+                       break;
                case CONNECTION_LIST:
                        status = sdb_fe_list(conn);
                        break;
+               case CONNECTION_LOOKUP:
+               {
+                       sdb_store_matcher_t *m;
+
+                       m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
+                                       (int)conn->cmd_len);
+                       if (! m) {
+                               sdb_log(SDB_LOG_ERR, "frontend: Failed to parse expression '%s'",
+                                               sdb_strbuf_string(conn->buf));
+                               status = -1;
+                               break;
+                       }
+
+                       status = sdb_fe_lookup(conn, m);
+                       sdb_object_deref(SDB_OBJ(m));
+                       break;
+               }
 
                default:
                {