X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=694a962bcd27e53788cd64636b3b165396973e6a;hp=9a7cb45ae88a411f31fa58a3128687fc4e11ea9f;hb=f1aec8cff93dcd636dffb137cd7bdbd5f3c3dcff;hpb=755bbd9fa36e16f266467bed60b158e5737bd838

diff --git a/attribute.c b/attribute.c
index 9a7cb45a..694a962b 100644
--- a/attribute.c
+++ b/attribute.c
@@ -3,6 +3,8 @@
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
+
+/** \file attribute.c Attribute handling functions. */
 #include "para.h"
 #include "error.h"
 #include "afh.h"
@@ -10,7 +12,7 @@
 #include "string.h"
 #include "net.h"
 
-static void *attribute_table;
+static struct osl_table *attribute_table;
 static int greatest_att_bitnum;
 
 /** The columns of the attribute table. */
@@ -97,63 +99,79 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum)
 	return 1;
 }
 
-/** Whether "-a" was given for the lsatt command. */
-#define LSATT_FLAG_ALPHA 1
-/** Whether "-l" was given for the lsatt command. */
-#define LSATT_FLAG_LONG 2
+enum lsatt_flags {
+	/** Whether "-a" was given for the lsatt command. */
+	LSATT_FLAG_SORT_BY_ID = 1,
+	/** Whether "-l" was given for the lsatt command. */
+	LSATT_FLAG_LONG = 2,
+	LSATT_FLAG_REVERSE = 4
+};
 
-/** Data passed via osl_rbtree_loop(). */
-struct private_lsatt_data {
+/** Data passed to the action function of lsatt */
+struct lsatt_action_data {
+	/** The result buffer. */
+	struct para_buffer pb;
 	/** The given flags for the lsatt command. */
 	unsigned flags;
-	/** The result buffer. */
-	struct para_buffer b;
 };
 
-static int print_attribute(struct osl_row *row, void *private_data)
+static int print_attribute(struct osl_table *table, struct osl_row *row,
+		const char *name, void *data)
 {
-	struct private_lsatt_data *pld = private_data;
+	struct lsatt_action_data *laad = data;
+	struct osl_object bitnum_obj;
 	int ret;
-	struct osl_object name_obj, bitnum_obj;
 
-	ret = osl_get_object(attribute_table, row, ATTCOL_NAME, &name_obj);
-	if (ret < 0)
-		return ret;
-	if (!(pld->flags & LSATT_FLAG_LONG)) {
-		para_printf(&pld->b, "%s\n", (char *)name_obj.data);
+	if (!(laad->flags & LSATT_FLAG_LONG)) {
+		para_printf(&laad->pb, "%s\n", name);
 		return 1;
 	}
-	ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj);
-	if (ret < 0)
+	ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
+	if (ret < 0) {
+		para_printf(&laad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
 		return ret;
-	para_printf(&pld->b, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
-		(char *)name_obj.data);
+	}
+	para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
+		name);
 	return 1;
 }
 
 static int com_lsatt_callback(const struct osl_object *query,
 		struct osl_object *result)
 {
-	struct private_lsatt_data pld = {.flags = *(uint32_t *) query->data};
+	struct lsatt_action_data laad = {.flags = *(unsigned *) query->data};
+	struct pattern_match_data pmd = {
+		.table = attribute_table,
+		.loop_col_num = ATTCOL_BITNUM,
+		.match_col_num = ATTCOL_NAME,
+		.patterns = {.data = (char *)query->data + sizeof(laad.flags),
+			.size = query->size - sizeof(laad.flags)},
+		.pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING,
+		.data = &laad,
+		.action = print_attribute
+	};
 	int ret;
 
-	if (pld.flags & LSATT_FLAG_ALPHA)
-		ret = osl_rbtree_loop(attribute_table, ATTCOL_NAME,
-			&pld, print_attribute);
-	else
-		ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM,
-			&pld, print_attribute);
-	result->data = pld.b.buf;
-	result->size = pld.b.size;
-	return ret;
+	if (laad.flags & LSATT_FLAG_SORT_BY_ID)
+		pmd.loop_col_num = ATTCOL_NAME;
+	if (laad.flags & LSATT_FLAG_REVERSE)
+		pmd.pm_flags |= PM_REVERSE_LOOP;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		para_printf(&laad.pb, "%s\n", PARA_STRERROR(-ret));
+	if (!laad.pb.buf)
+		return 0;
+	result->data = laad.pb.buf;
+	result->size = laad.pb.size;
+	return 1;
 }
 
-
 int com_lsatt(int fd, int argc, char * const * const argv)
 {
+	unsigned flags = 0;
+	struct osl_object options = {.data = &flags, .size = sizeof(flags)},
+		result;
 	int ret, i;
-	uint32_t flags = 0;
-	struct osl_object query, result;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -163,24 +181,26 @@ int com_lsatt(int fd, int argc, char * const * const argv)
 			i++;
 			break;
 		}
-		if (!strcmp(arg, "-a")) {
-			flags |= LSATT_FLAG_ALPHA;
+		if (!strcmp(arg, "-i")) {
+			flags |= LSATT_FLAG_SORT_BY_ID;
 			continue;
 		}
 		if (!strcmp(arg, "-l")) {
 			flags |= LSATT_FLAG_LONG;
 			continue;
 		}
+		if (!strcmp(arg, "-r")) {
+			flags |= LSATT_FLAG_REVERSE;
+			continue;
+		}
 	}
