Added ZakCgiTag::tag (refs #945).

diff --git a/.gitignore b/.gitignore
index bb5048c59b1712bb10d3e96e8a95abe11251987d..162ccb3f022077cbadf9a53bcd65a0251e4a6486 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,5 @@ tests/env
 tests/querystring
 tests/redirect
 tests/session
+tests/tag
 tests/url

diff --git a/src/Makefile.am b/src/Makefile.am
index a15bb40e22d2b9c411e16cc8a91b807a74dc2d1a..8dcaea6178c6632cdd00ef46e89a4c5875383c03 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,14 +6,16 @@ AM_CPPFLAGS = $(ZAKCGI_CFLAGS) \
 lib_LTLIBRARIES = libzakcgi.la
 
 libzakcgi_la_SOURCES = main.c \
-                        session.c \
-                        url.c
+                       session.c \
+                       tag.c \
+                       url.c
 
 libzakcgi_la_LDFLAGS = -no-undefined
 
 libzakcgi_include_HEADERS = libzakcgi.h \
                             main.h \
                             session.h \
+                            tag.h \
                             url.h
 
 libzakcgi_includedir = $(includedir)/libzakcgi

diff --git a/src/libzakcgi.h b/src/libzakcgi.h
index 2b6c435273826d84217b1a4b2a2479de506ace82..b33731e280453bdd85ed1f2f49f934afa7b6876f 100644 (file)
--- a/src/libzakcgi.h
+++ b/src/libzakcgi.h
@@ -21,6 +21,7 @@
 
 #include <libzakcgi/main.h>
 #include <libzakcgi/session.h>
+#include <libzakcgi/tag.h>
 #include <libzakcgi/url.h>
 
 #endif /* __LIBZAKCGI_H__ */

diff --git a/src/tag.c b/src/tag.c
new file mode 100644 (file)
index 0000000..b8f14a9
--- /dev/null
+++ b/src/tag.c
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+       #include <config.h>
+#endif
+
+#include "tag.h"
+
+static gchar
+*zak_cgi_tag_tag_valist (const gchar *name,
+                                                const gchar *id,
+                                                va_list ap)
+{
+       gchar *ret;
+       GString *str;
+
+       gboolean with_name;
+       gboolean with_content;
+
+       gchar *attr;
+       gchar *attr_val;
+
+       gchar *content;
+
+       with_name = FALSE;
+       with_content = FALSE;
+
+       content = NULL;
+
+       str = g_string_new ("");
+       g_string_append_printf (str,
+                                                       "<%s id=\"%s\"",
+                                                       name,
+                                                       id);
+
+       do
+               {
+                       attr = va_arg (ap, gchar *);
+                       if (attr != NULL)
+                               {
+                                       attr_val = va_arg (ap, gchar *);
+                                       if (attr_val != NULL)
+                                               {
+                                                       if (g_strcmp0 (attr, "content") == 0)
+                                                               {
+                                                                       with_content = TRUE;
+                                                                       if (content != NULL)
+                                                                               {
+                                                                                       g_free (content);
+                                                                               }
+                                                                       content = g_strdup (attr_val);
+                                                               }
+                                                       else
+                                                               {
+                                                                       if (g_strcmp0 (attr, "name") == 0)
+                                                                               {
+                                                                                       with_name = TRUE;
+                                                                               }
+
+                                                                       g_string_append_printf (str,
+                                                                                                                       " %s=\"%s\"",
+                                                                                                                       attr,
+                                                                                                                       attr_val);
+                                                               }
+                                               }
+                                       else
+                                               {
+                                                       g_free (attr);
+                                                       break;
+                                               }
+                               }
+                       else
+                               {
+                                       break;
+                               }
+               } while (TRUE);
+       va_end (ap);
+
+       if (!with_name)
+               {
+                       g_string_append_printf (str,
+                                                                       " name=\"%s\"",
+                                                                       id);
+               }
+
+       if (!with_content)
+               {
+                       g_string_append (str,
+                                                        " />");
+               }
+       else
+               {
+                       g_string_append_printf (str,
+                                                                       ">%s</%s>",
+                                                                       content,
+                                                                       name);
+               }
+
+       ret = g_strdup (str->str);
+       g_string_free (str, TRUE);
+
+       return ret;
+}
+
+/**
+ * zak_cgi_tag_tag:
+ * @name:
+ * @id:
+ *
+ * Returns:
+ */
+gchar
+*zak_cgi_tag_tag (const gchar *name,
+                                 const gchar *id,
+                                 ...)
+{
+       va_list ap;
+
+       va_start (ap, id);
+
+       return zak_cgi_tag_tag_valist (name, id, ap);
+}

diff --git a/src/tag.h b/src/tag.h
new file mode 100644 (file)
index 0000000..1d3ba7e
--- /dev/null
+++ b/src/tag.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __ZAK_CGI_TAG_H__
+#define __ZAK_CGI_TAG_H__
+
+
+#include <glib-object.h>
+
+#include "main.h"
+
+
+gchar *zak_cgi_tag_tag (const gchar *name,
+                                               const gchar *id,
+                                               ...);
+
+
+#endif /* __ZAK_CGI_TAG_H__ */

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b070e92df174c984325adcaec08987d23afbf5db..a5b823b291287289e189c562795cd173cd3aa82e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,4 +14,5 @@ noinst_PROGRAMS = \
                     querystring \
                     redirect \
                     session \
+                    tag \
                     url

diff --git a/tests/tag.c b/tests/tag.c
new file mode 100644 (file)
index 0000000..cfaf81a
--- /dev/null
+++ b/tests/tag.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ *
+ * This library 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.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <tag.h>
+
+int
+main (int argc, char *argv[])
+{
+       g_message ("%s", zak_cgi_tag_tag ("input", "text",
+                                                                         "type", "textarea",
+                                                                         "name", "myname",
+                                                                         "content", "the content of the text area",
+                                                                         NULL));
+
+       return 0;
+}