Parsing tags on the header.

diff --git a/src/parser.c b/src/parser.c
index 74307d4e7f04c21a5d2e3d3c4e85eb43aa1c9e6b..4d42b3582a2a10aa6d68ecdc51b8949432b015ac 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -56,6 +56,7 @@ typedef struct
        {
                guint level;
                gchar *str;
+               gchar *tags;
        } Header;
 
 static void
@@ -176,7 +177,13 @@ static gboolean
 traverse_func (GNode *node,
                gpointer data)
 {
-       g_printf ("%d: %s\n", g_node_depth (node), ((Header *)node->data)->str);
+       Header *h = (Header *)node->data;
+
+       g_printf ("%d: %s\n", g_node_depth (node), h->str);
+       if (h->tags != NULL)
+               {
+                       g_printf ("\tTAGS %s\n", h->tags);
+               }
 
        return FALSE;
 }
@@ -200,6 +207,11 @@ zak_gorg_parser_parse (ZakGorgParser *zak_gorg_parser)
        GNode *root;
        GNode *cur;
 
+       GRegex *regex;
+       GMatchInfo *match_info;
+       gint rx_start;
+       gint rx_end;
+
        gchar *strline;
 
        error = NULL;
@@ -240,6 +252,8 @@ zak_gorg_parser_parse (ZakGorgParser *zak_gorg_parser)
 
        gchar *str = buffer;
 
+       regex = g_regex_new (":.*:$", 0, 0, NULL);
+
        root = g_node_get_root (zak_gorg_parser->nodes);
 
        start = 0;
@@ -254,6 +268,8 @@ zak_gorg_parser_parse (ZakGorgParser *zak_gorg_parser)
                                        g_printf ("%d: %s\n", line, strline);
                                        start = i + 1;
 
+                                       g_regex_match (regex, strline, 0, &match_info);
+
                                        Header *h = g_new0 (Header, 1);
                                        for (l = 0; l < i - start; l++)
                                                {
@@ -263,7 +279,26 @@ zak_gorg_parser_parse (ZakGorgParser *zak_gorg_parser)
                                                                        break;
                                                                }
                                                }
-                                       h->str = g_strdup (strline);
+
+                                       rx_start = 0;
+                                       h->tags = g_match_info_fetch (match_info, 0);
+                                       if (h->tags != NULL)
+                                               {
+                                                       g_match_info_fetch_pos (match_info, 0, &rx_start, NULL);
+                                               }
+
+                                       if (rx_start > 0)
+                                               {
+                                                       h->str = g_strndup (strline, rx_start);
+                                               }
+                                       else
+                                               {
+                                                       h->str = g_strdup (strline);
+                                               }
+                                       g_strstrip (h->str);
+
+                                       g_match_info_free (match_info);
+                                       g_free (strline);
 
                                        GNode *n = g_node_new (h);
 
@@ -296,4 +331,6 @@ zak_gorg_parser_parse (ZakGorgParser *zak_gorg_parser)
        g_free (buffer);
        g_object_unref (ginfo);
        g_object_unref (giostream);
+
+       g_regex_unref (regex);
 }

diff --git a/tests/simple.org b/tests/simple.org
index e56df32de07899ed068ddcb67488cb526859d413..1cbfd2bc121729075107d9455d92014d1ac2e15c 100644 (file)
--- a/tests/simple.org
+++ b/tests/simple.org
@@ -1,8 +1,8 @@
-* first line
-** sub 1 first line
+* first line                                                          :first:
+** sub 1 first line                                          :tag1:tag2:tag3:
 ** sub 2 first line
-* second line
+* second line                                                          :tag1:
 *** sub 1 sub 1 second line (without parent)
-* third line
-** sub 1 third line
+* third line                                                     :third:line:
+** sub 1 :third (no tag): line
 *** sub 1 sub 1 third line