Added AtomResource as a generalization for entries and feeds

diff --git a/atom/Makefile.am b/atom/Makefile.am
index a49a0ef..80cf24b 100644 (file)
--- a/atom/Makefile.am
+++ b/atom/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libatom.la
-libatom_la_SOURCES = entry.c person.c feed.c
+libatom_la_SOURCES = entry.c person.c feed.c resource.c
 libatom_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
 libatom_la_CFLAGS += $(XML_CFLAGS)
 libatom_la_LIBADD = $(GLIB_LIBS) $(XML_LIBS)

diff --git a/atom/resource.c b/atom/resource.c
new file mode 100644 (file)
index 0000000..00d76fe
--- /dev/null
+++ b/atom/resource.c
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (C) 2008  Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
+ *
+ *  This program 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 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+#include <atompub/atom.h>
+
+#include <glib.h>
+
+struct _atom_resource
+{
+  char *str;
+  size_t len;
+};
+
+AtomResource *
+atom_resource_new_from_feed (AtomFeed *feed)
+{
+  AtomResource *res;
+  res = g_slice_new (AtomResource);
+  atom_feed_string (feed, &(res->str), &(res->len));
+  return res;
+}
+
+AtomResource *
+atom_resource_new_from_entry (AtomEntry *entry)
+{
+  AtomResource *res;
+  res = g_slice_new (AtomResource);
+  atom_entry_string (entry, &(res->str), &(res->len));
+  return res;
+}
+
+void
+atom_resource_delete (AtomResource *res)
+{
+  if (res->str)
+    g_free (res->str);
+  g_slice_free (AtomResource, res);
+}
+
+void
+atom_resource_string (AtomResource *res, char **buffer, size_t *len)
+{
+  if (buffer)
+    *buffer = g_strdup (res->str);
+  if (len)
+    *len = res->len;
+}

diff --git a/include/atompub/Makefile.am b/include/atompub/Makefile.am
index 46fbdf1..3b2816b 100644 (file)
--- a/include/atompub/Makefile.am
+++ b/include/atompub/Makefile.am
@@ -1,3 +1,3 @@
 pkginclude_HEADERS = atom.h config.h ctx.h entry.h person.h error.h feed.h \
                iri.h backend.h atom-glib.h error-glib.h atom-xml.h \
-               entry-xml.h person-xml.h feed-xml.h globals.h
+               entry-xml.h person-xml.h feed-xml.h globals.h resource.h

diff --git a/include/atompub/atom.h b/include/atompub/atom.h
index b1625c3..cd59e46 100644 (file)
--- a/include/atompub/atom.h
+++ b/include/atompub/atom.h
@@ -28,6 +28,7 @@
 #include <atompub/entry.h>
 #include <atompub/person.h>
 #include <atompub/feed.h>
+#include <atompub/resource.h>
 #include <atompub/backend.h>
 
 #endif

diff --git a/include/atompub/resource.h b/include/atompub/resource.h
new file mode 100644 (file)
index 0000000..a6a7f26
--- /dev/null
+++ b/include/atompub/resource.h
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (C) 2008  Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
+ *
+ *  This program 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 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+#ifndef ATOMPUB_RESOURCE_H
+#define ATOMPUB_RESOURCE_H
+
+#include <atompub/ctx.h>
+#include <atompub/feed.h>
+#include <atompub/entry.h>
+
+typedef struct _atom_resource AtomResource;
+
+AtomResource * atom_resource_new_from_feed (AtomFeed *);
+AtomResource * atom_resource_new_from_entry (AtomEntry *);
+void atom_resource_delete (AtomResource *);
+void atom_resource_string (AtomResource *, char **, size_t *);
+
+#endif