--- rhythmbox-0.8.8.orig/rhythmdb/rhythmdb-query-parser.l	1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox-0.8.8.perso/rhythmdb/rhythmdb-query-parser.l	2005-04-02 19:41:48.000000000 +0200
@@ -0,0 +1,373 @@
+/*
+ *  arch-tag: Lex code for the query parser.
+ *
+ *  Copyright (C) 2005 Gabriel de Perthuis <Gabriel.de-Perthuis@laPoste.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+/*
+	Syntax:
+	by the cranberries OR in album big calm OR (by Rinôçerôse AND NOT in album installation sonore)
+	par the cranberries OU album big calm OU (par Rinôçerôse ET PAS album installation sonore)
+	
+	AND will have priority over OR: ie A OR B AND C means A OR (B AND C)
+	(because rhythmdb queries are like that)
+
+	question: two word keywords?
+	do it by using s instead of yytext in is_kwd.
+	depends if the syntax benefits.
+
+	
+
+	note: could do implicit AND
+
+	Note: the syntax could be extended for both 'property' and 'criterium'.
+	eg rated over 4. translation, though.
+	
+	Translating: is the prefix grammar common to all languages? Well, we
+	can fallback on petit-nègre, not too unusual in the field.
+*/
+/*
+	The returned query is only syntaxically correct.
+	The query_parse should ensure it is also grammatically correct.
+	(no difference for now, but with more argument types I must beware)
+*/
+
+%option noyywrap reentrant nodefault
+%option warn perf-report
+/*%option debug*/
+
+%{
+	#include <stdio.h> //string to stream
+	#include <glib.h> //GPtrArray
+	
+	#include <glib/gi18n.h> //_(), Q_()
+	
+	#include "rhythmdb.h" //Queries
+
+	#include "rhythmdb-query-parser.h"
+
+	typedef enum {
+		AND,
+		OR
+	} AndOr;
+
+	typedef struct {
+		RhythmDB* db;
+		GPtrArray* query;
+
+		char* s;
+		int s_position;
+
+		gboolean not;
+		gboolean fuzzy; /* marks both fuzzy (ie match part of it) and folded */
+		RhythmDBQueryType query_type;
+		RhythmDBPropType prop_type;
+
+		int mark;
+		int mark_end;
+	} Status;
+	#define YY_EXTRA_TYPE Status*
+	//See the start states below to find where fields are used
+
+	#define YY_USER_ACTION yyextra->s_position += yyleng;
+#if 1
+	#define yyterminate return
+#else //for breaking in gdb
+	int myyyterminate (int i){
+		printf("myyterminate %d\n", i);
+		return i;
+	}
+	#define yyterminate(i) {myyyterminate(i); return i;}
+#endif
+
+/*todo: propagate messages with errors*/
+	static GPtrArray* scan_query(RhythmDB*, char*);	
+	static gboolean prop_or_modif(char* word, gboolean* not, gboolean* fuzzy, RhythmDBQueryType*, RhythmDBPropType*);
+	static gboolean binary_keyword(char*, AndOr*);
+	static int query_append_string_chunk(Status*);
+%}
+
+
+DIGIT		[[:digit:]]
+NUMBER		{DIGIT}+("."{DIGIT}*)?
+SPACING		[ ]+
+
+WORD		[[:alnum:]]+
+
+/*INITIAL used for errors on «[^ ]». Non exclusive rules inherit.
+	As a consequence, rules that pass on . are %x exclusive*/
+/*
+	before writing a BEGIN(), be sure to initialise these:
+	strarg uses mark and end_mark
+	paren uses mark
+	args use prop_type and query_type
+	kwdormodif uses not, fuzzy, and whether query_type is none
+*/
+%s		KWDORMODIF
+
+%s		STRARG
+%s		NUMARG
+
+%s		PAREN
+%s		AFTERPAREN
+
+
+%%
+	if(YY_START == INITIAL){
+		yyextra->not = FALSE;
+		yyextra->fuzzy = TRUE;
+		yyextra->query_type = RHYTHMDB_QUERY_END;
+		BEGIN(KWDORMODIF); //could be locale-dependent?
+	}
+
+<KWDORMODIF>{WORD} {
+	if(prop_or_modif(yytext, &yyextra->not, &yyextra->fuzzy, &(yyextra->query_type), &(yyextra->prop_type))){
+		fprintf(stderr, "prop keyword or modifier: %s\n", yytext);
+	} else {
+		if(yyextra->query_type == RHYTHMDB_QUERY_END){
+			yyterminate(1);
+			//expecting keyword!
+		}
+		yyextra->mark = yyextra->s_position - yyleng;
+		yyextra->mark_end = yyextra->s_position;
+		BEGIN(STRARG);
+	}
+}
+<KWDORMODIF>"(" {
+	if(yyextra->query_type != RHYTHMDB_QUERY_END){
+		yyterminate(1);
+		//keyword then (
+		//note: we aren't catching errors like «exactly (a or b)»
+	}
+
+	fprintf(stderr, "subquery\n");
+	yyextra->mark = yyextra->s_position;
+	BEGIN(PAREN);
+}
+<NUMARG>NUMBER {
+	float f=0;
+	sscanf(yytext, "%f", &f);
+}
+
+<STRARG>{WORD} {
+	AndOr andor;
+	if(binary_keyword(yytext, &andor)){
+		if(query_append_string_chunk(yyextra))
+			yyterminate(1);
+
+		fprintf(stderr, "binary keyword: %s\n", yytext);
+//AND is implicit
+		if(andor == OR){
+			rhythmdb_query_append(yyextra->db, yyextra->query, RHYTHMDB_QUERY_DISJUNCTION, RHYTHMDB_QUERY_END);
+		}
+
+		yyextra->mark = yyextra->s_position;
+		yyextra->not = FALSE;
+		yyextra->fuzzy = TRUE;
+		yyextra->query_type = RHYTHMDB_QUERY_END;
+		BEGIN(KWDORMODIF);
+	} else {
+		yyextra->mark_end = yyextra->s_position;
+	}
+}
+
+<STRARG><<EOF>> {
+	if(query_append_string_chunk(yyextra))
+		yyterminate(1);
+	yyterminate(0);
+}
+
+<PAREN>[^)] {
+}
+<PAREN>")" {
+	(yyextra->s)[(yyextra->s_position - 1)] = '\0';
+	GPtrArray* subquery = scan_query(yyextra->db, yyextra->s + yyextra->mark);
+	if(subquery == NULL)
+		yyterminate(1);
+			rhythmdb_query_append(yyextra->db, yyextra->query, RHYTHMDB_QUERY_SUBQUERY, subquery, RHYTHMDB_QUERY_END);
+	BEGIN(AFTERPAREN);
+}
+<PAREN><<EOF>> {
+	//MAJOR FATAL ERROR DE SYNTAX
+	//manque )
+	yyterminate(1);
+}
+
+<AFTERPAREN>{WORD} {
+	AndOr andor;
+	if(binary_keyword(yytext, &andor)){
+		fprintf(stderr, "binary keyword: %s\n", yytext);
+
+//AND is implicit
+		if(andor == OR){
+			rhythmdb_query_append(yyextra->db, yyextra->query, RHYTHMDB_QUERY_DISJUNCTION, RHYTHMDB_QUERY_END);
+		}
+
+		yyextra->mark = yyextra->s_position;
+		yyextra->not = FALSE;
+		yyextra->fuzzy = TRUE;
+		yyextra->query_type = RHYTHMDB_QUERY_END;
+		BEGIN(KWDORMODIF);
+	} else {
+		yyterminate (1);
+	}
+}
+
+<AFTERPAREN><<EOF>> {
+	yyterminate(0);
+}
+
+<*>{SPACING} {
+}
+
+[)] {
+	//ERREUR
+	//Message spécial si )
+	yyterminate(1);
+}
+
+<*>.|\n {
+	//ERREUR - last resort, since shortest and at the end.
+	yyterminate(1);
+}
+
+<<EOF>> {
+	//EOF without a condition must be at the end
+	//ERREUR - manque argument - manque ) est à part
+	yyterminate(1);
+}
+%%
+
+/*returns whether was special*/
+/*TODO: move the ?: to the query_append - because of «by not»*/
+static gboolean prop_or_modif(char* s, gboolean* not, gboolean* fuzzy, RhythmDBQueryType* qtype, RhythmDBPropType* ptype){
+	if(!strcasecmp(s, Q_("keyword|in"))){
+		if(*qtype != RHYTHMDB_QUERY_END)
+			return FALSE;
+		*qtype = *not? RHYTHMDB_QUERY_PROP_NOT_LIKE : RHYTHMDB_QUERY_PROP_LIKE;
+		*ptype = RHYTHMDB_PROP_ALBUM_FOLDED;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("keyword|by"))){
+		if(*qtype != RHYTHMDB_QUERY_END)
+			return FALSE;
+		*qtype = *not? RHYTHMDB_QUERY_PROP_NOT_LIKE : RHYTHMDB_QUERY_PROP_LIKE;
+		*ptype = RHYTHMDB_PROP_ARTIST_FOLDED;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("keyword|not"))){
+		*not = !*not;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("keyword|exactly"))){
+		*fuzzy = FALSE;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean binary_keyword(char* s, AndOr* andor){
+	if(!strcasecmp(s, Q_("Keyword|or"))){
+		*andor = OR;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("Keyword|and"))){
+		*andor = AND;
+		return TRUE;
+	}	
+	return FALSE;
+}
+
+/*TODO: handle not and fuzzy here*/
+static int query_append_string_chunk(Status* s){
+	int length = s->mark_end - s->mark;
+	if(length <= 0)
+		return 1;
+#if 1
+	char* s2 = malloc((length+1)*sizeof(char));
+	memcpy(s2, s->s + s->mark, length);
+	s2[length]='\0';
+#else
+	char* s2 = g_utf8_casefold(s->s + s->mark, length);
+#endif
+	fprintf(stderr, "string arg: «%s»\n", s2);
+	rhythmdb_query_append(s->db, s->query, s->query_type, s->prop_type, s2, RHYTHMDB_QUERY_END);
+	return 0;
+}
+
+/*warning: this will punch little holes in your string.*/
+static GPtrArray* scan_query(RhythmDB* db, char* s){
+	yyscan_t scanner;
+	Status status;
+
+	status.db = db;
+	status.query = g_ptr_array_new ();
+	status.s = s;
+	status.s_position = 0;
+	status.mark_end = 0;
+
+	yylex_init(&scanner);
+	yyset_extra(&status, scanner);
+//	yyset_debug(TRUE, scanner);
+/*
+	//Possibly using a flex-specific scan from string would speed up a few peanuts.
+	//need to add \0\0, etc...
+	YY_BUFFER_STATE buff = yy_scan_buffer(s, strlen(s));
+	yy_delete_buffer(buff);
+*/
+	yyset_in(fmemopen (s, strlen (s), "r"), scanner);
+	int err = yylex(scanner);
+	fclose(yyget_in(scanner));
+	yylex_destroy(scanner);
+	if(err){
+		rhythmdb_query_free(status.query);
+		status.query = NULL;
+	}
+	return status.query;
+}
+
+/*for public use, a long long name*/
+GPtrArray* rhythmdb_query_parse_from_string(RhythmDB* db, const char* s) {
+	char* s2 = strdup(s);
+	GPtrArray* r = scan_query(db, strdup(s));
+	free(s2);
+	if(r){
+		char* s3 = rhythmdb_query_print(r);
+		if(s3)
+			fprintf(stderr, "printed: «%s»\n", s3);
+		else
+			//This, or the print method, is wrong.
+			//TODO: compare if same - here it is fuzzy, but with chosen examples would make good tests.
+			fprintf(stderr, "Something's fishy !\n");
+	}
+	return r;
+}
+
+#if 0 //for testing
+int main(int argc, char** argv){
+	char*s;
+	if(argc != 2)
+		s = strdup("by any chance or (by someone else and by the way)");
+	else
+		s = argv[1];
+	GPtrArray* r = scan_query(NULL, s);
+	if(!r)
+		printf("We got an error\n");
+	exit(!r);
+}
+#endif
--- rhythmbox-0.8.8.orig/rhythmdb/rhythmdb-query-parser.c	1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox-0.8.8.perso/rhythmdb/rhythmdb-query-parser.c	2005-04-04 02:26:00.000000000 +0200
@@ -0,0 +1,2272 @@
+
+#line 3 "rhythmdb-query-parser.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+#if __STDC__
+
+#define YY_USE_CONST
+
+#endif	/* __STDC__ */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* An opaque pointer. */
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
+typedef void* yyscan_t;
+#endif
+
+/* For convenience, these vars (plus the bison vars far below)
+   are macros in the reentrant scanner. */
+#define yyin yyg->yyin_r
+#define yyout yyg->yyout_r
+#define yyextra yyg->yyextra_r
+#define yyleng yyg->yyleng_r
+#define yytext yyg->yytext_r
+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
+#define yy_flex_debug yyg->yy_flex_debug_r
+
+int yylex_init (yyscan_t* scanner);
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN yyg->yy_start = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START ((yyg->yy_start - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin ,yyscanner )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = yyg->yy_hold_char; \
+		YY_RESTORE_YY_MORE_OFFSET \
+		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
+                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
+
+void yyrestart (FILE *input_file ,yyscan_t yyscanner );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
+void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void yypop_buffer_state (yyscan_t yyscanner );
+
+static void yyensure_buffer_stack (yyscan_t yyscanner );
+static void yy_load_buffer_state (yyscan_t yyscanner );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+
+void *yyalloc (yy_size_t ,yyscan_t yyscanner );
+void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
+void yyfree (void * ,yyscan_t yyscanner );
+
+#define yy_new_buffer yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (yyscanner); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (yyscanner); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define yywrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+typedef int yy_state_type;
+
+#define yytext_ptr yytext_r
+
+static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
+static int yy_get_next_buffer (yyscan_t yyscanner );
+static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	yyg->yytext_ptr = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyg->yy_hold_char = *yy_cp; \
+	*yy_cp = '\0'; \
+	yyg->yy_c_buf_p = yy_cp;
+
+#define YY_NUM_RULES 11
+#define YY_END_OF_BUFFER 12
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[35] =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   12,   10,    8,    9,    2,    1,    4,   10,
+        5,    5,    6,    7,    8,    1,    4,    0,    7,    0,
+        0,    0,    3,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    3,    1,    1,    1,    1,    1,    1,    1,    4,
+        5,    1,    1,    1,    1,    1,    1,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    1,    1,    1,
+        1,    1,    1,    1,    6,    7,    6,    6,    8,    6,
+        6,    6,    6,    6,    6,    6,    9,   10,    6,    6,
+        6,   11,    6,    6,   12,    6,    6,    6,    6,    6,
+        1,    1,    1,    1,    1,    1,    6,    6,    6,    6,
+
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[13] =
+    {   0,
+        1,    1,    1,    1,    1,    2,    2,    2,    2,    2,
+        2,    2
+    } ;
+
+static yyconst flex_int16_t yy_base[40] =
+    {   0,
+        0,    3,    8,    0,   20,    0,   30,    0,   38,   41,
+       46,    0,   64,   65,   60,   65,   65,    0,    0,   33,
+       65,   39,   65,    0,   36,    0,    0,   29,    0,   30,
+       28,   23,   65,   65,   58,   60,    5,    2,    0
+    } ;
+
+static yyconst flex_int16_t yy_def[40] =
+    {   0,
+       35,   35,   34,    3,   34,    5,   35,    7,   36,   36,
+       34,   11,   34,   34,   34,   34,   34,   37,   38,   34,
+       34,   34,   34,   39,   34,   37,   38,   34,   39,   34,
+       34,   34,   34,    0,   34,   34,   34,   34,   34
+    } ;
+
+static yyconst flex_int16_t yy_nxt[78] =
+    {   0,
+       34,   29,   15,   27,   16,   15,   26,   16,   14,   14,
+       15,   17,   16,   18,   18,   18,   18,   18,   18,   18,
+       14,   14,   15,   14,   16,   19,   19,   19,   19,   19,
+       19,   19,   15,   33,   16,   32,   31,   30,   25,   20,
+       22,   25,   23,   22,   28,   23,   14,   14,   15,   14,
+       16,   24,   24,   24,   24,   24,   24,   24,   14,   14,
+       21,   21,   25,   34,   13,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34
+    } ;
+
+static yyconst flex_int16_t yy_chk[78] =
+    {   0,
+        0,   39,    1,   38,    1,    2,   37,    2,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    7,   32,    7,   31,   30,   28,   25,    7,
+        9,   22,    9,   10,   20,   10,   11,   11,   11,   11,
+       11,   11,   11,   11,   11,   11,   11,   11,   35,   35,
+       36,   36,   15,   13,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34
+    } ;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+#line 1 "rhythmdb-query-parser.l"
+/*
+ *  arch-tag: Lex code for the query parser.
+ *
+ *  Copyright (C) 2005 Gabriel de Perthuis <Gabriel.de-Perthuis@laPoste.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+/*
+	Syntax:
+	by the cranberries OR in album big calm OR (by Rinôçerôse AND NOT in album installation sonore)
+	par the cranberries OU album big calm OU (par Rinôçerôse ET PAS album installation sonore)
+	
+	AND will have priority over OR: ie A OR B AND C means A OR (B AND C)
+	(because rhythmdb queries are like that)
+
+	question: two word keywords?
+	do it by using s instead of yytext in is_kwd.
+	depends if the syntax benefits.
+
+	
+
+	note: could do implicit AND
+
+	Note: the syntax could be extended for both 'property' and 'criterium'.
+	eg rated over 4. translation, though.
+	
+	Translating: is the prefix grammar common to all languages? Well, we
+	can fallback on petit-nègre, not too unusual in the field.
+*/
+/*
+	The returned query is only syntaxically correct.
+	The query_parse should ensure it is also grammatically correct.
+	(no difference for now, but with more argument types I must beware)
+*/
+/*%option debug*/
+#line 55 "rhythmdb-query-parser.l"
+	#include <stdio.h> //string to stream
+	#include <glib.h> //GPtrArray
+	
+	#include <glib/gi18n.h> //_(), Q_()
+	
+	#include "rhythmdb.h" //Queries
+
+	#include "rhythmdb-query-parser.h"
+
+	typedef enum {
+		AND,
+		OR
+	} AndOr;
+
+	typedef struct {
+		RhythmDB* db;
+		GPtrArray* query;
+
+		char* s;
+		int s_position;
+
+		gboolean not;
+		gboolean fuzzy; /* marks both fuzzy (ie match part of it) and folded */
+		RhythmDBQueryType query_type;
+		RhythmDBPropType prop_type;
+
+		int mark;
+		int mark_end;
+	} Status;
+	#define YY_EXTRA_TYPE Status*
+	//See the start states below to find where fields are used
+
+	#define YY_USER_ACTION yyextra->s_position += yyleng;
+#if 1
+	#define yyterminate return
+#else //for breaking in gdb
+	int myyyterminate (int i){
+		printf("myyterminate %d\n", i);
+		return i;
+	}
+	#define yyterminate(i) {myyyterminate(i); return i;}
+#endif
+
+/*todo: propagate messages with errors*/
+	static GPtrArray* scan_query(RhythmDB*, char*);	
+	static gboolean prop_or_modif(char* word, gboolean* not, gboolean* fuzzy, RhythmDBQueryType*, RhythmDBPropType*);
+	static gboolean binary_keyword(char*, AndOr*);
+	static int query_append_string_chunk(Status*);
+/*INITIAL used for errors on «[^ ]». Non exclusive rules inherit.
+	As a consequence, rules that pass on . are %x exclusive*/
+/*
+	before writing a BEGIN(), be sure to initialise these:
+	strarg uses mark and end_mark
+	paren uses mark
+	args use prop_type and query_type
+	kwdormodif uses not, fuzzy, and whether query_type is none
+*/
+
+
+
+
+
+#line 560 "rhythmdb-query-parser.c"
+
+#define INITIAL 0
+#define KWDORMODIF 1
+#define STRARG 2
+#define NUMARG 3
+#define PAREN 4
+#define AFTERPAREN 5
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Holds the entire state of the reentrant scanner. */
+struct yyguts_t
+    {
+
+    /* User-defined. Not touched by flex. */
+    YY_EXTRA_TYPE yyextra_r;
+
+    /* The rest are the same as the globals declared in the non-reentrant scanner. */
+    FILE *yyin_r, *yyout_r;
+    size_t yy_buffer_stack_top; /**< index of top of stack. */
+    size_t yy_buffer_stack_max; /**< capacity of stack. */
+    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+    char yy_hold_char;
+    int yy_n_chars;
+    int yyleng_r;
+    char *yy_c_buf_p;
+    int yy_init;
+    int yy_start;
+    int yy_did_buffer_switch_on_eof;
+    int yy_start_stack_ptr;
+    int yy_start_stack_depth;
+    int *yy_start_stack;
+    yy_state_type yy_last_accepting_state;
+    char* yy_last_accepting_cpos;
+
+    int yylineno_r;
+    int yy_flex_debug_r;
+
+    char *yytext_r;
+    int yy_more_flag;
+    int yy_more_len;
+
+    }; /* end struct yyguts_t */
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (yyscan_t yyscanner );
+
+int yyget_debug (yyscan_t yyscanner );
+
+void yyset_debug (int debug_flag ,yyscan_t yyscanner );
+
+YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
+
+FILE *yyget_in (yyscan_t yyscanner );
+
+void yyset_in  (FILE * in_str ,yyscan_t yyscanner );
+
+FILE *yyget_out (yyscan_t yyscanner );
+
+void yyset_out  (FILE * out_str ,yyscan_t yyscanner );
+
+int yyget_leng (yyscan_t yyscanner );
+
+char *yyget_text (yyscan_t yyscanner );
+
+int yyget_lineno (yyscan_t yyscanner );
+
+void yyset_lineno (int line_number ,yyscan_t yyscanner );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (yyscan_t yyscanner );
+#else
+extern int yywrap (yyscan_t yyscanner );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (yyscan_t yyscanner );
+#else
+static int input (yyscan_t yyscanner );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (yyscan_t yyscanner);
+
+#define YY_DECL int yylex (yyscan_t yyscanner)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+#line 130 "rhythmdb-query-parser.l"
+
+	if(YY_START == INITIAL){
+		yyextra->not = FALSE;
+		yyextra->fuzzy = TRUE;
+		yyextra->query_type = RHYTHMDB_QUERY_END;
+		BEGIN(KWDORMODIF); //could be locale-dependent?
+	}
+
+#line 789 "rhythmdb-query-parser.c"
+
+	if ( yyg->yy_init )
+		{
+		yyg->yy_init = 0;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! yyg->yy_start )
+			yyg->yy_start = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack (yyscanner);
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+		}
+
+		yy_load_buffer_state(yyscanner );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = yyg->yy_c_buf_p;
+
+		/* Support of yytext. */
+		*yy_cp = yyg->yy_hold_char;
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = yyg->yy_start;
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				yyg->yy_last_accepting_state = yy_current_state;
+				yyg->yy_last_accepting_cpos = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 35 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 65 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = yyg->yy_hold_char;
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 138 "rhythmdb-query-parser.l"
+{
+	if(prop_or_modif(yytext, &yyextra->not, &yyextra->fuzzy, &(yyextra->query_type), &(yyextra->prop_type))){
+		fprintf(stderr, "prop keyword or modifier: %s\n", yytext);
+	} else {
+		if(yyextra->query_type == RHYTHMDB_QUERY_END){
+			yyterminate(1);
+			//expecting keyword!
+		}
+		yyextra->mark = yyextra->s_position - yyleng;
+		yyextra->mark_end = yyextra->s_position;
+		BEGIN(STRARG);
+	}
+}
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 151 "rhythmdb-query-parser.l"
+{
+	if(yyextra->query_type != RHYTHMDB_QUERY_END){
+		yyterminate(1);
+		//keyword then (
+		//note: we aren't catching errors like «exactly (a or b)»
+	}
+
+	fprintf(stderr, "subquery\n");
+	yyextra->mark = yyextra->s_position;
+	BEGIN(PAREN);
+}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 162 "rhythmdb-query-parser.l"
+{
+	float f=0;
+	sscanf(yytext, "%f", &f);
+}
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 167 "rhythmdb-query-parser.l"
+{
+	AndOr andor;
+	if(binary_keyword(yytext, &andor)){
+		if(query_append_string_chunk(yyextra))
+			yyterminate(1);
+
+		fprintf(stderr, "binary keyword: %s\n", yytext);
+//AND is implicit
+		if(andor == OR){
+			rhythmdb_query_append(yyextra->db, yyextra->query, RHYTHMDB_QUERY_DISJUNCTION, RHYTHMDB_QUERY_END);
+		}
+
+		yyextra->mark = yyextra->s_position;
+		yyextra->not = FALSE;
+		yyextra->fuzzy = TRUE;
+		yyextra->query_type = RHYTHMDB_QUERY_END;
+		BEGIN(KWDORMODIF);
+	} else {
+		yyextra->mark_end = yyextra->s_position;
+	}
+}
+	YY_BREAK
+case YY_STATE_EOF(STRARG):
+#line 189 "rhythmdb-query-parser.l"
+{
+	if(query_append_string_chunk(yyextra))
+		yyterminate(1);
+	yyterminate(0);
+}
+	YY_BREAK
+case 5:
+/* rule 5 can match eol */
+YY_RULE_SETUP
+#line 195 "rhythmdb-query-parser.l"
+{
+}
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 197 "rhythmdb-query-parser.l"
+{
+	(yyextra->s)[(yyextra->s_position - 1)] = '\0';
+	GPtrArray* subquery = scan_query(yyextra->db, yyextra->s + yyextra->mark);
+	if(subquery == NULL)
+		yyterminate(1);
+			rhythmdb_query_append(yyextra->db, yyextra->query, RHYTHMDB_QUERY_SUBQUERY, subquery, RHYTHMDB_QUERY_END);
+	BEGIN(AFTERPAREN);
+}
+	YY_BREAK
+case YY_STATE_EOF(PAREN):
+#line 205 "rhythmdb-query-parser.l"
+{
+	//MAJOR FATAL ERROR DE SYNTAX
+	//manque )
+	yyterminate(1);
+}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 211 "rhythmdb-query-parser.l"
+{
+	AndOr andor;
+	if(binary_keyword(yytext, &andor)){
+		fprintf(stderr, "binary keyword: %s\n", yytext);
+
+//AND is implicit
+		if(andor == OR){
+			rhythmdb_query_append(yyextra->db, yyextra->query, RHYTHMDB_QUERY_DISJUNCTION, RHYTHMDB_QUERY_END);
+		}
+
+		yyextra->mark = yyextra->s_position;
+		yyextra->not = FALSE;
+		yyextra->fuzzy = TRUE;
+		yyextra->query_type = RHYTHMDB_QUERY_END;
+		BEGIN(KWDORMODIF);
+	} else {
+		yyterminate (1);
+	}
+}
+	YY_BREAK
+case YY_STATE_EOF(AFTERPAREN):
+#line 231 "rhythmdb-query-parser.l"
+{
+	yyterminate(0);
+}
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 235 "rhythmdb-query-parser.l"
+{
+}
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 238 "rhythmdb-query-parser.l"
+{
+	//ERREUR
+	//Message spécial si )
+	yyterminate(1);
+}
+	YY_BREAK
+case 10:
+/* rule 10 can match eol */
+YY_RULE_SETUP
+#line 244 "rhythmdb-query-parser.l"
+{
+	//ERREUR - last resort, since shortest and at the end.
+	yyterminate(1);
+}
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(KWDORMODIF):
+case YY_STATE_EOF(NUMARG):
+#line 249 "rhythmdb-query-parser.l"
+{
+	//EOF without a condition must be at the end
+	//ERREUR - manque argument - manque ) est à part
+	yyterminate(1);
+}
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 254 "rhythmdb-query-parser.l"
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+#line 1040 "rhythmdb-query-parser.c"
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = yyg->yy_hold_char;
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state( yyscanner );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
+
+			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++yyg->yy_c_buf_p;
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = yyg->yy_c_buf_p;
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer( yyscanner ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				yyg->yy_did_buffer_switch_on_eof = 0;
+
+				if ( yywrap(yyscanner ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				yyg->yy_c_buf_p =
+					yyg->yytext_ptr + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state( yyscanner );
+
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				yyg->yy_c_buf_p =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
+
+				yy_current_state = yy_get_previous_state( yyscanner );
+
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = yyg->yytext_ptr;
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
+
+	else
+		{
+			size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			yyg->yy_n_chars, num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	if ( yyg->yy_n_chars == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyrestart(yyin  ,yyscanner);
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	yyg->yy_n_chars += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+
+	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	yy_current_state = yyg->yy_start;
+
+	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			yyg->yy_last_accepting_state = yy_current_state;
+			yyg->yy_last_accepting_cpos = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 35 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
+{
+	register int yy_is_jam;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	register char *yy_cp = yyg->yy_c_buf_p;
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		yyg->yy_last_accepting_state = yy_current_state;
+		yyg->yy_last_accepting_cpos = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 35 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 34);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
+{
+	register char *yy_cp;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+    yy_cp = yyg->yy_c_buf_p;
+
+	/* undo effects of setting up yytext */
+	*yy_cp = yyg->yy_hold_char;
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = yyg->yy_n_chars + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	yyg->yytext_ptr = yy_bp;
+	yyg->yy_hold_char = *yy_cp;
+	yyg->yy_c_buf_p = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (yyscan_t yyscanner)
+#else
+    static int input  (yyscan_t yyscanner)
+#endif
+
+{
+	int c;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	*yyg->yy_c_buf_p = yyg->yy_hold_char;
+
+	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			/* This was really a NUL. */
+			*yyg->yy_c_buf_p = '\0';
+
+		else
+			{ /* need more input */
+			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+			++yyg->yy_c_buf_p;
+
+			switch ( yy_get_next_buffer( yyscanner ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					yyrestart(yyin ,yyscanner);
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( yywrap(yyscanner ) )
+						return EOF;
+
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput(yyscanner);
+#else
+					return input(yyscanner);
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
+	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
+	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * @param yyscanner The scanner object.
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack (yyscanner);
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+	}
+
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
+	yy_load_buffer_state(yyscanner );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * @param yyscanner The scanner object.
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack (yyscanner);
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state(yyscanner );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	yyg->yy_did_buffer_switch_on_eof = 1;
+}
+
+static void yy_load_buffer_state  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyg->yy_hold_char = *yyg->yy_c_buf_p;
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * @param yyscanner The scanner object.
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	yy_init_buffer(b,file ,yyscanner);
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * @param yyscanner The scanner object.
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		yyfree((void *) b->yy_ch_buf ,yyscanner );
+
+	yyfree((void *) b ,yyscanner );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
+
+{
+	int oerrno = errno;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	yy_flush_buffer(b ,yyscanner);
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * @param yyscanner The scanner object.
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state(yyscanner );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  @param yyscanner The scanner object.
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack(yyscanner);
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		yyg->yy_buffer_stack_top++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state(yyscanner );
+	yyg->yy_did_buffer_switch_on_eof = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  @param yyscanner The scanner object.
+ */
+void yypop_buffer_state (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if (yyg->yy_buffer_stack_top > 0)
+		--yyg->yy_buffer_stack_top;
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state(yyscanner );
+		yyg->yy_did_buffer_switch_on_eof = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (yyscan_t yyscanner)
+{
+	int num_to_alloc;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if (!yyg->yy_buffer_stack) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
+		
+		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		yyg->yy_buffer_stack_max = num_to_alloc;
+		yyg->yy_buffer_stack_top = 0;
+		return;
+	}
+
+	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
+		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc
+								(yyg->yy_buffer_stack,
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
+
+		/* zero only the new slots.*/
+		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
+		yyg->yy_buffer_stack_max = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yy_switch_to_buffer(b ,yyscanner );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str , yyscan_t yyscanner)
+{
+    
+	return yy_scan_bytes(yy_str,strlen(yy_str) ,yyscanner);
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = len + 2;
+	buf = (char *) yyalloc(n ,yyscanner );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
+
+	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer(buf,n ,yyscanner);
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = yyg->yy_hold_char; \
+		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
+		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
+		*yyg->yy_c_buf_p = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the user-defined data for this scanner.
+ * @param yyscanner The scanner object.
+ */
+YY_EXTRA_TYPE yyget_extra  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyextra;
+}
+
+/** Get the current line number.
+ * @param yyscanner The scanner object.
+ */
+int yyget_lineno  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yylineno;
+}
+
+/** Get the current column number.
+ * @param yyscanner The scanner object.
+ */
+int yyget_column  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yycolumn;
+}
+
+/** Get the input stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *yyget_in  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyin;
+}
+
+/** Get the output stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *yyget_out  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyout;
+}
+
+/** Get the length of the current token.
+ * @param yyscanner The scanner object.
+ */
+int yyget_leng  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyleng;
+}
+
+/** Get the current token.
+ * @param yyscanner The scanner object.
+ */
+
+char *yyget_text  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yytext;
+}
+
+/** Set the user-defined data. This data is never touched by the scanner.
+ * @param user_defined The data to be associated with this scanner.
+ * @param yyscanner The scanner object.
+ */
+void yyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyextra = user_defined ;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void yyset_lineno (int  line_number , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+        /* lineno is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); 
+    
+    yylineno = line_number;
+}
+
+/** Set the current column.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void yyset_column (int  column_no , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+        /* column is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           yy_fatal_error( "yyset_column called with no buffer" , yyscanner); 
+    
+    yycolumn = column_no;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * @param yyscanner The scanner object.
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyout = out_str ;
+}
+
+int yyget_debug  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yy_flex_debug = bdebug ;
+}
+
+/* Accessor methods for yylval and yylloc */
+
+static int yy_init_globals (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    /* Initialization is the same as for the non-reentrant scanner.
+       This function is called once per scanner lifetime. */
+
+    yyg->yy_buffer_stack = 0;
+    yyg->yy_buffer_stack_top = 0;
+    yyg->yy_buffer_stack_max = 0;
+    yyg->yy_c_buf_p = (char *) 0;
+    yyg->yy_init = 1;
+    yyg->yy_start = 0;
+    yyg->yy_start_stack_ptr = 0;
+    yyg->yy_start_stack_depth = 0;
+    yyg->yy_start_stack = (int *) 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* User-visible API */
+
+/* yylex_init is special because it creates the scanner itself, so it is
+ * the ONLY reentrant function that doesn't take the scanner as the last argument.
+ * That's why we explicitly handle the declaration, instead of using our macros.
+ */
+
+int yylex_init(yyscan_t* ptr_yy_globals)
+
+{
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+
+    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
+
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+
+    memset(*ptr_yy_globals,0,sizeof(struct yyguts_t));
+
+    return yy_init_globals ( *ptr_yy_globals );
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state(yyscanner);
+	}
+
+	/* Destroy the stack itself. */
+	yyfree(yyg->yy_buffer_stack ,yyscanner);
+	yyg->yy_buffer_stack = NULL;
+
+    /* Destroy the start condition stack. */
+        yyfree(yyg->yy_start_stack ,yyscanner );
+        yyg->yy_start_stack = NULL;
+
+    /* Destroy the main struct (reentrant only). */
+    yyfree ( yyscanner , yyscanner );
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
+{
+	register int i;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
+{
+	register int n;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *yyalloc (yy_size_t  size , yyscan_t yyscanner)
+{
+	return (void *) malloc( size );
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void yyfree (void * ptr , yyscan_t yyscanner)
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
+#line 254 "rhythmdb-query-parser.l"
+
+
+
+/*returns whether was special*/
+/*TODO: move the ?: to the query_append - because of «by not»*/
+static gboolean prop_or_modif(char* s, gboolean* not, gboolean* fuzzy, RhythmDBQueryType* qtype, RhythmDBPropType* ptype){
+	if(!strcasecmp(s, Q_("keyword|in"))){
+		if(*qtype != RHYTHMDB_QUERY_END)
+			return FALSE;
+		*qtype = *not? RHYTHMDB_QUERY_PROP_NOT_LIKE : RHYTHMDB_QUERY_PROP_LIKE;
+		*ptype = RHYTHMDB_PROP_ALBUM_FOLDED;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("keyword|by"))){
+		if(*qtype != RHYTHMDB_QUERY_END)
+			return FALSE;
+		*qtype = *not? RHYTHMDB_QUERY_PROP_NOT_LIKE : RHYTHMDB_QUERY_PROP_LIKE;
+		*ptype = RHYTHMDB_PROP_ARTIST_FOLDED;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("keyword|not"))){
+		*not = !*not;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("keyword|exactly"))){
+		*fuzzy = FALSE;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean binary_keyword(char* s, AndOr* andor){
+	if(!strcasecmp(s, Q_("Keyword|or"))){
+		*andor = OR;
+		return TRUE;
+	}
+	if(!strcasecmp(s, Q_("Keyword|and"))){
+		*andor = AND;
+		return TRUE;
+	}	
+	return FALSE;
+}
+
+/*TODO: handle not and fuzzy here*/
+static int query_append_string_chunk(Status* s){
+	int length = s->mark_end - s->mark;
+	if(length <= 0)
+		return 1;
+#if 1
+	char* s2 = malloc((length+1)*sizeof(char));
+	memcpy(s2, s->s + s->mark, length);
+	s2[length]='\0';
+#else
+	char* s2 = g_utf8_casefold(s->s + s->mark, length);
+#endif
+	fprintf(stderr, "string arg: «%s»\n", s2);
+	rhythmdb_query_append(s->db, s->query, s->query_type, s->prop_type, s2, RHYTHMDB_QUERY_END);
+	return 0;
+}
+
+/*warning: this will punch little holes in your string.*/
+static GPtrArray* scan_query(RhythmDB* db, char* s){
+	yyscan_t scanner;
+	Status status;
+
+	status.db = db;
+	status.query = g_ptr_array_new ();
+	status.s = s;
+	status.s_position = 0;
+	status.mark_end = 0;
+
+	yylex_init(&scanner);
+	yyset_extra(&status,scanner);
+//	yyset_debug(TRUE,scanner);
+/*
+	//Possibly using a flex-specific scan from string would speed up a few peanuts.
+	//need to add \0\0, etc...
+	YY_BUFFER_STATE buff = yy_scan_buffer(s,strlen(s));
+	yy_delete_buffer(buff);
+*/
+	yyset_in(fmemopen (s, strlen (s), "r"),scanner);
+	int err = yylex(scanner);
+	fclose(yyget_in(scanner));
+	yylex_destroy(scanner);
+	if(err){
+		rhythmdb_query_free(status.query);
+		status.query = NULL;
+	}
+	return status.query;
+}
+
+/*for public use, a long long name*/
+GPtrArray* rhythmdb_query_parse_from_string(RhythmDB* db, const char* s) {
+	char* s2 = strdup(s);
+	GPtrArray* r = scan_query(db, strdup(s));
+	free(s2);
+	if(r){
+		char* s3 = rhythmdb_query_print(r);
+		if(s3)
+			fprintf(stderr, "printed: «%s»\n", s3);
+		else
+			//This, or the print method, is wrong.
+			//TODO: compare if same - here it is fuzzy, but with chosen examples would make good tests.
+			fprintf(stderr, "Something's fishy !\n");
+	}
+	return r;
+}
+
+#if 0 //for testing
+int main(int argc, char** argv){
+	char*s;
+	if(argc != 2)
+		s = strdup("by any chance or (by someone else and by the way)");
+	else
+		s = argv[1];
+	GPtrArray* r = scan_query(NULL, s);
+	if(!r)
+		printf("We got an error\n");
+	exit(!r);
+}
+#endif
+
--- rhythmbox-0.8.8.orig/rhythmdb/rhythmdb-query-parser.h	1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox-0.8.8.perso/rhythmdb/rhythmdb-query-parser.h	2005-04-02 19:42:15.000000000 +0200
@@ -0,0 +1,44 @@
+/*
+ *  arch-tag: Header for the query parser.
+ *
+ *  Copyright (C) 2005 Gabriel de Perthuis <Gabriel.de-Perthuis@laPoste.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+/*
+	This parses queries formulated in a mostly natural syntax.
+	feed the result to rhythmdb_query_parse to get the queries' results.
+	
+	Syntax:
+	by the cranberries OR in album big calm OR (by Rinôçerôse AND NOT in album installation sonore)
+	par the cranberries OU album big calm OU (par Rinôçerôse ET PAS album installation sonore)
+*/
+
+#include "config.h"
+#include <glib.h>
+#include "rhythmdb.h"
+
+#ifndef RHYTHMDB_QUERY_PARSER_H
+#define RHYTHMDB_QUERY_PARSER_H
+
+G_BEGIN_DECLS
+
+GPtrArray* rhythmdb_query_parse_from_string(RhythmDB*, const char*);
+
+G_END_DECLS
+
+#endif /* __RHYTHMBDB_QUERY_MODEL_H */
--- rhythmbox-0.8.8.orig/sources/rb-library-source.c	2004-05-08 00:26:30.000000000 +0200
+++ rhythmbox-0.8.8.perso/sources/rb-library-source.c	2005-03-29 16:15:43.000000000 +0200
@@ -57,6 +57,7 @@ typedef enum
 	RB_LIBRARY_QUERY_TYPE_ARTIST,
 	RB_LIBRARY_QUERY_TYPE_ALBUM,
 	RB_LIBRARY_QUERY_TYPE_SEARCH,
+	RB_LIBRARY_QUERY_TYPE_COMPLEX_SEARCH,
 } RBLibraryQueryType;
 
 static void rb_library_source_class_init (RBLibrarySourceClass *klass);
@@ -939,7 +940,7 @@ impl_search (RBSource *asource, const ch
 
 	g_free (source->priv->search_text);
 	source->priv->search_text = search_text != NULL ? g_utf8_casefold (search_text, -1) : NULL;
-	rb_library_source_do_query (source, RB_LIBRARY_QUERY_TYPE_SEARCH);
+	rb_library_source_do_query (source, RB_LIBRARY_QUERY_TYPE_COMPLEX_SEARCH);
 
 	rb_source_notify_filter_changed (RB_SOURCE (source));
 }
@@ -1341,7 +1342,12 @@ construct_query_from_selection (RBLibrar
 	 */
 
 	if (source->priv->search_text) {
-		GPtrArray *subquery = rhythmdb_query_parse (source->priv->db,
+fprintf(stderr, "search text: «%s»\n", source->priv->search_text);
+	
+		GPtrArray* subquery;
+		subquery = rhythmdb_query_parse_from_string(source->priv->db, source->priv->search_text);
+		if(!subquery)
+			subquery = rhythmdb_query_parse (source->priv->db,
 							    RHYTHMDB_QUERY_PROP_LIKE,
 							    RHYTHMDB_PROP_GENRE_FOLDED,
 							    source->priv->search_text,
@@ -1358,14 +1364,16 @@ construct_query_from_selection (RBLibrar
 							    RHYTHMDB_PROP_TITLE_FOLDED,
 							    source->priv->search_text,
 							    RHYTHMDB_QUERY_END);
+			/* select where type="song" and
+			 *  (genre like "foo" or artist like "foo" or album like "foo")
+			 */
+
 		rhythmdb_query_append (source->priv->db,
 				       query,
 				       RHYTHMDB_QUERY_SUBQUERY,
 				       subquery,
 				       RHYTHMDB_QUERY_END);
-		/* select where type="song" and
-		 *  (genre like "foo" or artist like "foo" or album like "foo")
-		 */
+			
 	}
 
 	if (source->priv->selected_genres) {
--- rhythmbox-0.8.8.orig/rhythmdb/Makefile.am	2004-04-15 21:30:20.000000000 +0200
+++ rhythmbox-0.8.8.perso/rhythmdb/Makefile.am	2005-03-30 15:18:22.000000000 +0200
@@ -19,13 +19,11 @@ librhythmdb_la_SOURCES =				\
 	rhythmdb-property-model.h			\
 	rhythmdb-property-model.c			\
 	rhythmdb-query-model.h				\
-	rhythmdb-query-model.c
-
-
+	rhythmdb-query-model.c	\
+	rhythmdb-query-parser.h	\
+	rhythmdb-query-parser.l
 
 if USE_TREEDB
 librhythmdb_la_SOURCES += rhythmdb-tree.h rhythmdb-tree.c
 endif
 
-
-
--- rhythmbox-0.8.8.orig/configure.ac	2004-10-05 20:06:30.000000000 +0200
+++ rhythmbox-0.8.8.perso/configure.ac	2005-03-30 14:48:05.000000000 +0200
@@ -7,6 +7,8 @@ AM_INIT_AUTOMAKE(rhythmbox, 0.8.8)
 
 AM_MAINTAINER_MODE
 
+AM_PROG_LEX
+
 AC_PROG_INTLTOOL
 
 AC_ISC_POSIX
@@ -32,6 +34,26 @@ else
 	AC_MSG_RESULT([no])
 fi	
 
+dnl iPod support
+dnl gnome-vfs 2.7.4 is required because the gnome_vfs_volume_get_hal_udi 
+dnl function was added in that release.
+dnl enable_ipod = "no"
+
+HAL_REQUIRED=0.2.92
+
+AC_ARG_ENABLE(ipod,
+	      AC_HELP_STRING([--enable-ipod],
+			     [Enable iPod support in Rhythmbox]))
+AM_CONDITIONAL(USE_IPOD, test x"$enable_ipod" = xyes)
+if test x"$enable_ipod" = xyes; then
+	AC_DEFINE(WITH_IPOD_SUPPORT, 1, [Define if iPod support is enabled])
+	USE_HAL=""
+	PKG_CHECK_MODULES(HAL, hal gnome-vfs-2.0 >= 2.8.0,
+		[ AC_DEFINE([HAVE_HAL], 1, [Use the HAL library]) ]
+		[ USE_HAL="dbus-glib-1 hal >= $HAL_REQUIRED" ], :)
+fi
+
+
 PKG_CHECK_MODULES(RHYTHMBOX,                    \
                   gtk+-2.0 >= 2.2.2             \
                   libgnomeui-2.0                \
@@ -39,7 +61,8 @@ PKG_CHECK_MODULES(RHYTHMBOX,            
 		  gnome-vfs-2.0                 \
 		  gnome-vfs-module-2.0		\
 		  libbonobo-2.0			\
-		  bonobo-activation-2.0)
+		  bonobo-activation-2.0         \
+		  $USE_HAL)
 
 RHYTHMBOX_CFLAGS="$CFLAGS $RHYTHMBOX_CFLAGS"
 PKG_CHECK_MODULES(UNUSED, gtk+-2.0 >= 2.4.0, [have_gtk_23=yes], [have_gtk_23=no])
@@ -48,16 +71,6 @@ if test x"$have_gtk_23" = xyes; then
 fi
 AM_CONDITIONAL(WITH_GTK22, test x"$have_gtk_23" != xyes)
 
-dnl iPod support
-dnl enable_ipod = "no"
-AC_ARG_ENABLE(ipod,
-              AC_HELP_STRING([--enable-ipod],
-	                     [Enable iPod support in Rhythmbox]))
-AM_CONDITIONAL(USE_IPOD, test x"$enable_ipod" = xyes)
-if test x"$enable_ipod" = xyes; then
-	AC_DEFINE(WITH_IPOD_SUPPORT, 1, [Define if iPod support is enabled])
-fi
-
 dnl Database
 AC_ARG_WITH(database,
               AC_HELP_STRING([--with-database=tree],
@@ -278,9 +291,9 @@ AC_ARG_ENABLE(vorbis, AC_HELP_STRING([--
 				[don't build with Ogg Vorbis support]))
 if test x"$with_metadata" = xmonkeymedia; then
 if test x"$enable_vorbis" != xno; then
-  MM_PATH_OGG(enable_vorbis=yes,enable_vorbis=no)
+  XIPH_PATH_OGG(enable_vorbis=yes,enable_vorbis=no)
   if test x"$enable_vorbis" = xyes; then
-    MM_PATH_VORBIS(,enable_vorbis=no)
+    XIPH_PATH_VORBIS(,enable_vorbis=no)
   fi
   if test x"$enable_vorbis" = xyes; then
     if test x"$have_gstreamer" = xyes; then
@@ -449,6 +462,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
 
 AM_GLIB_GNU_GETTEXT
 
+
+
+
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 AM_GCONF_SOURCE_2
