Better parsing

[netatalk.git] / etc / afpd / spotlight_rawquery_parser.c

diff --git a/etc/afpd/spotlight_rawquery_parser.c b/etc/afpd/spotlight_rawquery_parser.c
index 1dbe989ec5ab69efa101ce5d93f7ce6e27cb8003..b4453de89585ed952e86eae05839dd14e4cf7a62 100644 (file)
--- a/etc/afpd/spotlight_rawquery_parser.c
+++ b/etc/afpd/spotlight_rawquery_parser.c
@@ -1485,7 +1485,7 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 85 "spotlight_rawquery_parser.y"
-    {(yyval.sval) = (yyvsp[(1) - (1)].sval);}
+    {(yyval.sval) = (yyvsp[(1) - (1)].sval); if ((yyval.sval) == NULL) YYABORT;}
     break;
 
   case 8:
@@ -1814,16 +1814,37 @@ const char *map_daterange(const char *dateattr, const char *date1, const char *d
 
 const char *map_expr(const char *attr, char op, const char *val)
 {
+    EC_INIT;
     char *result = NULL;
     struct spotlight_sparql_map *p;
 
     for (p = spotlight_sparql_map; p->ssm_spotlight_attr; p++) {
         if (strcmp(p->ssm_spotlight_attr, attr) == 0) {
-            result = talloc_asprintf(ssp_slq, p->ssm_sparql_query_fmtstr, val);
+            switch (p->ssm_type) {
+            case ssmt_bool:
+                result = talloc_asprintf(ssp_slq, "?x %s '%s'", p->ssm_sparql_attr, val);
+                break;
+            case ssmt_num:
+                result = talloc_asprintf(ssp_slq, "?x %s ?y FILTER(?y %c '%s')", p->ssm_sparql_attr, op, val);
+                break;
+            case ssmt_str:
+                result = talloc_asprintf(ssp_slq, "?x %s ?y FILTER(regex(?y, '%s'))", p->ssm_sparql_attr, val);
+                break;
+            case ssmt_fts:
+                result = talloc_asprintf(ssp_slq, "?x %s '%s'", p->ssm_sparql_attr, val);
+                break;
+            case ssmt_date:
+                yyerror("enexpected ssmt_date");
+                EC_FAIL;
+            default:
+                yyerror("unknown Spotlight attribute type");
+                EC_FAIL;
+            }
             break;
         }
     }
 
+EC_CLEANUP:
     return result;
 }
 
@@ -1853,6 +1874,7 @@ int map_spotlight_to_sparql_query(slq_t *slq, gchar **sparql_result)
 {
     EC_INIT;
     YY_BUFFER_STATE s = NULL;
+    ssp_result = NULL;
 
     ssp_slq = slq;
     s = yy_scan_string(slq->slq_qstring);
@@ -1863,9 +1885,9 @@ EC_CLEANUP:
     if (s)
         yy_delete_buffer(s);
     if (ret == 0)
-        *sparql_result = NULL;
-    else
         *sparql_result = ssp_result;
+    else
+        *sparql_result = NULL;
     EC_EXIT;
 }