From 08ca33713db3c297990ccef7693740767bb9f5bc Mon Sep 17 00:00:00 2001
From: Timothy Stack <tstack@vmware.com>
Date: Thu, 20 Oct 2011 15:38:37 -0700
Subject: [PATCH] Fix SQL highlighting in the text view

---
 src/lnav.cc             | 39 +++++++++++++++++++++------------------
 src/log_format_impls.cc |  1 +
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/lnav.cc b/src/lnav.cc
index bbba98d4..606e0c1e 100644
--- a/src/lnav.cc
+++ b/src/lnav.cc
@@ -2883,6 +2883,25 @@ void ensure_dotlnav(void)
 	mkdir(path.c_str(), 0755);
 }
 
+static void setup_highlights(textview_curses::highlight_map_t &hm)
+{
+    hm["(sql"] = textview_curses::
+        highlighter(xpcre_compile("(?: alter | select | insert | update "
+                                  "| create "
+                                  "| from | where | order by "
+                                  "| group by )", PCRE_CASELESS));
+    hm["(java"] = textview_curses::
+        highlighter(xpcre_compile("(?:\\w+\\.java:\\d+)"));
+    hm["(xml"] = textview_curses::
+        highlighter(xpcre_compile("<(/?[^ >]+)[^>]*>"));
+    hm["(stringd"] = textview_curses::
+        highlighter(xpcre_compile("\".*(?<!\\\\)\""));
+    hm["(strings"] = textview_curses::
+        highlighter(xpcre_compile("\'.*(?<!\\\\)\'"));
+    hm["(ip"] = textview_curses::
+        highlighter(xpcre_compile("\\d+\\.\\d+\\.\\d+\\.\\d+"));
+}
+
 int main(int argc, char *argv[])
 {
     int lpc, c, retval = EXIT_SUCCESS;
@@ -2944,24 +2963,8 @@ int main(int argc, char *argv[])
     set_sub_source(&lnav_data.ld_db_source);
 
     {
-	textview_curses::highlight_map_t &hm =
-	    lnav_data.ld_views[LNV_LOG].get_highlights();
-
-	hm["(sql"] = textview_curses::
-		     highlighter(xpcre_compile("(?: alter | select | insert | update "
-					       "| create "
-					       "| from | where | order by "
-					       "| group by )", PCRE_CASELESS));
-	hm["(java"] = textview_curses::
-		      highlighter(xpcre_compile("(?:\\w+\\.java:\\d+)"));
-	hm["(xml"] = textview_curses::
-		     highlighter(xpcre_compile("<(/?[^ >]+)[^>]*>"));
-	hm["(stringd"] = textview_curses::
-			 highlighter(xpcre_compile("\".*(?<!\\\\)\""));
-	hm["(strings"] = textview_curses::
-			 highlighter(xpcre_compile("\'.*(?<!\\\\)\'"));
-	hm["(ip"] = textview_curses::
-		    highlighter(xpcre_compile("\\d+\\.\\d+\\.\\d+\\.\\d+"));
+	setup_highlights(lnav_data.ld_views[LNV_LOG].get_highlights());
+        setup_highlights(lnav_data.ld_views[LNV_TEXT].get_highlights());
     }
 
     lnav_data.ld_looping = true;
diff --git a/src/log_format_impls.cc b/src/log_format_impls.cc
index be2e9226..7bc26caa 100644
--- a/src/log_format_impls.cc
+++ b/src/log_format_impls.cc
@@ -174,6 +174,7 @@ class generic_log_format : public log_format {
 	      char *prefix,
 	      int len) {
 	static const char *log_fmt[] = {
+	    "%63[0-9: ,-]%15[^:]",
 	    "%63[a-zA-Z0-9: ,-] [%*[^]]]%15[^:]",
 	    "%63[a-zA-Z0-9: ,-] %15s",
 	    "[%63[0-9: .-] %*s %15s",