MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 16:53:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix smart parsing, now just need to finish the browse/query parsing

Browse Source
This commit is contained in:
Ron Pedde 2006-03-10 04:00:38 +00:00
parent 2b6b8cd208
commit 8ba1c68d62
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/smart-parser.c
View File

@ -454,6 +454,10 @@ int sp_scan(PARSETREE tree, int hint) {
tree->in_string = 0; tree->in_string = 0;
} }
DPRINTF(E_SPAM,L_PARSE,"Starting scan - in_string: %d, hint: %d\n",
tree->in_string, hint);
/* check symbols */ /* check symbols */
if(!tree->in_string) { if(!tree->in_string) {
pfield=sp_symbols[tree->token_list]; pfield=sp_symbols[tree->token_list];
@ -469,16 +473,20 @@ int sp_scan(PARSETREE tree, int hint) {
} }
qstr = sp_terminators[tree->token_list][3]; qstr = sp_terminators[tree->token_list][3];
is_qstr = (strstr(qstr,tree->current) != NULL); is_qstr = (strchr(qstr,*(tree->current)) != NULL);
if(strlen(qstr)) { /* strings ARE quoted */ if(strlen(qstr)) { /* strings ARE quoted */
if(hint == SP_HINT_STRING) { /* MUST be a quote */ if(hint == SP_HINT_STRING) { /* MUST be a quote */
if(!is_qstr) if(!is_qstr) {
return T_ERROR; return T_ERROR;
}
} else { } else {
if(is_qstr) {
tree->in_string = 1; /* guess we're in a string */ tree->in_string = 1; /* guess we're in a string */
terminator=sp_terminators[tree->token_list][1];
tree->current++; tree->current++;
} }
} }
}
DPRINTF(E_SPAM,L_PARSE,"keyword or string!\n"); DPRINTF(E_SPAM,L_PARSE,"keyword or string!\n");
@ -493,16 +501,15 @@ int sp_scan(PARSETREE tree, int hint) {
found=0; found=0;
len = (int) (tail - tree->current); len = (int) (tail - tree->current);
DPRINTF(E_SPAM,L_PARSE,"Len: %d, in_string: %d\n",len,tree->in_string);
if(!tree->in_string) { if(!tree->in_string) {
/* find it in the token list */ /* find it in the token list */
pfield=sp_fields[tree->token_list]; pfield=sp_fields[tree->token_list];
DPRINTF(E_SPAM,L_PARSE,"Len is %d\n",len);
while(pfield->name) { while(pfield->name) {
DPRINTF(E_SPAM,L_PARSE,"Comparing to %s\n",pfield->name);
if(strlen(pfield->name) == len) { if(strlen(pfield->name) == len) {
if(strncasecmp(pfield->name,tree->current,len) == 0) { if(strncasecmp(pfield->name,tree->current,len) == 0) {
DPRINTF(E_DBG,L_PARSE,"%*s Returning token %04x (%s)\n",
tree->level," ", tree->token.token_id,
pfield->name);
found=1; found=1;
break; break;
} }
@ -555,14 +562,18 @@ int sp_scan(PARSETREE tree, int hint) {
/* if we are in_string, and we have quoted strings, ensure we /* if we are in_string, and we have quoted strings, ensure we
* have a quote */ * have a quote */
is_qstr = (strstr(qstr,tree->current) != NULL); is_qstr = (strchr(qstr,*tree->current) != NULL);
if((!found) && strlen(qstr) && (!is_qstr) && (tree->in_string)) { if((!found) && strlen(qstr) && (tree->in_string)) {
if(is_qstr) {
tree->current++; /* absorb it */
} else {
DPRINTF(E_INF,L_PARSE,"Missing closing quotes\n"); DPRINTF(E_INF,L_PARSE,"Missing closing quotes\n");
if(tree->token.token_id & 0x2000) { if(tree->token.token_id & 0x2000) {
free(tree->token.data.cvalue); free(tree->token.data.cvalue);
} }
tree->token.token_id = T_ERROR; tree->token.token_id = T_ERROR;
} }
}
DPRINTF(E_DBG,L_PARSE,"%*s Returning token %04x\n",tree->level," ", DPRINTF(E_DBG,L_PARSE,"%*s Returning token %04x\n",tree->level," ",
tree->token.token_id); tree->token.token_id);