MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-01 02:03:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add includes keyword

Browse Source
This commit is contained in:
Ron Pedde 2005-10-24 00:18:08 +00:00
parent 1c7c77be1c
commit 662795acb6
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/smart-parser.c
View File

@ -116,7 +116,8 @@ typedef struct tag_sp_node {
#define T_AND 0x000d #define T_AND 0x000d
#define T_QUOTE 0x000e #define T_QUOTE 0x000e
#define T_NUMBER 0x000f #define T_NUMBER 0x000f
#define T_LAST 0x0010 #define T_INCLUDES 0x0010
#define T_LAST 0x0011
#define T_EOF 0x00fd #define T_EOF 0x00fd
#define T_BOF 0x00fe #define T_BOF 0x00fe
@ -138,7 +139,8 @@ char *sp_token_descr[] = {
"or", "or",
"and", "and",
"quote", "quote",
"number" "number",
"like"
}; };
typedef struct tag_fieldlookup { typedef struct tag_fieldlookup {
@ -179,6 +181,7 @@ FIELDLOOKUP sp_fields[] = {
/* end of db fields */ /* end of db fields */
{ T_OR, "or" }, { T_OR, "or" },
{ T_AND, "and" }, { T_AND, "and" },
{ T_INCLUDES, "includes" },
/* end */ /* end */
{ 0, NULL }, { 0, NULL },
@ -705,6 +708,7 @@ SP_NODE *sp_parse_criterion(PARSETREE tree) {
switch(tree->token.token_id) { switch(tree->token.token_id) {
case T_EQUAL: case T_EQUAL:
case T_INCLUDES:
pnew->op=tree->token.token_id; pnew->op=tree->token.token_id;
pnew->op_type = SP_OPTYPE_STRING; pnew->op_type = SP_OPTYPE_STRING;
result = 1; result = 1;
@ -913,8 +917,12 @@ int sp_node_size(SP_NODE *node) {
} else { } else {
size += strlen(sp_token_descr[node->op & 0x0FFF]); size += strlen(sp_token_descr[node->op & 0x0FFF]);
} }
if(node->op_type == SP_OPTYPE_STRING) if(node->op_type == SP_OPTYPE_STRING) {
size += (2 + strlen(node->right.cvalue)); size += (2 + strlen(node->right.cvalue));
if(node->op == T_INCLUDES) {
size += 2; /* extra %'s */
}
}
if(node->op_type == SP_OPTYPE_INT) if(node->op_type == SP_OPTYPE_INT)
size += ((node->right.ivalue/10) + 1); size += ((node->right.ivalue/10) + 1);
} }
@ -946,7 +954,11 @@ void sp_serialize_sql(SP_NODE *node, char *string) {
strcat(string," "); strcat(string," ");
if(node->op_type == SP_OPTYPE_STRING) { if(node->op_type == SP_OPTYPE_STRING) {
strcat(string,"'"); strcat(string,"'");
if(node->op == T_INCLUDES)
strcat(string,"%");
strcat(string,node->right.cvalue); strcat(string,node->right.cvalue);
if(node->op == T_INCLUDES)
strcat(string,"%");
strcat(string,"'"); strcat(string,"'");
} }