-	if (argc > i)
-		return -E_ATTR_SYNTAX;
-	query.data = &flags;
-	query.size = sizeof(flags);
-	ret = send_callback_request(com_lsatt_callback, &query, &result);
+	ret = send_option_arg_callback_request(&options, argc -i, argv + i,
+		com_lsatt_callback, &result);
 	if (ret > 0) {
 		ret = send_buffer(fd, (char *)result.data);
 		free(result.data);
-	}
+	} else
+		send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
 	return ret;
 }
 
@@ -276,7 +296,7 @@ static int com_addatt_callback(const struct osl_object *query,
 		__a_unused struct osl_object *result)
 {
 	char *p = query->data;
-	uint64_t atts_added = 0;
+	unsigned atts_added = 0;
 	int ret;
 
 	while (p < (char *)query->data + query->size) {
@@ -310,17 +330,13 @@ static int com_addatt_callback(const struct osl_object *query,
 		if (ret < 0)
 			return ret;
 		greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
-		atts_added |= 1 << bitnum;
+		atts_added++;
 		p += strlen(p) + 1;
 	}
 	if (!atts_added)
 		return 1;
-	atts_added = ~atts_added;
-	ret = audio_file_loop(&atts_added, logical_and_attribute);
-	if (ret < 0)
-		return ret;
 	find_greatest_att_bitnum();
-	return mood_reload(); /* FIXME: mood_reload() returns an error */
+	return reload_current_mood(); /* FIXME: returns an error */
 }
 
 int com_addatt(__a_unused int fd, int argc, char * const * const argv)
@@ -330,40 +346,82 @@ int com_addatt(__a_unused int fd, int argc, char * const * const argv)
 	return send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
 		NULL);
 }
+struct remove_attribute_action_data {
+	struct para_buffer pb;
+	int num_removed;
+	uint64_t mask_of_removed_atts;
+};
+
+static int remove_attribute(struct osl_table *table, struct osl_row *row,
+		const char *name, void *data)
+{
+	struct remove_attribute_action_data *raad = data;
+	int ret = osl_del_row(table, row);
+	unsigned char bitnum;
+
+	if (ret < 0) {
+		para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		return 1;
+	}
+	ret = get_attribute_bitnum_by_name(name, &bitnum);
+	if (ret < 0) {
+		para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		return 1;
+	}
+	para_printf(&raad->pb, "removed %s\n", name);
+	raad->num_removed++;
+	raad->mask_of_removed_atts |= (1 << bitnum);
+	return 1;
+}
 
 static int com_rmatt_callback(const struct osl_object *query,
-		__a_unused struct osl_object *result)
+		struct osl_object *result)
 {
-	char *p = query->data;
-	int ret, atts_removed = 0;
-	while (p < (char *)query->data + query->size) {
-		struct osl_object obj = {
-			.data = p,
-			.size = strlen(p) + 1
-		};
-		struct osl_row *row;
-		ret = osl_get_row(attribute_table, ATTCOL_NAME,
-			&obj, &row);
+	struct remove_attribute_action_data raad = {.num_removed = 0};
+	int ret;
+	struct pattern_match_data pmd = {
+		.table = attribute_table,
+		.patterns = *query,
+		.loop_col_num = ATTCOL_BITNUM,
+		.match_col_num = ATTCOL_NAME,
+		.data = &raad,
+		.action = remove_attribute
+	};
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
+	if (raad.num_removed) {
+		uint64_t and_mask = ~raad.mask_of_removed_atts;
+		ret = audio_file_loop(&and_mask, logical_and_attribute);
 		if (ret < 0)
-			return ret;
-		ret = osl_del_row(attribute_table, row);
+			para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
+		find_greatest_att_bitnum();
+		ret = reload_current_mood();
 		if (ret < 0)
-			return ret;
-		atts_removed++;
-		p += strlen(p) + 1;
+			para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
 	}
-	find_greatest_att_bitnum();
-	if (!atts_removed)
-		return 1;
-	return mood_reload(); /* FIXME: Fix mood_reload() */
+	if (!raad.pb.buf)
+		para_printf(&raad.pb, "no match -- nothing removed\n");
+	result->data = raad.pb.buf;
+	result->size = raad.pb.size;
+	return 1;
 }
 
-int com_rmatt(__a_unused int fd, int argc, char * const * const argv)
+int com_rmatt(int fd, int argc, char * const * const argv)
 {
+	int ret;
+	struct osl_object result;
+
 	if (argc < 2)
 		return -E_ATTR_SYNTAX;
-	return send_standard_callback_request(argc, argv, com_rmatt_callback,
-		NULL);
+	ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
+		&result);
+	if (ret > 0) {
+		send_buffer(fd, (char *)result.data);
+		free(result.data);
+	} else
+		send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+	return ret;
 }
 
 /**
@@ -466,10 +524,9 @@ int attribute_init(struct table_info *ti, const char *db)
 
 	attribute_table_desc.dir = db;
 	ti->desc = &attribute_table_desc;
-	ret = osl_open_table(ti->desc, &ti->table);
+	ret = osl_open_table(ti->desc, &attribute_table);
 	greatest_att_bitnum = -1; /* no atts available */
 	if (ret >= 0) {
-		attribute_table = ti->table;
 		find_greatest_att_bitnum();
 		return ret;
 	}