fixes

diff --git a/etc/afpd/spotlight_SPARQL_map.c b/etc/afpd/spotlight_SPARQL_map.c
index 471634b7b64393e2cd64544534f0f081ae9f298e..39ef39e0215982074e3c3d779b99186ddc4f5e87 100644 (file)
--- a/etc/afpd/spotlight_SPARQL_map.c
+++ b/etc/afpd/spotlight_SPARQL_map.c
@@ -20,12 +20,15 @@
 
 #include "spotlight_SPARQL_map.h"
 
+#define NOTSUPPORTED NULL
+#define SPECIAL      NULL
+
 struct spotlight_sparql_map spotlight_sparql_map[] = {
     /* ssm_spotlight_attr               ssm_type,   ssm_sparql_attr */
     {"*",                               ssmt_fts,   "fts:match"},
 
     /* Filesystem metadata */
-    {"kMDItemFSLabel", ssmt_num, ""},
+    {"kMDItemFSLabel",                  ssmt_num,   NOTSUPPORTED},
     {"kMDItemDisplayName",              ssmt_str,   "nfo:fileName"},
     {"kMDItemFSName",                   ssmt_str,   "nfo:fileName"},
     {"kMDItemFSContentChangeDate",      ssmt_date,  "nfo:fileLastModified"},
@@ -42,8 +45,8 @@ struct spotlight_sparql_map spotlight_sparql_map[] = {
     {"kMDItemDurationSeconds",          ssmt_num,   "nfo:duration"},
     {"kMDItemNumberOfPages",            ssmt_num,   "nfo:pageCount"},
     {"kMDItemTitle",                    ssmt_str,   "nie:title"},
-    {"_kMDItemGroupId",                 ssmt_type,  NULL},
-    {"kMDItemContentTypeTree",          ssmt_type,  NULL},
+    {"_kMDItemGroupId",                 ssmt_type,  SPECIAL},
+    {"kMDItemContentTypeTree",          ssmt_type,  SPECIAL},
 
     /* Image metadata */
     {"kMDItemPixelWidth",               ssmt_num,   "nfo:width"},

diff --git a/etc/afpd/spotlight_rawquery_parser.c b/etc/afpd/spotlight_rawquery_parser.c
index 3ea474422ba18dc396e52ce39e47e4c30f7af7ca..0a28f9a74951fbe4a06204c9402ba9d419af76d2 100644 (file)
--- a/etc/afpd/spotlight_rawquery_parser.c
+++ b/etc/afpd/spotlight_rawquery_parser.c
@@ -1932,7 +1932,7 @@ const char *map_expr(const char *attr, char op, const char *val)
     bstring q = NULL, search = NULL, replace = NULL;
 
     for (p = spotlight_sparql_map; p->ssm_spotlight_attr; p++) {
-        if (strcmp(p->ssm_spotlight_attr, attr) == 0) {
+        if (p->ssm_sparql_attr && strcmp(p->ssm_spotlight_attr, attr) == 0) {
             switch (p->ssm_type) {
             case ssmt_bool:
                 result = talloc_asprintf(ssp_slq, "?obj %s '%s'", p->ssm_sparql_attr, val);

diff --git a/etc/afpd/spotlight_rawquery_parser.y b/etc/afpd/spotlight_rawquery_parser.y
index 60dc94b447fef73b106da4e2f192c5870ef19ffa..e159d1f4239ba72a6953bb4c8cbfacc9b4cc7e57 100644 (file)
--- a/etc/afpd/spotlight_rawquery_parser.y
+++ b/etc/afpd/spotlight_rawquery_parser.y
@@ -206,7 +206,7 @@ const char *map_expr(const char *attr, char op, const char *val)
     bstring q = NULL, search = NULL, replace = NULL;
 
     for (p = spotlight_sparql_map; p->ssm_spotlight_attr; p++) {
-        if (strcmp(p->ssm_spotlight_attr, attr) == 0) {
+        if (p->ssm_sparql_attr && strcmp(p->ssm_spotlight_attr, attr) == 0) {
             switch (p->ssm_type) {
             case ssmt_bool:
                 result = talloc_asprintf(ssp_slq, "?obj %s '%s'", p->ssm_sparql_attr, val);