From: Ralph Boehme Date: Wed, 7 Aug 2013 10:52:15 +0000 (+0200) Subject: Remove Tracker RDF support X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=commitdiff_plain;h=0d6051d260174a9b8ad3e9457d91aa97e39430c2 Remove Tracker RDF support --- diff --git a/config/Makefile.am b/config/Makefile.am index 026887b8..6225c165 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -6,7 +6,7 @@ SUFFIXES = .tmpl . TMPLFILES = afp.conf.tmpl GENFILES = afp.conf CLEANFILES = $(GENFILES) -EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf tracker.cfg +EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf OVERWRITE_CONFIG = @OVERWRITE_CONFIG@ @@ -48,9 +48,6 @@ uninstall-local: rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf rm -f $(DESTDIR)$(localstatedir)/netatalk/README rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README -if HAVE_TRACKER_RDF - rm -f $(DESTDIR)$(pkgconfdir)/tracker/tracker.cfg -endif if USE_DEBIAN rm -f $(DESTDIR)/etc/default/netatalk endif @@ -74,11 +71,3 @@ install-config-files: $(CONFFILES) $(GENFILES) echo "not overwriting $$f"; \ fi; \ done -if HAVE_TRACKER_RDF - if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/tracker/tracker.cfg ; then \ - if test ! -d $(DESTDIR)$(pkgconfdir)/tracker ; then \ - mkdir $(DESTDIR)$(pkgconfdir)/tracker ; \ - fi ; \ - $(INSTALL_DATA) $(srcdir)/tracker.cfg $(DESTDIR)$(pkgconfdir)/tracker/ ; \ - fi -endif diff --git a/config/tracker.cfg b/config/tracker.cfg deleted file mode 100644 index 03fc15c6..00000000 --- a/config/tracker.cfg +++ /dev/null @@ -1,80 +0,0 @@ - -[General] -# Log Verbosity (0=errors, 1=minimal, 2=detailed, 3=debug) -Verbosity=1 -# Initial sleep time in seconds (0->1000) -InitialSleep=0 -# Minimizes memory use at the expense of indexing speed -LowMemoryMode=false -# Set to TRUE when the home directory is in a NFS filesystem -NFSLocking=false - -[Watches] -# List of directory roots to index and watch (separator=;) -WatchDirectoryRoots= -# List of directory roots to index but NOT watch (separator=;) -CrawlDirectory= -# List of directory roots NOT to index and NOT to watch (separator=;) -NoWatchDirectory= -# Set to false to completely disable any watching -EnableWatching=true - -[Indexing] -# Sets the indexing speed (0->20, where 20=slowest speed) -Throttle=0 -# Set to false to completely disable any indexing -EnableIndexing=true -# Set to false to completely disable file content indexing -EnableFileContentIndexing=true -# Set to false to completely disable thumbnail generation -EnableThumbnails=true -# List of disabled modules (separator=;) -# The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules -DisabledModules=evolution; -# Set to false to NOT hog the disk for extended periods -# FastMerges=false -# List of partial file pattern globs (separator=;) -# This is for files to NOT index -# (basic stat info is only extended for files that match the patterns) -NoIndexFileTypes= -# Set the minimum length of words to index (0->30, default=3) -MinWordLength=3 -# Set the maximum length of words to index (0->200, default=30) -MaxWordLength=30 -# Set the language specific stemmer and stopword list to use -# Values include: -# - en (English) -# - da (Danish) -# - nl (Dutch) -# - fi (Finish) -# - fr (French) -# - de (German) -# - it (Italian) -# - nb (Norwegian) -# - pt (Portugese) -# - ru (Russian) -# - es (Spanish) -# - sv (Swedish) -Language=de -# Set to false to disable language specific stemmer -EnableStemmer=true -# Set to true to disable indexing when running on battery -BatteryIndex=true -# Set to true to disable initial indexing when running on battery -BatteryIndexInitial=false -# Pause indexer when disk space is <= this value -# (0->100, value is in % of $HOME file system, -1=disable pausing) -LowDiskSpaceLimit=1 -# Set to true to enable traversing mounted directories on other file systems -# (this excludes removable devices) -IndexMountedDirectories=true -# Set to true to enable traversing mounted directories for removable devices -IndexRemovableMedia=true - -[Performance] -# Maximum text size in bytes to index from a file's content -MaxTextToIndex=1048576 -# Maximum unique words to index from a file's content -MaxWordsToIndex=10000 -MinBucketCount=65536 -MaxBucketCount=524288 diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c index 678639d6..6923993e 100644 --- a/etc/netatalk/netatalk.c +++ b/etc/netatalk/netatalk.c @@ -54,7 +54,7 @@ static void kill_childs(int sig, ...); /* static variables */ static AFPObj obj; -static pid_t afpd_pid = -1, cnid_metad_pid = -1, dbus_pid = -1, trackerd_pid = -1; +static pid_t afpd_pid = -1, cnid_metad_pid = -1, dbus_pid = -1; static uint afpd_restarts, cnid_metad_restarts, dbus_restarts, trackerd_restarts; static struct event_base *base; struct event *sigterm_ev, *sigquit_ev, *sigchld_ev, *timer_ev; @@ -163,7 +163,7 @@ static void sigterm_cb(evutil_socket_t fd, short what, void *arg) #ifdef HAVE_TRACKER_SPARQL system("tracker-control -t"); #endif - kill_childs(SIGTERM, &afpd_pid, &cnid_metad_pid, &dbus_pid, &trackerd_pid, NULL); + kill_childs(SIGTERM, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL); } /* SIGQUIT callback */ @@ -173,14 +173,14 @@ static void sigquit_cb(evutil_socket_t fd, short what, void *arg) #ifdef HAVE_TRACKER_SPARQL system("tracker-control -t"); #endif - kill_childs(SIGQUIT, &afpd_pid, &cnid_metad_pid, &dbus_pid, &trackerd_pid, NULL); + kill_childs(SIGQUIT, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL); } /* SIGHUP callback */ static void sighup_cb(evutil_socket_t fd, short what, void *arg) { LOG(log_note, logtype_afpd, "Received SIGHUP, sending all processes signal to reload config"); - kill_childs(SIGHUP, &afpd_pid, &cnid_metad_pid, &trackerd_pid, NULL); + kill_childs(SIGHUP, &afpd_pid, &cnid_metad_pid, NULL); } /* SIGCHLD callback */ @@ -208,13 +208,11 @@ static void sigchld_cb(evutil_socket_t fd, short what, void *arg) cnid_metad_pid = -1; else if (pid == dbus_pid) dbus_pid = -1; - else if (pid == trackerd_pid) - trackerd_pid = -1; else LOG(log_error, logtype_afpd, "Bad pid: %d", pid); } - if (in_shutdown && afpd_pid == -1 && cnid_metad_pid == -1 && dbus_pid == -1 && trackerd_pid == -1) + if (in_shutdown && afpd_pid == -1 && cnid_metad_pid == -1 && dbus_pid == -1) event_base_loopbreak(base); } @@ -249,16 +247,6 @@ static void timer_cb(evutil_socket_t fd, short what, void *arg) } } #endif - -#ifdef HAVE_TRACKER_RDF - if (trackerd_pid == -1) { - trackerd_restarts++; - LOG(log_note, logtype_afpd, "Restarting 'trackerd' (restarts: %u)", trackerd_restarts); - if ((trackerd_pid = run_process(TRACKERD_PATH, trackerd_loglev, NULL)) == -1) { - LOG(log_error, logtype_default, "Error starting '%s'", "/usr/bin/trackerd"); - } - } -#endif } /****************************************************************** @@ -433,26 +421,18 @@ int main(int argc, char **argv) set_sl_volumes(); system(TRACKER_PREFIX "/bin/tracker-control -s"); #endif -#ifdef HAVE_TRACKER_RDF - if ((trackerd_pid = run_process(TRACKERD_PATH, trackerd_loglev, NULL)) == -1) { - LOG(log_error, logtype_default, "Error starting '%s'", TRACKERD_PATH); - netatalk_exit(EXITERR_CONF); - } -#endif /* run the event loop */ ret = event_base_dispatch(base); - if (afpd_pid != -1 || cnid_metad_pid != -1 || dbus_pid != -1 || trackerd_pid != -1) { + if (afpd_pid != -1 || cnid_metad_pid != -1 || dbus_pid != -1) { if (afpd_pid != -1) LOG(log_error, logtype_afpd, "AFP service did not shutdown, killing it"); if (cnid_metad_pid != -1) LOG(log_error, logtype_afpd, "CNID database service did not shutdown, killing it"); if (dbus_pid != -1) LOG(log_error, logtype_afpd, "DBUS session daemon still running, killing it"); - if (trackerd_pid != -1) - LOG(log_error, logtype_afpd, "trackerd still running, killing it"); - kill_childs(SIGKILL, &afpd_pid, &cnid_metad_pid, &dbus_pid, &trackerd_pid, NULL); + kill_childs(SIGKILL, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL); } LOG(log_note, logtype_afpd, "Netatalk AFP server exiting"); diff --git a/etc/spotlight/Makefile.am b/etc/spotlight/Makefile.am index e0210b63..40cde734 100644 --- a/etc/spotlight/Makefile.am +++ b/etc/spotlight/Makefile.am @@ -4,7 +4,7 @@ pkgconfdir = @PKGCONFDIR@ moduledir = @UAMS_PATH@ module_LTLIBRARIES = noinst_PROGRAMS = -noinst_HEADERS = slmod_sparql_map.h slmod_rdf_map.h +noinst_HEADERS = slmod_sparql_map.h BUILT_SOURCES = AM_YFLAGS = -d @@ -31,26 +31,3 @@ srp_SOURCES = \ srp_CFLAGS = -DMAIN -I$(top_srcdir)/include @TRACKER_CFLAGS@ srp_LDADD = $(top_builddir)/libatalk/libatalk.la endif - -if HAVE_TRACKER_RDF -BUILT_SOURCES += slmod_rdf_parser.h -noinst_PROGRAMS += stp -module_LTLIBRARIES += slmod_rdf.la - -slmod_rdf_la_SOURCES = \ - slmod_rdf.c \ - slmod_rdf_map.c \ - slmod_rdf_parser.y \ - spotlight_rawquery_lexer.l - -slmod_rdf_la_CFLAGS = @TRACKER_CFLAGS@ -slmod_rdf_la_LDFLAGS = -module -avoid-version @TRACKER_LIBS@ - -stp_SOURCES = \ - slmod_rdf_map.c \ - slmod_rdf_parser.y \ - spotlight_rawquery_lexer.l -stp_CFLAGS = -DMAIN @TRACKER_CFLAGS@ -stp_LDADD = $(top_builddir)/libatalk/libatalk.la @TRACKER_LIBS@ - -endif \ No newline at end of file diff --git a/etc/spotlight/slmod_rdf.c b/etc/spotlight/slmod_rdf.c deleted file mode 100644 index 69855fe0..00000000 --- a/etc/spotlight/slmod_rdf.c +++ /dev/null @@ -1,280 +0,0 @@ -/* - Copyright (c) 2012 Frank Lahm - - 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. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include - -#include "slmod_rdf_parser.h" - -#define MAX_SL_RESULTS 20 - -TrackerClient *client; - -static int sl_mod_init(void *p) -{ - EC_INIT; - GError *error = NULL; - const char *msg = p; - - LOG(log_info, logtype_sl, "Initializing Tracker 0.6 RDF Spotlight module"); - - g_type_init(); - setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1); - - become_root(); - client = tracker_connect(FALSE); - unbecome_root(); - - if (!client) { - LOG(log_error, logtype_sl, "Failed connecting to Tracker"); - EC_FAIL; - } - -EC_CLEANUP: - EC_EXIT; -} - - -static int sl_mod_start_search(void *p) -{ - EC_INIT; - slq_t *slq = p; - GError *error = NULL; - - EC_ZERO_LOG( map_spotlight_to_rdf_query(slq) ); - - LOG(log_debug, logtype_sl, "sl_mod_start_search: Tracker service: %s, FTS: %s, RDF query:\n%s", - tracker_type_to_service_name(slq->slq_service), - slq->slq_fts, - slq->slq_trackerquery ? slq->slq_trackerquery : "false"); - - if (slq->slq_trackerquery) - slq->slq_state = SLQ_STATE_RUNNING; - else - slq->slq_state = SLQ_STATE_DONE; - -EC_CLEANUP: - EC_EXIT; -} - -static int add_filemeta(sl_array_t *reqinfo, sl_array_t *fm_array, cnid_t id, const char *path) -{ - EC_INIT; - sl_array_t *meta; - sl_nil_t nil = 0; - int i, metacount; - - if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0) { - dalloc_add_copy(fm_array, &nil, sl_nil_t); - goto EC_CLEANUP; - } - - LOG(log_debug, logtype_sl, "add_filemeta: metadata count: %d", metacount); - - meta = talloc_zero(fm_array, sl_array_t); - - for (i = 0; i < metacount; i++) { - if (STRCMP(reqinfo->dd_talloc_array[i], ==, "kMDItemDisplayName")) { - char *p, *name; - if ((p = strrchr(path, '/'))) { - name = dalloc_strdup(meta, p + 1); - dalloc_add(meta, name, "char *"); - } - } else { - dalloc_add_copy(meta, &nil, sl_nil_t); - } - } - - dalloc_add(fm_array, meta, sl_array_t); - -EC_CLEANUP: - EC_EXIT; -} - -static int cnid_cmp_fn(const void *p1, const void *p2) -{ - const uint64_t *cnid1 = p1, *cnid2 = p2; - if (*cnid1 == *cnid2) - return 0; - if (*cnid1 < *cnid2) - return -1; - else - return 1; -} - -static int sl_mod_fetch_result(void *p) -{ - EC_INIT; - slq_t *slq = p; - GError *error = NULL; - int i = 0; - cnid_t did, id; - sl_cnids_t *cnids; - sl_filemeta_t *fm; - sl_array_t *fm_array; - sl_nil_t nil; - uint64_t uint64; - gboolean qres, firstmatch = true; - GPtrArray *array = NULL; - - /* Prepare CNIDs */ - cnids = talloc_zero(slq->slq_reply, sl_cnids_t); - cnids->ca_cnids = talloc_zero(cnids, DALLOC_CTX); - cnids->ca_unkn1 = 0xadd; - cnids->ca_context = slq->slq_ctx2; - - /* Prepare FileMeta */ - fm = talloc_zero(slq->slq_reply, sl_filemeta_t); - fm_array = talloc_zero(fm, sl_array_t); - dalloc_add(fm, fm_array, sl_array_t); - - LOG(log_debug, logtype_sl, "sl_mod_fetch_result"); - - if (slq->slq_state == SLQ_STATE_RUNNING) { - /* Run the query */ - LOG(log_debug, logtype_sl, "sl_mod_fetch_result: calling tracker"); - become_root(); - array = tracker_search_query(client, - time(NULL), - slq->slq_service, - NULL, /* Fields */ - slq->slq_fts, /* FTS search test */ - NULL, /* Keywords */ - slq->slq_trackerquery, - slq->slq_offset, - MAX_SL_RESULTS, - FALSE, /* Sort by service */ - NULL, - FALSE, - &error); - unbecome_root(); - - if (error) { - slq->slq_state = SLQ_STATE_DONE; - LOG(log_error, logtype_sl, "Couldn't query Tracker: '%s'", error->message); - g_clear_error(&error); - EC_FAIL; - } - - if (!array) { - slq->slq_state = SLQ_STATE_DONE; - LOG(log_debug, logtype_sl, "sl_mod_fetch_result: no results found"); - EC_EXIT_STATUS(0); - } - - while (i < array->len) { - char **resmeta = g_ptr_array_index(array, i); - char *respath = resmeta[0]; - LOG(log_debug, logtype_sl, "sl_mod_fetch_result: result %d: %s", slq->slq_offset, respath); - - if (firstmatch) { - /* For some reason the list of results always starts with a nil entry */ - dalloc_add_copy(fm_array, &nil, sl_nil_t); - firstmatch = false; - } - - struct stat st; - if (stat(respath, &st) != 0) { - if (errno == ENOENT) - tracker_files_delete(client, respath, NULL); - goto loop_continue; - } - - if ((id = cnid_for_path(slq->slq_vol->v_cdb, slq->slq_vol->v_path, respath, &did)) == CNID_INVALID) { - LOG(log_error, logtype_sl, "sl_mod_fetch_result: cnid_for_path error: %s", respath); - goto loop_continue; - } - LOG(log_debug, logtype_sl, "Result %d: CNID: %" PRIu32 ", path: \"%s\"", i, ntohl(id), respath); - - uint64 = ntohl(id); - if (slq->slq_cnids) { - if (!bsearch(&uint64, slq->slq_cnids, slq->slq_cnids_num, sizeof(uint64_t), cnid_cmp_fn)) - goto loop_continue; - } - - dalloc_add_copy(cnids->ca_cnids, &uint64, uint64_t); - add_filemeta(slq->slq_reqinfo, fm_array, id, respath); - - loop_continue: - i++; - slq->slq_offset++; - } - - g_ptr_array_free(array, TRUE); - array = NULL; - - if (i < MAX_SL_RESULTS) - slq->slq_state = SLQ_STATE_DONE; - } - - uint64 = (i > 0) ? 35 : 0; /* OS X AFP server returns 35 here if results are found */ - dalloc_add_copy(slq->slq_reply, &uint64, uint64_t); - dalloc_add(slq->slq_reply, cnids, sl_cnids_t); - dalloc_add(slq->slq_reply, fm, sl_filemeta_t); - -EC_CLEANUP: - if (array) - g_ptr_array_free(array, TRUE); - EC_EXIT; -} - -/* Free ressources allocated in this module */ -static int sl_mod_close_query(void *p) -{ - EC_INIT; - slq_t *slq = p; - -EC_CLEANUP: - EC_EXIT; -} - -static int sl_mod_error(void *p) -{ - EC_INIT; - slq_t *slq = p; - - if (!slq) - goto EC_CLEANUP; - -EC_CLEANUP: - EC_EXIT; -} - -static int sl_mod_index_file(const void *p) -{ - return 0; -} - -struct sl_module_export sl_mod = { - SL_MODULE_VERSION, - sl_mod_init, - sl_mod_start_search, - sl_mod_fetch_result, - sl_mod_close_query, - sl_mod_error, - sl_mod_index_file -}; diff --git a/etc/spotlight/slmod_rdf_map.c b/etc/spotlight/slmod_rdf_map.c deleted file mode 100644 index c3abd8c6..00000000 --- a/etc/spotlight/slmod_rdf_map.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - Copyright (c) 2012 Frank Lahm - - 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. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#include - -#include "slmod_rdf_map.h" - -#define NOTSUPPORTED NULL -#define SPECIAL NULL - -struct spotlight_rdf_map spotlight_rdf_map[] = { - /* srm_spotlight_attr srm_type, srm_rdf_attr */ - {"*", srmt_str, "File:Name"}, - {"kMDItemTextContent", srmt_fts, ""}, - - /* Filesystem metadata */ - {"kMDItemFSLabel", srmt_num, NOTSUPPORTED}, - {"kMDItemDisplayName", srmt_str, "File:Name"}, - {"kMDItemFSName", srmt_str, "File:Name"}, - {"kMDItemFSContentChangeDate", srmt_date, "File:Modified"}, - - /* Common metadata */ - {"kMDItemContentCreationDate", srmt_date, "Doc:Created"}, - {"kMDItemContentModificationDate", srmt_date, "File:Modified"}, - {"kMDItemAttributeChangeDate", srmt_date, "File:Modified"}, - {"kMDItemAuthors", srmt_str, "Doc:Author"}, - {"kMDItemCopyright", srmt_str, "File:Copyright"}, - {"kMDItemCountry", srmt_str, "Image:Country"}, - {"kMDItemCreator", srmt_str, "DC:Creator"}, - {"kMDItemDurationSeconds", srmt_num, "Audio:Duration"}, - {"kMDItemNumberOfPages", srmt_num, "Doc:PageCount"}, - {"kMDItemTitle", srmt_str, "DC:Title"}, - {"_kMDItemGroupId", srmt_type, "File:Mime"}, - {"kMDItemContentTypeTree", srmt_type, "File:Mime"}, - - /* Image metadata */ - {"kMDItemPixelWidth", srmt_num, "Image:Width"}, - {"kMDItemPixelHeight", srmt_num, "Image:Height"}, - {"kMDItemColorSpace", srmt_str, NOTSUPPORTED}, - {"kMDItemBitsPerSample", srmt_num, NOTSUPPORTED}, - {"kMDItemFocalLength", srmt_num, "Image:FocalLength"}, /* RDF: float */ - {"kMDItemISOSpeed", srmt_num, "Image:ISOSpeed"}, - {"kMDItemOrientation", srmt_bool, "Image:Orientation"}, - {"kMDItemResolutionWidthDPI", srmt_num, NOTSUPPORTED}, - {"kMDItemResolutionHeightDPI", srmt_num, NOTSUPPORTED}, - {"kMDItemExposureTimeSeconds", srmt_num, "Image:ExposureTime"}, /* RDF: fload */ - - /* Audio metadata */ - {"kMDItemComposer", srmt_str, NOTSUPPORTED}, - {"kMDItemMusicalGenre", srmt_str, "Audio:Genre"}, - - {NULL, srmt_str, NULL} -}; - -struct MDTypeMap MDTypeMap[] = { - {"1", "equals", "message/rfc822"}, - {"2", "equals", "text/x-vcard"}, - {"3", NOTSUPPORTED, NOTSUPPORTED}, /* PrefPane */ - {"4", NOTSUPPORTED, NOTSUPPORTED}, /* Font. There's no single mime type to match all font formats, ugh! */ - {"5", NOTSUPPORTED, NOTSUPPORTED}, /* Bookmark */ - {"6", "equals", "text/x-vcard"}, - {"7", "startsWith", "video"}, - {"8", "equals", "application/x-executable"}, - {"9", "equals", "Folder"}, - {"10", "startsWith", "audio"}, - {"11", "equals", "application/pdf"}, - {"12", NOTSUPPORTED, NOTSUPPORTED}, /* Presentation */ - {"13", "startsWith", "image"}, - {"public.jpeg", "equals", "image/jpeg"}, - {"public.tiff", "equals", "image/tiff"}, - {"com.compuserve.gif", "equals", "image/gif"}, - {"public.png", "equals", "image/png"}, - {"com.microsoft.bmp", "equals", "image/bmp"}, - {"public.content", "inSet", "application/msword,application/pdf,application/vnd.ms-excel,application/vnd.oasis.opendocument.text,application/vnd.sun.xml.writer"}, - {"public.mp3", "equals", "audio/mpeg"}, - {"public.mpeg-4-audio", "equals", "audio/x-aac"}, - {"com.apple.application", NOTSUPPORTED, NOTSUPPORTED}, - {"public.text", "startsWith", "text"}, - {"public.plain-text", "equals", "text/plain"}, - {"public.rtf", "equals", "text/rtf"}, - {"public.html", "equals", "text/html"}, - {"public.xml", "equals", "text/xml"}, - {"public.source-code", NOTSUPPORTED, NOTSUPPORTED}, - {NULL, NULL} -}; diff --git a/etc/spotlight/slmod_rdf_map.h b/etc/spotlight/slmod_rdf_map.h deleted file mode 100644 index 4bfc78a6..00000000 --- a/etc/spotlight/slmod_rdf_map.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - Copyright (c) 2012 Frank Lahm - - 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. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifndef SLMOD_RDF_MAP_H -#define SLMOD_RDF_MAP_H - -/* Spotlight -> RDF mapping (srm) */ -enum srm_type { - srmt_bool, /* a boolean value */ - srmt_num, /* a numeric value */ - srmt_str, /* a string value */ - srmt_fts, /* a string value for full text search */ - srmt_date, /* date values are handled in a special map function map_daterange() */ - srmt_type /* kMDItemContentType, requires special mapping */ -}; - -struct spotlight_rdf_map { - const char *srm_spotlight_attr; - enum srm_type srm_type; - const char *srm_rdf_attr; -}; - -struct MDTypeMap { - const char *mdtm_value; /* Value of '_kMDItemGroupId' or 'kMDItemContentTypeTree' */ - const char *mdtm_rdfop; /* RDF query operator */ - const char *mdtm_type; /* MIME type */ -}; - -extern struct spotlight_rdf_map spotlight_rdf_map[]; -extern struct MDTypeMap MDTypeMap[]; -#endif diff --git a/etc/spotlight/slmod_rdf_parser.c b/etc/spotlight/slmod_rdf_parser.c deleted file mode 100644 index 0256f287..00000000 --- a/etc/spotlight/slmod_rdf_parser.c +++ /dev/null @@ -1,2079 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.7. */ - -/* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - - 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 3 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, see . */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "2.7" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - - - - -/* Copy the first part of user declarations. */ -/* Line 371 of yacc.c */ -#line 1 "slmod_rdf_parser.y" - - #include - - #include - #include - #include - #include - - #include - #include - - #include - #include - #include - #include - - #include "slmod_rdf_map.h" - - struct yy_buffer_state; - typedef struct yy_buffer_state *YY_BUFFER_STATE; - extern int yylex (void); - extern void yyerror (char const *); - extern void *yyterminate(void); - extern YY_BUFFER_STATE yy_scan_string( const char *str); - extern void yy_delete_buffer ( YY_BUFFER_STATE buffer ); - - /* forward declarations */ - static const char *map_expr(const char *attr, char op, const char *val); - static const char *map_daterange(const char *dateattr, time_t date1, time_t date2); - static time_t isodate2unix(const char *s); - - /* global vars, eg needed by the lexer */ - slq_t *srp_slq; - - /* local vars */ - static gchar *srp_result; - static gchar *srp_fts; - -/* Line 371 of yacc.c */ -#line 107 "slmod_rdf_parser.c" - -# ifndef YY_NULL -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr -# else -# define YY_NULL 0 -# endif -# endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 1 -#endif - -/* In a future release of Bison, this section will be replaced - by #include "y.tab.h". */ -#ifndef YY_YY_Y_TAB_H_INCLUDED -# define YY_YY_Y_TAB_H_INCLUDED -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG -extern int yydebug; -#endif - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - WORD = 258, - BOOL = 259, - FUNC_INRANGE = 260, - DATE_ISO = 261, - OBRACE = 262, - CBRACE = 263, - EQUAL = 264, - UNEQUAL = 265, - GT = 266, - LT = 267, - COMMA = 268, - QUOTE = 269, - AND = 270, - OR = 271 - }; -#endif -/* Tokens. */ -#define WORD 258 -#define BOOL 259 -#define FUNC_INRANGE 260 -#define DATE_ISO 261 -#define OBRACE 262 -#define CBRACE 263 -#define EQUAL 264 -#define UNEQUAL 265 -#define GT 266 -#define LT 267 -#define COMMA 268 -#define QUOTE 269 -#define AND 270 -#define OR 271 - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -{ -/* Line 387 of yacc.c */ -#line 46 "slmod_rdf_parser.y" - - int ival; - const char *sval; - bool bval; - time_t tval; - - -/* Line 387 of yacc.c */ -#line 190 "slmod_rdf_parser.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -#endif - -extern YYSTYPE yylval; - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ -/* "%code provides" blocks. */ -/* Line 387 of yacc.c */ -#line 40 "slmod_rdf_parser.y" - - #define SPRAW_TIME_OFFSET 978307200 - extern int map_spotlight_to_rdf_query(slq_t *slq); - extern slq_t *srp_slq; - - -/* Line 387 of yacc.c */ -#line 222 "slmod_rdf_parser.c" - -#endif /* !YY_YY_Y_TAB_H_INCLUDED */ - -/* Copy the second part of user declarations. */ - -/* Line 390 of yacc.c */ -#line 229 "slmod_rdf_parser.c" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(Msgid) dgettext ("bison-runtime", Msgid) -# endif -# endif -# ifndef YY_ -# define YY_(Msgid) Msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) -#else -# define YYUSE(E) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(N) (N) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) -#else -static int -YYID (yyi) - int yyi; -#endif -{ - return yyi; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ - /* Use EXIT_SUCCESS as a witness for stdlib.h. */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined EXIT_SUCCESS \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAXIMUM) - -# define YYCOPY_NEEDED 1 - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif - -#if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from SRC to DST. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) -# else -# define YYCOPY(Dst, Src, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (Dst)[yyi] = (Src)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif -#endif /* !YYCOPY_NEEDED */ - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 2 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 51 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 17 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 7 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 21 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 49 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 271 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 4, 7, 9, 11, 13, 15, 19, - 23, 27, 33, 39, 45, 51, 58, 65, 72, 79, - 88, 93 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 18, 0, -1, -1, 18, 19, -1, 20, -1, 4, - -1, 21, -1, 22, -1, 7, 20, 8, -1, 20, - 15, 20, -1, 20, 16, 20, -1, 3, 9, 14, - 3, 14, -1, 3, 10, 14, 3, 14, -1, 3, - 12, 14, 3, 14, -1, 3, 11, 14, 3, 14, - -1, 3, 9, 14, 3, 14, 3, -1, 3, 10, - 14, 3, 14, 3, -1, 3, 12, 14, 3, 14, - 3, -1, 3, 11, 14, 3, 14, 3, -1, 5, - 7, 3, 13, 23, 13, 23, 8, -1, 6, 7, - 3, 8, -1, 3, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = -{ - 0, 68, 68, 70, 74, 91, 97, 98, 99, 100, - 101, 126, 127, 128, 129, 130, 131, 132, 133, 137, - 141, 142 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || 1 -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "WORD", "BOOL", "FUNC_INRANGE", - "DATE_ISO", "OBRACE", "CBRACE", "EQUAL", "UNEQUAL", "GT", "LT", "COMMA", - "QUOTE", "AND", "OR", "$accept", "input", "line", "expr", "match", - "function", "date", YY_NULL -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271 -}; -# endif - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 17, 18, 18, 19, 20, 20, 20, 20, 20, - 20, 21, 21, 21, 21, 21, 21, 21, 21, 22, - 23, 23 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 0, 2, 1, 1, 1, 1, 3, 3, - 3, 5, 5, 5, 5, 6, 6, 6, 6, 8, - 4, 1 -}; - -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 2, 0, 1, 0, 5, 0, 0, 3, 4, 6, - 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 8, 9, 10, 0, 0, 0, - 0, 0, 11, 12, 14, 13, 21, 0, 0, 15, - 16, 18, 17, 0, 0, 0, 0, 20, 19 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 1, 7, 8, 9, 10, 38 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -8 -static const yytype_int8 yypact[] = -{ - -8, 10, -8, 9, -8, -2, -1, -8, 8, -8, - -8, 2, 12, 13, 14, 4, -7, -1, -1, 26, - 27, 28, 29, 20, -8, 18, -8, 21, 22, 23, - 24, 19, 36, 37, 38, 39, -8, 40, 30, -8, - -8, -8, -8, 41, 19, 42, 43, -8, -8 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -8, -8, -8, -6, -8, -8, 1 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = -{ - 16, 24, 3, 4, 5, 15, 6, 23, 17, 18, - 2, 25, 26, 3, 4, 5, 19, 6, 11, 12, - 13, 14, 36, 17, 18, 37, 20, 21, 22, 27, - 28, 29, 30, 31, 18, 32, 33, 34, 35, 39, - 40, 41, 42, 44, 45, 46, 0, 43, 0, 0, - 47, 48 -}; - -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-8))) - -#define yytable_value_is_error(Yytable_value) \ - YYID (0) - -static const yytype_int8 yycheck[] = -{ - 6, 8, 3, 4, 5, 7, 7, 3, 15, 16, - 0, 17, 18, 3, 4, 5, 14, 7, 9, 10, - 11, 12, 3, 15, 16, 6, 14, 14, 14, 3, - 3, 3, 3, 13, 16, 14, 14, 14, 14, 3, - 3, 3, 3, 13, 3, 44, -1, 7, -1, -1, - 8, 8 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 18, 0, 3, 4, 5, 7, 19, 20, 21, - 22, 9, 10, 11, 12, 7, 20, 15, 16, 14, - 14, 14, 14, 3, 8, 20, 20, 3, 3, 3, - 3, 13, 14, 14, 14, 14, 3, 6, 23, 3, - 3, 3, 3, 7, 13, 3, 23, 8, 8 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - FILE *yyo = yyoutput; - YYUSE (yyo); - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif -{ - YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif -{ - int yynrhs = yyr2[yyrule]; - int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - YYFPRINTF (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) -{ - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULL; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - - /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } - } - - switch (yycount) - { -# define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ - } - - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; - } - - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - return 0; -} -#endif /* YYERROR_VERBOSE */ - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif -{ - YYUSE (yyvaluep); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } -} - - - - -/* The lookahead symbol. */ -int yychar; - - -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - -/* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); - -/* Number of syntax errors so far. */ -int yynerrs; - - -/*----------. -| yyparse. | -`----------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void) -#else -int -yyparse () - -#endif -#endif -{ - int yystate; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - - Refer to the stacks through separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; - - YYSIZE_T yystacksize; - - int yyn; - int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - yyssp = yyss = yyssa; - yyvsp = yyvs = yyvsa; - yystacksize = YYINITDEPTH; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - if (yystate == YYFINAL) - YYACCEPT; - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to lookahead token. */ - yyn = yypact[yystate]; - if (yypact_value_is_default (yyn)) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yytable_value_is_error (yyn)) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the lookahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - - yystate = yyn; - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END - - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 4: -/* Line 1792 of yacc.c */ -#line 74 "slmod_rdf_parser.y" - { - srp_result = talloc_asprintf(srp_slq, - "\n" - " \n" - " \n" - " \n" - " %s\n" - " \n" - " %s\n" - " \n" - "\n", - srp_slq->slq_vol->v_path, (yyvsp[(1) - (1)].sval)); - (yyval.sval) = srp_result; -} - break; - - case 5: -/* Line 1792 of yacc.c */ -#line 91 "slmod_rdf_parser.y" - { - if ((yyvsp[(1) - (1)].bval) == false) - YYACCEPT; - else - YYABORT; -} - break; - - case 6: -/* Line 1792 of yacc.c */ -#line 97 "slmod_rdf_parser.y" - {(yyval.sval) = (yyvsp[(1) - (1)].sval); if ((yyval.sval) == NULL) YYABORT;} - break; - - case 7: -/* Line 1792 of yacc.c */ -#line 98 "slmod_rdf_parser.y" - {(yyval.sval) = (yyvsp[(1) - (1)].sval);} - break; - - case 8: -/* Line 1792 of yacc.c */ -#line 99 "slmod_rdf_parser.y" - {(yyval.sval) = talloc_asprintf(srp_slq, "%s\n", (yyvsp[(2) - (3)].sval));} - break; - - case 9: -/* Line 1792 of yacc.c */ -#line 100 "slmod_rdf_parser.y" - {(yyval.sval) = talloc_asprintf(srp_slq, "\n%s\n%s\n\n", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval));} - break; - - case 10: -/* Line 1792 of yacc.c */ -#line 101 "slmod_rdf_parser.y" - { - if (strcmp((yyvsp[(1) - (3)].sval), "") == 0 || strcmp((yyvsp[(3) - (3)].sval), "") == 0) { - /* - * The default Spotlight search term issued by the Finder (10.8) is: - * '* == "searchterm" || kMDItemTextContent == "searchterm"' - * As it isn't mappable to a single Tracker RDF query, we silently - * map ANY FTS query expression being part of an OR compound - * expression to a simple filename search. - * FTS queries are thus only possible by explicitly requesting - * file content FTS search in the Finder on the client (resulting - * in a 'kMDItemTextContent == "searchterm"' query). - */ - if (strcmp((yyvsp[(1) - (3)].sval), "") == 0) - (yyval.sval) = talloc_asprintf(srp_slq, (yyvsp[(3) - (3)].sval)); - else - (yyval.sval) = talloc_asprintf(srp_slq, (yyvsp[(1) - (3)].sval)); - talloc_free(srp_fts); - srp_fts = NULL; - } else { - (yyval.sval) = talloc_asprintf(srp_slq, "\n%s\n%s\n\n", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)); - } -} - break; - - case 11: -/* Line 1792 of yacc.c */ -#line 126 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '=', (yyvsp[(4) - (5)].sval));} - break; - - case 12: -/* Line 1792 of yacc.c */ -#line 127 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '!', (yyvsp[(4) - (5)].sval));} - break; - - case 13: -/* Line 1792 of yacc.c */ -#line 128 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '<', (yyvsp[(4) - (5)].sval));} - break; - - case 14: -/* Line 1792 of yacc.c */ -#line 129 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (5)].sval), '>', (yyvsp[(4) - (5)].sval));} - break; - - case 15: -/* Line 1792 of yacc.c */ -#line 130 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '=', (yyvsp[(4) - (6)].sval));} - break; - - case 16: -/* Line 1792 of yacc.c */ -#line 131 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '!', (yyvsp[(4) - (6)].sval));} - break; - - case 17: -/* Line 1792 of yacc.c */ -#line 132 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '<', (yyvsp[(4) - (6)].sval));} - break; - - case 18: -/* Line 1792 of yacc.c */ -#line 133 "slmod_rdf_parser.y" - {(yyval.sval) = map_expr((yyvsp[(1) - (6)].sval), '>', (yyvsp[(4) - (6)].sval));} - break; - - case 19: -/* Line 1792 of yacc.c */ -#line 137 "slmod_rdf_parser.y" - {(yyval.sval) = map_daterange((yyvsp[(3) - (8)].sval), (yyvsp[(5) - (8)].tval), (yyvsp[(7) - (8)].tval));} - break; - - case 20: -/* Line 1792 of yacc.c */ -#line 141 "slmod_rdf_parser.y" - {(yyval.tval) = isodate2unix((yyvsp[(3) - (4)].sval));} - break; - - case 21: -/* Line 1792 of yacc.c */ -#line 142 "slmod_rdf_parser.y" - {(yyval.tval) = atoi((yyvsp[(1) - (1)].sval)) + SPRAW_TIME_OFFSET;} - break; - - -/* Line 1792 of yacc.c */ -#line 1595 "slmod_rdf_parser.c" - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires - that yytoken be updated with the new translation. We take the - approach of translating immediately before every use of yytoken. - One alternative is translating here after every semantic action, - but that translation would be missed if the semantic action invokes - YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or - if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an - incorrect destructor might then be invoked immediately. In the - case of YYERROR or YYBACKUP, subsequent parser actions might lead - to an incorrect destructor call or verbose syntax error message - before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); -#else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) - { - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == 1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; - } - else - { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; - } - } - yyerror (yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; - } -# undef YYSYNTAX_ERROR -#endif - } - - - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - - yydestruct ("Error: popping", - yystos[yystate], yyvsp); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END - - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#if !defined yyoverflow || YYERROR_VERBOSE -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEMPTY) - { - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = YYTRANSLATE (yychar); - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - } - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - - -/* Line 2055 of yacc.c */ -#line 145 "slmod_rdf_parser.y" - - -static time_t isodate2unix(const char *s) -{ - struct tm tm; - - if (strptime(s, "%Y-%m-%dT%H:%M:%SZ", &tm) == NULL) - return (time_t)-1; - return mktime(&tm); -} - -static const char *map_daterange(const char *dateattr, time_t date1, time_t date2) -{ - EC_INIT; - char *result = NULL; - struct spotlight_rdf_map *p; - struct tm *tmp; - char buf1[64], buf2[64]; - - EC_NULL_LOG( tmp = localtime(&date1) ); - strftime(buf1, sizeof(buf1), "%Y-%m-%dT%H:%M:%SZ", tmp); - EC_NULL_LOG( tmp = localtime(&date2) ); - strftime(buf2, sizeof(buf2), "%Y-%m-%dT%H:%M:%SZ", tmp); - - for (p = spotlight_rdf_map; p->srm_spotlight_attr; p++) { - if (strcmp(dateattr, p->srm_spotlight_attr) == 0) { - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " \n" - " %s\n" - " \n" - " \n" - " \n" - " %s\n" - " \n" - "\n", - p->srm_rdf_attr, buf1, - p->srm_rdf_attr, buf2); - break; - } - } - -EC_CLEANUP: - if (ret != 0) - return NULL; - return result; -} - -static char *map_type_search(const char *attr, char op, const char *val) -{ - char *result = NULL; - - for (struct MDTypeMap *p = MDTypeMap; p->mdtm_value; p++) { - if (strcmp(p->mdtm_value, val) == 0) { - if (!p->mdtm_type) - return NULL; - if (val[0] == '9') { - srp_slq->slq_service = SERVICE_FOLDERS; - return ""; - } - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - p->mdtm_rdfop, - p->mdtm_type, - p->mdtm_rdfop); - break; - } - } - return result; -} - -static const char *map_expr(const char *attr, char op, const char *val) -{ - EC_INIT; - char *result = NULL; - struct spotlight_rdf_map *p; - time_t t; - struct tm *tmp; - char buf1[64]; - bstring q = NULL, search = NULL, replace = NULL; - char *rdfop; - - for (p = spotlight_rdf_map; p->srm_spotlight_attr; p++) { - if (p->srm_rdf_attr && strcmp(p->srm_spotlight_attr, attr) == 0) { - switch (p->srm_type) { - case srmt_num: - q = bformat("^%s$", val); - search = bfromcstr("*"); - replace = bfromcstr(".*"); - bfindreplace(q, search, replace, 0); - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - p->srm_rdf_attr, - bdata(q)); - bdestroy(q); - break; - - case srmt_str: - q = bformat("^%s$", val); - search = bfromcstr("*"); - replace = bfromcstr(".*"); - bfindreplace(q, search, replace, 0); - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - p->srm_rdf_attr, - bdata(q)); - bdestroy(q); - break; - - case srmt_fts: - if (srp_fts) { - yyerror("only single fts query allowed"); - EC_FAIL; - } - q = bfromcstr(val); - search = bfromcstr("*"); - replace = bfromcstr(""); - bfindreplace(q, search, replace, 0); - srp_fts = talloc_strdup(srp_slq, bdata(q)); - result = ""; - break; - - case srmt_date: - t = atoi(val) + SPRAW_TIME_OFFSET; - EC_NULL( tmp = localtime(&t) ); - strftime(buf1, sizeof(buf1), "%Y-%m-%dT%H:%M:%SZ", tmp); - - switch (op) { - case '=': - rdfop = "equals"; - case '<': - rdfop = "lessThan"; - case '>': - rdfop = "greaterThan"; - default: - yyerror("unknown date comparison"); - EC_FAIL; - } - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - rdfop, - p->srm_rdf_attr, - buf1, - rdfop); - - break; - - case srmt_type: - result = map_type_search(attr, op, val); - break; - - default: - yyerror("unknown Spotlight attribute type"); - EC_FAIL; - } - break; - } - } - -EC_CLEANUP: - if (q) - bdestroy(q); - if (search) - bdestroy(search); - if (replace) - bdestroy(replace); - return result; -} - -void yyerror(const char *str) -{ -#ifdef MAIN - printf("yyerror: %s\n", str); -#else - LOG(log_error, logtype_sl, "yyerror: %s", str); -#endif -} - -int yywrap() -{ - return 1; -} - -/** - * Map a Spotlight RAW query string to a RDF query - * - * @param[in] slq Spotlight query handle - * @return 0 on success, -1 on error - **/ -int map_spotlight_to_rdf_query(slq_t *slq) -{ - EC_INIT; - YY_BUFFER_STATE s = NULL; - srp_result = NULL; - srp_fts = NULL; - slq->slq_service = SERVICE_FILES; - srp_slq = slq; - s = yy_scan_string(slq->slq_qstring); - - EC_ZERO( yyparse() ); - -EC_CLEANUP: - if (s) - yy_delete_buffer(s); - if (ret == 0) { - slq->slq_trackerquery = srp_result; - slq->slq_fts = srp_fts; - } - EC_EXIT; -} - -#ifdef MAIN -int main(int argc, char **argv) -{ - int ret; - YY_BUFFER_STATE s; - - if (argc != 2) { - printf("usage: %s QUERY\n", argv[0]); - return 1; - } - - srp_slq = talloc_zero(NULL, slq_t); - struct vol *vol = talloc_zero(srp_slq, struct vol); - vol->v_path = "/Volumes/test"; - srp_slq->slq_vol = vol; - - s = yy_scan_string(argv[1]); - - ret = yyparse(); - - yy_delete_buffer(s); - - if (ret == 0) - printf("RDF:\n%s\nFTS: %s\n", - srp_result ? srp_result : "(empty)", - srp_fts ? srp_fts : "(none)"); - return 0; -} -#endif diff --git a/etc/spotlight/slmod_rdf_parser.h b/etc/spotlight/slmod_rdf_parser.h deleted file mode 100644 index 3815147e..00000000 --- a/etc/spotlight/slmod_rdf_parser.h +++ /dev/null @@ -1,130 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.7. */ - -/* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - - 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 3 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, see . */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -#ifndef YY_YY_Y_TAB_H_INCLUDED -# define YY_YY_Y_TAB_H_INCLUDED -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG -extern int yydebug; -#endif - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - WORD = 258, - BOOL = 259, - FUNC_INRANGE = 260, - DATE_ISO = 261, - OBRACE = 262, - CBRACE = 263, - EQUAL = 264, - UNEQUAL = 265, - GT = 266, - LT = 267, - COMMA = 268, - QUOTE = 269, - AND = 270, - OR = 271 - }; -#endif -/* Tokens. */ -#define WORD 258 -#define BOOL 259 -#define FUNC_INRANGE 260 -#define DATE_ISO 261 -#define OBRACE 262 -#define CBRACE 263 -#define EQUAL 264 -#define UNEQUAL 265 -#define GT 266 -#define LT 267 -#define COMMA 268 -#define QUOTE 269 -#define AND 270 -#define OR 271 - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -{ -/* Line 2058 of yacc.c */ -#line 46 "slmod_rdf_parser.y" - - int ival; - const char *sval; - bool bval; - time_t tval; - - -/* Line 2058 of yacc.c */ -#line 97 "slmod_rdf_parser.h" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -#endif - -extern YYSTYPE yylval; - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ -/* "%code provides" blocks. */ -/* Line 2058 of yacc.c */ -#line 40 "slmod_rdf_parser.y" - - #define SPRAW_TIME_OFFSET 978307200 - extern int map_spotlight_to_rdf_query(slq_t *slq); - extern slq_t *srp_slq; - - -/* Line 2058 of yacc.c */ -#line 129 "slmod_rdf_parser.h" - -#endif /* !YY_YY_Y_TAB_H_INCLUDED */ diff --git a/etc/spotlight/slmod_rdf_parser.y b/etc/spotlight/slmod_rdf_parser.y deleted file mode 100644 index 9352d7a2..00000000 --- a/etc/spotlight/slmod_rdf_parser.y +++ /dev/null @@ -1,397 +0,0 @@ -%{ - #include - - #include - #include - #include - #include - - #include - #include - - #include - #include - #include - #include - - #include "slmod_rdf_map.h" - - struct yy_buffer_state; - typedef struct yy_buffer_state *YY_BUFFER_STATE; - extern int yylex (void); - extern void yyerror (char const *); - extern void *yyterminate(void); - extern YY_BUFFER_STATE yy_scan_string( const char *str); - extern void yy_delete_buffer ( YY_BUFFER_STATE buffer ); - - /* forward declarations */ - static const char *map_expr(const char *attr, char op, const char *val); - static const char *map_daterange(const char *dateattr, time_t date1, time_t date2); - static time_t isodate2unix(const char *s); - - /* global vars, eg needed by the lexer */ - slq_t *srp_slq; - - /* local vars */ - static gchar *srp_result; - static gchar *srp_fts; -%} - -%code provides { - #define SPRAW_TIME_OFFSET 978307200 - extern int map_spotlight_to_rdf_query(slq_t *slq); - extern slq_t *srp_slq; -} - -%union { - int ival; - const char *sval; - bool bval; - time_t tval; -} - -%expect 4 -%error-verbose - -%type match expr line function -%type date - -%token WORD -%token BOOL -%token FUNC_INRANGE -%token DATE_ISO -%token OBRACE CBRACE EQUAL UNEQUAL GT LT COMMA QUOTE -%left AND -%left OR -%% - -input: -/* empty */ -| input line -; - -line: -expr { - srp_result = talloc_asprintf(srp_slq, - "\n" - " \n" - " \n" - " \n" - " %s\n" - " \n" - " %s\n" - " \n" - "\n", - srp_slq->slq_vol->v_path, $1); - $$ = srp_result; -} -; - -expr: -BOOL { - if ($1 == false) - YYACCEPT; - else - YYABORT; -} -| match {$$ = $1; if ($$ == NULL) YYABORT;} -| function {$$ = $1;} -| OBRACE expr CBRACE {$$ = talloc_asprintf(srp_slq, "%s\n", $2);} -| expr AND expr {$$ = talloc_asprintf(srp_slq, "\n%s\n%s\n\n", $1, $3);} -| expr OR expr { - if (strcmp($1, "") == 0 || strcmp($3, "") == 0) { - /* - * The default Spotlight search term issued by the Finder (10.8) is: - * '* == "searchterm" || kMDItemTextContent == "searchterm"' - * As it isn't mappable to a single Tracker RDF query, we silently - * map ANY FTS query expression being part of an OR compound - * expression to a simple filename search. - * FTS queries are thus only possible by explicitly requesting - * file content FTS search in the Finder on the client (resulting - * in a 'kMDItemTextContent == "searchterm"' query). - */ - if (strcmp($1, "") == 0) - $$ = talloc_asprintf(srp_slq, $3); - else - $$ = talloc_asprintf(srp_slq, $1); - talloc_free(srp_fts); - srp_fts = NULL; - } else { - $$ = talloc_asprintf(srp_slq, "\n%s\n%s\n\n", $1, $3); - } -} -; - -match: -WORD EQUAL QUOTE WORD QUOTE {$$ = map_expr($1, '=', $4);} -| WORD UNEQUAL QUOTE WORD QUOTE {$$ = map_expr($1, '!', $4);} -| WORD LT QUOTE WORD QUOTE {$$ = map_expr($1, '<', $4);} -| WORD GT QUOTE WORD QUOTE {$$ = map_expr($1, '>', $4);} -| WORD EQUAL QUOTE WORD QUOTE WORD {$$ = map_expr($1, '=', $4);} -| WORD UNEQUAL QUOTE WORD QUOTE WORD {$$ = map_expr($1, '!', $4);} -| WORD LT QUOTE WORD QUOTE WORD {$$ = map_expr($1, '<', $4);} -| WORD GT QUOTE WORD QUOTE WORD {$$ = map_expr($1, '>', $4);} -; - -function: -FUNC_INRANGE OBRACE WORD COMMA date COMMA date CBRACE {$$ = map_daterange($3, $5, $7);} -; - -date: -DATE_ISO OBRACE WORD CBRACE {$$ = isodate2unix($3);} -| WORD {$$ = atoi($1) + SPRAW_TIME_OFFSET;} -; - -%% - -static time_t isodate2unix(const char *s) -{ - struct tm tm; - - if (strptime(s, "%Y-%m-%dT%H:%M:%SZ", &tm) == NULL) - return (time_t)-1; - return mktime(&tm); -} - -static const char *map_daterange(const char *dateattr, time_t date1, time_t date2) -{ - EC_INIT; - char *result = NULL; - struct spotlight_rdf_map *p; - struct tm *tmp; - char buf1[64], buf2[64]; - - EC_NULL_LOG( tmp = localtime(&date1) ); - strftime(buf1, sizeof(buf1), "%Y-%m-%dT%H:%M:%SZ", tmp); - EC_NULL_LOG( tmp = localtime(&date2) ); - strftime(buf2, sizeof(buf2), "%Y-%m-%dT%H:%M:%SZ", tmp); - - for (p = spotlight_rdf_map; p->srm_spotlight_attr; p++) { - if (strcmp(dateattr, p->srm_spotlight_attr) == 0) { - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " \n" - " %s\n" - " \n" - " \n" - " \n" - " %s\n" - " \n" - "\n", - p->srm_rdf_attr, buf1, - p->srm_rdf_attr, buf2); - break; - } - } - -EC_CLEANUP: - if (ret != 0) - return NULL; - return result; -} - -static char *map_type_search(const char *attr, char op, const char *val) -{ - char *result = NULL; - - for (struct MDTypeMap *p = MDTypeMap; p->mdtm_value; p++) { - if (strcmp(p->mdtm_value, val) == 0) { - if (!p->mdtm_type) - return NULL; - if (val[0] == '9') { - srp_slq->slq_service = SERVICE_FOLDERS; - return ""; - } - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - p->mdtm_rdfop, - p->mdtm_type, - p->mdtm_rdfop); - break; - } - } - return result; -} - -static const char *map_expr(const char *attr, char op, const char *val) -{ - EC_INIT; - char *result = NULL; - struct spotlight_rdf_map *p; - time_t t; - struct tm *tmp; - char buf1[64]; - bstring q = NULL, search = NULL, replace = NULL; - char *rdfop; - - for (p = spotlight_rdf_map; p->srm_spotlight_attr; p++) { - if (p->srm_rdf_attr && strcmp(p->srm_spotlight_attr, attr) == 0) { - switch (p->srm_type) { - case srmt_num: - q = bformat("^%s$", val); - search = bfromcstr("*"); - replace = bfromcstr(".*"); - bfindreplace(q, search, replace, 0); - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - p->srm_rdf_attr, - bdata(q)); - bdestroy(q); - break; - - case srmt_str: - q = bformat("^%s$", val); - search = bfromcstr("*"); - replace = bfromcstr(".*"); - bfindreplace(q, search, replace, 0); - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - p->srm_rdf_attr, - bdata(q)); - bdestroy(q); - break; - - case srmt_fts: - if (srp_fts) { - yyerror("only single fts query allowed"); - EC_FAIL; - } - q = bfromcstr(val); - search = bfromcstr("*"); - replace = bfromcstr(""); - bfindreplace(q, search, replace, 0); - srp_fts = talloc_strdup(srp_slq, bdata(q)); - result = ""; - break; - - case srmt_date: - t = atoi(val) + SPRAW_TIME_OFFSET; - EC_NULL( tmp = localtime(&t) ); - strftime(buf1, sizeof(buf1), "%Y-%m-%dT%H:%M:%SZ", tmp); - - switch (op) { - case '=': - rdfop = "equals"; - case '<': - rdfop = "lessThan"; - case '>': - rdfop = "greaterThan"; - default: - yyerror("unknown date comparison"); - EC_FAIL; - } - result = talloc_asprintf(srp_slq, - "\n" - " \n" - " %s\n" - "\n", - rdfop, - p->srm_rdf_attr, - buf1, - rdfop); - - break; - - case srmt_type: - result = map_type_search(attr, op, val); - break; - - default: - yyerror("unknown Spotlight attribute type"); - EC_FAIL; - } - break; - } - } - -EC_CLEANUP: - if (q) - bdestroy(q); - if (search) - bdestroy(search); - if (replace) - bdestroy(replace); - return result; -} - -void yyerror(const char *str) -{ -#ifdef MAIN - printf("yyerror: %s\n", str); -#else - LOG(log_error, logtype_sl, "yyerror: %s", str); -#endif -} - -int yywrap() -{ - return 1; -} - -/** - * Map a Spotlight RAW query string to a RDF query - * - * @param[in] slq Spotlight query handle - * @return 0 on success, -1 on error - **/ -int map_spotlight_to_rdf_query(slq_t *slq) -{ - EC_INIT; - YY_BUFFER_STATE s = NULL; - srp_result = NULL; - srp_fts = NULL; - slq->slq_service = SERVICE_FILES; - srp_slq = slq; - s = yy_scan_string(slq->slq_qstring); - - EC_ZERO( yyparse() ); - -EC_CLEANUP: - if (s) - yy_delete_buffer(s); - if (ret == 0) { - slq->slq_trackerquery = srp_result; - slq->slq_fts = srp_fts; - } - EC_EXIT; -} - -#ifdef MAIN -int main(int argc, char **argv) -{ - int ret; - YY_BUFFER_STATE s; - - if (argc != 2) { - printf("usage: %s QUERY\n", argv[0]); - return 1; - } - - srp_slq = talloc_zero(NULL, slq_t); - struct vol *vol = talloc_zero(srp_slq, struct vol); - vol->v_path = "/Volumes/test"; - srp_slq->slq_vol = vol; - - s = yy_scan_string(argv[1]); - - ret = yyparse(); - - yy_delete_buffer(s); - - if (ret == 0) - printf("RDF:\n%s\nFTS: %s\n", - srp_result ? srp_result : "(empty)", - srp_fts ? srp_fts : "(none)"); - return 0; -} -#endif diff --git a/etc/spotlight/spotlight_rawquery_lexer.c b/etc/spotlight/spotlight_rawquery_lexer.c index 84c99367..38b7a73f 100644 --- a/etc/spotlight/spotlight_rawquery_lexer.c +++ b/etc/spotlight/spotlight_rawquery_lexer.c @@ -505,12 +505,7 @@ char *yytext; #include "slmod_sparql_parser.h" #define SLQ_VAR ssp_slq #endif -#ifdef HAVE_TRACKER_RDF -#include -#include "slmod_rdf_parser.h" -#define SLQ_VAR srp_slq -#endif -#line 514 "spotlight_rawquery_lexer.c" +#line 509 "spotlight_rawquery_lexer.c" #define INITIAL 0 @@ -692,9 +687,9 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 32 "spotlight_rawquery_lexer.l" +#line 27 "spotlight_rawquery_lexer.l" -#line 698 "spotlight_rawquery_lexer.c" +#line 693 "spotlight_rawquery_lexer.c" if ( !(yy_init) ) { @@ -779,91 +774,91 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 33 "spotlight_rawquery_lexer.l" +#line 28 "spotlight_rawquery_lexer.l" return FUNC_INRANGE; YY_BREAK case 2: YY_RULE_SETUP -#line 34 "spotlight_rawquery_lexer.l" +#line 29 "spotlight_rawquery_lexer.l" return DATE_ISO; YY_BREAK case 3: YY_RULE_SETUP -#line 35 "spotlight_rawquery_lexer.l" +#line 30 "spotlight_rawquery_lexer.l" {yylval.bval = false; return BOOL;} YY_BREAK case 4: YY_RULE_SETUP -#line 36 "spotlight_rawquery_lexer.l" +#line 31 "spotlight_rawquery_lexer.l" {yylval.bval = true; return BOOL;} YY_BREAK case 5: YY_RULE_SETUP -#line 37 "spotlight_rawquery_lexer.l" +#line 32 "spotlight_rawquery_lexer.l" return QUOTE; YY_BREAK case 6: YY_RULE_SETUP -#line 38 "spotlight_rawquery_lexer.l" +#line 33 "spotlight_rawquery_lexer.l" return OBRACE; YY_BREAK case 7: YY_RULE_SETUP -#line 39 "spotlight_rawquery_lexer.l" +#line 34 "spotlight_rawquery_lexer.l" return CBRACE; YY_BREAK case 8: YY_RULE_SETUP -#line 40 "spotlight_rawquery_lexer.l" +#line 35 "spotlight_rawquery_lexer.l" return AND; YY_BREAK case 9: YY_RULE_SETUP -#line 41 "spotlight_rawquery_lexer.l" +#line 36 "spotlight_rawquery_lexer.l" return OR; YY_BREAK case 10: YY_RULE_SETUP -#line 42 "spotlight_rawquery_lexer.l" +#line 37 "spotlight_rawquery_lexer.l" return EQUAL; YY_BREAK case 11: YY_RULE_SETUP -#line 43 "spotlight_rawquery_lexer.l" +#line 38 "spotlight_rawquery_lexer.l" return UNEQUAL; YY_BREAK case 12: YY_RULE_SETUP -#line 44 "spotlight_rawquery_lexer.l" +#line 39 "spotlight_rawquery_lexer.l" return LT; YY_BREAK case 13: YY_RULE_SETUP -#line 45 "spotlight_rawquery_lexer.l" +#line 40 "spotlight_rawquery_lexer.l" return GT; YY_BREAK case 14: YY_RULE_SETUP -#line 46 "spotlight_rawquery_lexer.l" +#line 41 "spotlight_rawquery_lexer.l" return COMMA; YY_BREAK case 15: YY_RULE_SETUP -#line 47 "spotlight_rawquery_lexer.l" +#line 42 "spotlight_rawquery_lexer.l" {yylval.sval = talloc_strdup(SLQ_VAR, yytext); return WORD;} YY_BREAK case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 48 "spotlight_rawquery_lexer.l" +#line 43 "spotlight_rawquery_lexer.l" /* ignore */ YY_BREAK case 17: YY_RULE_SETUP -#line 49 "spotlight_rawquery_lexer.l" +#line 44 "spotlight_rawquery_lexer.l" ECHO; YY_BREAK -#line 867 "spotlight_rawquery_lexer.c" +#line 862 "spotlight_rawquery_lexer.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1861,7 +1856,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 49 "spotlight_rawquery_lexer.l" +#line 44 "spotlight_rawquery_lexer.l" diff --git a/etc/spotlight/spotlight_rawquery_lexer.l b/etc/spotlight/spotlight_rawquery_lexer.l index 1e903857..aa1e25f9 100644 --- a/etc/spotlight/spotlight_rawquery_lexer.l +++ b/etc/spotlight/spotlight_rawquery_lexer.l @@ -13,11 +13,6 @@ #include "slmod_sparql_parser.h" #define SLQ_VAR ssp_slq #endif -#ifdef HAVE_TRACKER_RDF -#include -#include "slmod_rdf_parser.h" -#define SLQ_VAR srp_slq -#endif %} ASC [a-zA-Z0-9_\*\:\-\.] diff --git a/include/atalk/spotlight.h b/include/atalk/spotlight.h index 9aba3201..0ca8a24e 100644 --- a/include/atalk/spotlight.h +++ b/include/atalk/spotlight.h @@ -104,15 +104,7 @@ typedef struct _slq_t { uint64_t *slq_cnids; /* Pointer to array with CNIDs to which a query applies */ size_t slq_cnids_num; /* Size of slq_cnids array */ const char *slq_path; /* Path to file or dir, used in fetchAttributes */ -#ifdef HAVE_TRACKER_SPARQL void *slq_tracker_cursor; /* Tracker SPARQL query result cursor */ -#endif -#ifdef HAVE_TRACKER_RDF - char *slq_trackerquery; /* RDF query string */ - char *slq_fts; /* FTS search string */ - int slq_service; /* Tracker service */ - int slq_offset; /* search offset */ -#endif } slq_t; /************************************************************************************************** diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index c0133edb..e1dec578 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -1733,9 +1733,6 @@ int afp_config_parse(AFPObj *AFPObj, char *processname) options->uuidconf = strdup(_PATH_STATEDIR "afp_voluuid.conf"); #ifdef HAVE_TRACKER_SPARQL options->slmod_path = strdup(_PATH_AFPDUAMPATH "slmod_sparql.so"); -#endif -#ifdef HAVE_TRACKER_RDF - options->slmod_path = strdup(_PATH_AFPDUAMPATH "slmod_rdf.so"); #endif options->flags = OPTION_UUID | AFPObj->cmdlineflags; diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index e2ca4d02..1c230f7c 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -173,40 +173,17 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ AC_DEFINE(HAVE_TRACKER_MINER, 1, [Define if Tracker miner library is available]) AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker]) AC_DEFINE([DBUS_DAEMON_PATH], ["/bin/dbus-daemon"], [Path to dbus-daemon]) - ac_cv_tracker_type="(SPARQL)" fi - dnl Test for Tracker 0.6 on Solaris and derived platforms, and FreeBSD - if test x"$ac_cv_have_tracker_sparql" != x"yes" ; then - if test x"$this_os" = x"solaris" -o x"$this_os" = x"freebsd" ; then - PKG_CHECK_MODULES([TRACKER], [tracker >= 0.6], [ac_cv_have_tracker_rdf=yes], [ac_cv_have_tracker_rdf=no]) - if test x"$ac_cv_have_tracker_rdf" = x"yes" ; then - AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available]) - AC_DEFINE(HAVE_TRACKER_RDF, 1, [Define if Tracker 0.6 with support for RDF queries is available]) - ac_cv_tracker_type="(RDF)" - case "$this_os" in - *solaris*) - AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/lib/dbus-daemon"], [Path to dbus-daemon]) - AC_DEFINE([TRACKERD_PATH], ["/bin/trackerd"], [Path to trackerd]) - ;; - *freebsd*) - AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/local/bin/dbus-daemon"], [Path to dbus-daemon]) - AC_DEFINE([TRACKERD_PATH], ["/usr/local/libexec/trackerd"], [Path to trackerd]) - ;; - esac - fi - fi - fi - - if test x"$ac_cv_have_tracker_sparql" = x"yes" -o x"$ac_cv_have_tracker_rdf" = x"yes" ; then + if test x"$ac_cv_have_tracker_sparql" = x"yes" ; then ac_cv_have_tracker=yes fi + AC_SUBST(TRACKER_CFLAGS) AC_SUBST(TRACKER_LIBS) AC_SUBST(TRACKER_MINER_CFLAGS) AC_SUBST(TRACKER_MINER_LIBS) AM_CONDITIONAL(HAVE_TRACKER_SPARQL, [test x"$ac_cv_have_tracker_sparql" = x"yes"]) - AM_CONDITIONAL(HAVE_TRACKER_RDF, [test x"$ac_cv_have_tracker_rdf" = x"yes"]) ]) dnl Whether to disable bundled libevent diff --git a/macros/summary.m4 b/macros/summary.m4 index cf64f2a6..e64debfd 100644 --- a/macros/summary.m4 +++ b/macros/summary.m4 @@ -12,7 +12,7 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [ AC_MSG_RESULT([ AFP:]) AC_MSG_RESULT([ Extended Attributes: $neta_cv_eas]) AC_MSG_RESULT([ ACL support: $with_acl_support]) - AC_MSG_RESULT([ Spotlight: $ac_cv_have_tracker $ac_cv_tracker_type]) + AC_MSG_RESULT([ Spotlight: $ac_cv_have_tracker]) AC_MSG_RESULT([ CNID:]) AC_MSG_RESULT([ backends: $compiled_backends]) AC_MSG_RESULT([ UAMS:]) @@ -91,6 +91,11 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [ AC_MSG_RESULT([ PTHREADS:]) AC_MSG_RESULT([ LIBS = $PTHREAD_LIBS]) AC_MSG_RESULT([ CFLAGS = $PTHREAD_CFLAGS]) + if test x"$ac_cv_have_tracker" = x"yes"; then + AC_MSG_RESULT([ TRACKER:]) + AC_MSG_RESULT([ LIBS = $TRACKER_LIBS]) + AC_MSG_RESULT([ CFLAGS = $TRACKER_CFLAGS]) + fi if test x"$neta_cv_have_openssl" = x"yes"; then AC_MSG_RESULT([ SSL:]) AC_MSG_RESULT([ LIBS = $SSL_LIBS])