From: Andrea Zagli <azagli@libero.it>
Date: Sun, 30 Dec 2012 18:58:03 +0000 (+0100)
Subject: Parsing service document for workspaces.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=e3cf1188ad295a45531437d8fd636efe2789fa4f;p=libgapp
Parsing service document for workspaces.
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e5979e9..b456e8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,11 +14,13 @@ AM_CPPFLAGS = $(GAPP_CFLAGS) \
lib_LTLIBRARIES = libgapp.la
-libgapp_la_SOURCES = service.c
+libgapp_la_SOURCES = service.c \
+ workspace.c
libgapp_la_LDFLAGS = -no-undefined
libgapp_include_HEADERS = gapp.h \
- service.h
+ service.h \
+ workspace.h
libgapp_includedir = $(includedir)/libgapp
diff --git a/src/gapp.h b/src/gapp.h
index 7de2939..780793d 100644
--- a/src/gapp.h
+++ b/src/gapp.h
@@ -22,6 +22,7 @@
#ifndef __GAPP_H__
#define __GAPP_H__
-#include <service.h>
+#include <libgapp/service.h>
+#include <libgapp/workspace.h>
#endif /* __GAPP_H__ */
diff --git a/src/service.c b/src/service.c
index 80a1d0d..a88df02 100644
--- a/src/service.c
+++ b/src/service.c
@@ -31,8 +31,8 @@
#include <libsoup/soup.h>
#endif
-#include "gapp.h"
#include "service.h"
+#include "workspace.h"
enum
{
@@ -52,7 +52,7 @@ static void gapp_service_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
-static GappService *parse_xml (xmlDoc *xdoc);
+static void parse_xml (GappService *service);
#define GAPP_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GAPP_SERVICE, GappServicePrivate))
@@ -66,6 +66,8 @@ struct _GappServicePrivate
xmlDoc *xdoc;
xmlNode *xroot;
+
+ GSList *workspace;
};
G_DEFINE_TYPE (GappService, gapp_service, G_TYPE_OBJECT)
@@ -94,6 +96,7 @@ gapp_service_init (GappService *service)
GappServicePrivate *priv = GAPP_SERVICE_GET_PRIVATE (service);
priv->url = NULL;
+ priv->workspace = NULL;
}
/**
@@ -151,6 +154,15 @@ GappService
else
{
priv->xroot = xmlDocGetRootElement (priv->xdoc);
+ if (priv->xroot != NULL
+ && g_strcmp0 (priv->xroot->name, "service") == 0)
+ {
+ parse_xml (service);
+ }
+ else
+ {
+ g_warning ("No valid root element in service document.");
+ }
}
}
else
@@ -225,10 +237,40 @@ gapp_service_get_property (GObject *object, guint property_id, GValue *value, GP
}
}
-static GappService
-*parse_xml (xmlDoc *xdoc)
+static void
+parse_xml (GappService *service)
{
- GappService *service;
+ xmlXPathObject *xpresult;
+ xmlXPathContext *xpcontext;
- return service;
+ guint node;
+ guint nodes;
+
+ GappWorkspace *workspace;
+
+ GappServicePrivate *priv = GAPP_SERVICE_GET_PRIVATE (service);
+
+ xpcontext = xmlXPathNewContext (priv->xdoc);
+
+ /* searching workspaces */
+ xpcontext->node = priv->xroot;
+ xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::workspace", xpcontext);
+ if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval))
+ {
+ nodes = xpresult->nodesetval->nodeNr;
+ for (node = 0; node < nodes; node++)
+ {
+ workspace = gapp_workspace_new_from_xml (xpresult->nodesetval->nodeTab[node]);
+ if (workspace != NULL)
+ {
+ g_message ("Workspace found: \"%s\"",
+ gapp_workspace_get_title (workspace));
+ priv->workspace = g_slist_append (priv->workspace, workspace);
+ }
+ }
+ }
+ else
+ {
+ g_warning ("No workspace found.");
+ }
}
diff --git a/src/workspace.c b/src/workspace.c
new file mode 100644
index 0000000..d3065dd
--- /dev/null
+++ b/src/workspace.c
@@ -0,0 +1,230 @@
+/* libgfeed
+ *
+ * Copyright (C) 2012 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
+ *
+ * Andrea Zagli <azagli@libero.it>
+ */
+
+#include <libxml/xpath.h>
+
+#include <libgfeed/atomtext.h>
+
+#include "workspace.h"
+
+enum
+{
+ PROP_0,
+ PROP_TITLE
+};
+
+static void gapp_workspace_class_init (GappWorkspaceClass *klass);
+static void gapp_workspace_init (GappWorkspace *atome);
+
+static void gapp_workspace_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gapp_workspace_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+#define GAPP_WORKSPACE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GAPP_WORKSPACE, GappWorkspacePrivate))
+
+typedef struct _GappWorkspacePrivate GappWorkspacePrivate;
+struct _GappWorkspacePrivate
+ {
+ AtomText *title;
+ };
+
+G_DEFINE_TYPE (GappWorkspace, gapp_workspace, TYPE_ATOM_COMMON)
+
+static void
+gapp_workspace_class_init (GappWorkspaceClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (object_class, sizeof (GappWorkspacePrivate));
+
+ object_class->set_property = gapp_workspace_set_property;
+ object_class->get_property = gapp_workspace_get_property;
+
+ g_object_class_install_property (object_class, PROP_TITLE,
+ g_param_spec_object ("title",
+ "Title",
+ "A human-readable title for the workspace.",
+ TYPE_ATOM_TEXT,
+ G_PARAM_READWRITE));
+}
+
+static void
+gapp_workspace_init (GappWorkspace *atome)
+{
+}
+
+/**
+ * gapp_workspace_new:
+ * @title: a human-readable title for an entry or feed.
+ *
+ * Returns: the newly created #GappWorkspace object.
+ */
+GappWorkspace
+*gapp_workspace_new (AtomText *title)
+{
+ GappWorkspace *gapp_workspace = GAPP_WORKSPACE (g_object_new (gapp_workspace_get_type (), NULL));
+
+ g_object_set (G_OBJECT (gapp_workspace),
+ "title", title,
+ NULL);
+
+ return gapp_workspace;
+}
+
+/**
+ * gapp_workspace_new_from_xml:
+ * @xnode: an #xmlNode.
+ *
+ * Returns: the newly created #GappWorkspace object.
+ */
+GappWorkspace
+*gapp_workspace_new_from_xml (xmlNode *xnode)
+{
+ GappWorkspace *gapp_workspace = NULL;
+
+ AtomText *title;
+
+ xmlXPathObject *xpresult;
+ xmlXPathContext *xpcontext;
+
+ title = NULL;
+ xpcontext = xmlXPathNewContext (xnode->doc);
+
+ xmlXPathRegisterNs (xpcontext, (const xmlChar *)"atom", (const xmlChar *)"http://www.w3.org/2005/Atom");
+
+ /* searching for title */
+ xpcontext->node = xnode;
+ xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::atom:title", xpcontext);
+ if (xpresult == NULL || xpresult->nodesetval == NULL || xpresult->nodesetval->nodeNr != 1)
+ {
+ g_critical ("Workspace must contain one and only title element.");
+ }
+ else
+ {
+ title = atom_text_new_from_xml (xpresult->nodesetval->nodeTab[0]);
+ if (title == NULL)
+ {
+ g_critical ("Invalid title element.");
+ }
+ }
+
+ if (title != NULL)
+ {
+ gapp_workspace = gapp_workspace_new (title);
+
+ GappWorkspacePrivate *priv = GAPP_WORKSPACE_GET_PRIVATE (gapp_workspace);
+
+ xmlNode *cur = xnode->children;
+
+ while (cur != NULL)
+ {
+ if (xmlStrcmp (cur->name, (const xmlChar *)"collection") == 0)
+ {
+ }
+
+ cur = cur->next;
+ }
+ }
+
+ return gapp_workspace;
+}
+
+/**
+ * atgapp_workspace_get_xml:
+ * @gapp_workspace: an #GappWorkspace object.
+ * @xnode: an #xmlNode.
+ *
+ */
+void
+gapp_workspace_get_xml (GappWorkspace *gapp_workspace, xmlNode *xnode)
+{
+ xmlNode *xnodenew;
+ GList *lst;
+
+ GappWorkspacePrivate *priv = GAPP_WORKSPACE_GET_PRIVATE (gapp_workspace);
+
+ atom_common_get_xml (ATOM_COMMON (gapp_workspace), xnode);
+
+ if (priv->title != NULL)
+ {
+ xnodenew = xmlNewNode (NULL, (const xmlChar *)"title");
+ xmlAddChild (xnode, xnodenew);
+ atom_text_get_xml (priv->title, xnodenew);
+ }
+}
+
+const gchar
+*gapp_workspace_get_title (GappWorkspace *gapp_workspace)
+{
+ const gchar *ret;
+
+ g_object_get (G_OBJECT (gapp_workspace),
+ "title", &ret,
+ NULL);
+
+ return ret;
+}
+
+static void
+gapp_workspace_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+{
+ GObject *obj;
+
+ GappWorkspace *atome = GAPP_WORKSPACE (object);
+ GappWorkspacePrivate *priv = GAPP_WORKSPACE_GET_PRIVATE (atome);
+
+ switch (property_id)
+ {
+ case PROP_TITLE:
+ if (g_value_get_object (value) != NULL && IS_ATOM_TEXT (g_value_get_object (value)))
+ {
+ priv->title = (AtomText *)g_value_dup_object (value);
+ }
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gapp_workspace_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+{
+ GappWorkspace *atome = GAPP_WORKSPACE (object);
+ GappWorkspacePrivate *priv = GAPP_WORKSPACE_GET_PRIVATE (atome);
+
+ switch (property_id)
+ {
+ case PROP_TITLE:
+ g_value_set_object (value, priv->title);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
diff --git a/src/workspace.h b/src/workspace.h
new file mode 100644
index 0000000..f2e4a42
--- /dev/null
+++ b/src/workspace.h
@@ -0,0 +1,69 @@
+/* libgfeed
+ *
+ * Copyright (C) 2012 Andrea Zagli <azagli@inwind.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
+ *
+ * Andrea Zagli <azagli@inwind.it>
+ */
+
+#ifndef __GAPP_WORKSPACE_H__
+#define __GAPP_WORKSPACE_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <libxml/tree.h>
+
+#include <libgfeed/atomtext.h>
+
+#include "workspace.h"
+
+G_BEGIN_DECLS
+
+
+#define TYPE_GAPP_WORKSPACE (gapp_workspace_get_type ())
+#define GAPP_WORKSPACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GAPP_WORKSPACE, GappWorkspace))
+#define GAPP_WORKSPACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GAPP_WORKSPACE, GappWorkspaceClass))
+#define IS_GAPP_WORKSPACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GAPP_WORKSPACE))
+#define IS_GAPP_WORKSPACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GAPP_WORKSPACE))
+#define GAPP_WORKSPACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GAPP_WORKSPACE, GappWorkspaceClass))
+
+
+typedef struct _GappWorkspace GappWorkspace;
+typedef struct _GappWorkspaceClass GappWorkspaceClass;
+
+struct _GappWorkspace
+ {
+ GObject parent;
+ };
+
+struct _GappWorkspaceClass
+ {
+ GObjectClass parent_class;
+ };
+
+GType gapp_workspace_get_type (void) G_GNUC_CONST;
+
+GappWorkspace *gapp_workspace_new (AtomText *title);
+GappWorkspace *gapp_workspace_new_from_xml (xmlNode *xnode);
+
+void gapp_workspace_get_xml (GappWorkspace *gapp_workspace, xmlNode *xnode);
+
+const gchar *gapp_workspace_get_title (GappWorkspace *gapp_workspace);
+
+
+G_END_DECLS
+
+#endif /* __GAPP_WORKSPACE_H__ */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab0f945..774d402 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,8 +2,7 @@ AM_CPPFLAGS = $(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(GAPP_CFLAGS) \
$(LIBSOUP_CFLAGS) \
- -I$(top_srcdir)/src \
- -DGUIDIR="\"@abs_builddir@\""
+ -I$(top_srcdir)/src
LIBS = $(GAPP_LIBS) \
$(LIBSOUP_LIBS) \
diff --git a/tests/service.c b/tests/service.c
index 9a548a9..b95ddfe 100644
--- a/tests/service.c
+++ b/tests/service.c
@@ -1,4 +1,4 @@
-#include <gapp.h>
+#include "service.h"
int
main (int argc, char *argv[])