summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn Russell <martyn@lanedo.com>2014-04-29 11:40:57 +0100
committerMartyn Russell <martyn@lanedo.com>2014-04-29 11:41:56 +0100
commit7894f3f43f07e2f42081e81a8c2835bdfb2a5021 (patch)
treee071fc196098b627c01f9cd33b25a029c1c3d8ab
parent243c97fa96a2f6b19bce1acf26946d1a516a0a1c (diff)
downloadtracker-7894f3f43f07e2f42081e81a8c2835bdfb2a5021.tar.gz
tracker-search: Fix output for email searching
- Make sure resource links are shown in green - Make sure snippets are always shown (shows in red matches)
-rw-r--r--src/tracker-utils/tracker-search.c29
1 files changed, 10 insertions, 19 deletions
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index c809b63a6..2a4968a44 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -412,24 +412,15 @@ get_emails_results (TrackerSparqlConnection *connection,
g_print ("%s:\n", _("Emails"));
while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
- if (details) {
- g_print (" %s%s%s, %s (%s)\n",
- disable_color ? "" : TITLE_BEGIN,
- tracker_sparql_cursor_get_string (cursor, 0, NULL),
- disable_color ? "" : TITLE_END,
- tracker_sparql_cursor_get_string (cursor, 1, NULL),
- tracker_sparql_cursor_get_string (cursor, 2, NULL));
-
- print_snippet (tracker_sparql_cursor_get_string (cursor, 3, NULL));
- } else {
- g_print (" %s%s%s, %s\n",
- disable_color ? "" : TITLE_BEGIN,
- tracker_sparql_cursor_get_string (cursor, 0, NULL),
- disable_color ? "" : TITLE_END,
- tracker_sparql_cursor_get_string (cursor, 1, NULL));
+ g_print (" %s%s%s\n"
+ " %s, %s\n",
+ disable_color ? "" : TITLE_BEGIN,
+ tracker_sparql_cursor_get_string (cursor, 0, NULL),
+ disable_color ? "" : TITLE_END,
+ tracker_sparql_cursor_get_string (cursor, 1, NULL),
+ tracker_sparql_cursor_get_string (cursor, 2, NULL));
- print_snippet (tracker_sparql_cursor_get_string (cursor, 2, NULL));
- }
+ print_snippet (tracker_sparql_cursor_get_string (cursor, 3, NULL));
count++;
}
@@ -462,7 +453,7 @@ get_emails (TrackerSparqlConnection *connection,
fts = get_fts_string (search_terms, use_or_operator);
if (fts) {
- query = g_strdup_printf ("SELECT nmo:receivedDate(?email) nmo:messageSubject(?email) nie:url(?email) fts:snippet(?email, \"%s\", \"%s\") "
+ query = g_strdup_printf ("SELECT nie:url(?email) nmo:receivedDate(?email) nmo:messageSubject(?email) fts:snippet(?email, \"%s\", \"%s\") "
"WHERE { "
" ?email a nmo:Email ;"
" fts:match \"%s\" ."
@@ -476,7 +467,7 @@ get_emails (TrackerSparqlConnection *connection,
search_offset,
search_limit);
} else {
- query = g_strdup_printf ("SELECT nmo:receivedDate(?email) nmo:messageSubject(?email) nie:url(?email) "
+ query = g_strdup_printf ("SELECT nie:url(?email) nmo:receivedDate(?email) nmo:messageSubject(?email) "
"WHERE { "
" ?email a nmo:Email ."
"} "