Fix updating entry XML with category element

[cascardo/atompub.git] / atom / entry.c

diff --git a/atom/entry.c b/atom/entry.c
index 99ab439..ff414ee 100644 (file)
--- a/atom/entry.c
+++ b/atom/entry.c
@@ -22,28 +22,38 @@
 #include <glib.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
+#include <time.h>
 
 struct _atom_entry
 {
   xmlDocPtr doc;
-  char *id;
+  AtomID *id;
   char *title;
+  time_t updated;
   GPtrArray *authors;
+  GPtrArray *categories;
   char *summary;
 };
 
+static void atom_entry_updated_set_from_iso8601 (AtomEntry *, char *);
+
 void atom_entry_author_add (AtomEntry *, AtomPerson *);
 static void atom_entry_authors_delete (AtomEntry *);
 
+void atom_entry_category_add (AtomEntry *, AtomCategory *);
+static void atom_entry_categories_delete (AtomEntry *);
+
 AtomEntry *
-atom_entry_new (char *title, AtomPerson *author)
+atom_entry_new (char *id, char *title, AtomPerson *author)
 {
   AtomEntry *entry;
   entry = g_slice_new (AtomEntry);
   entry->doc = NULL;
-  entry->id = NULL;
+  entry->id = atom_id_new (id);
   entry->title = g_strdup (title);
+  entry->updated = time (0);
   entry->authors = NULL;
+  entry->categories = NULL;
   atom_entry_author_add (entry, author);
   entry->summary = NULL;
   return entry;
@@ -75,15 +85,25 @@ atom_entry_new_data_len (char *data, size_t len)
       char * content;
       content = xmlNodeGetContent (child->xmlChildrenNode);
       if (!xmlStrcmp (child->name, "id"))
-       entry->id = content;
+        entry->id = atom_id_new (content);
       else if (!xmlStrcmp (child->name, "title"))
-       entry->title = content;
+        entry->title = g_strdup (content);
+      else if (!xmlStrcmp (child->name, "updated"))
+        atom_entry_updated_set_from_iso8601 (entry, content);
       else if (!xmlStrcmp (child->name, "summary"))
-       entry->summary = content;
+        entry->summary = g_strdup (content);
       else if (!xmlStrcmp (child->name, "author"))
-       atom_entry_author_add (entry, atom_person_new_from_xmlnode (child));
+        atom_entry_author_add (entry, atom_person_new_from_xmlnode (child));
+      else if (!xmlStrcmp (child->name, "category"))
+        atom_entry_category_add (entry, atom_category_new_from_xmlnode (child));
       else
-       xmlFree (content);
+        xmlFree (content);
+    }
+  if (entry->id == NULL || entry->title == NULL ||
+      entry->updated == 0 || entry->authors == NULL)
+    {
+      atom_entry_delete (entry);
+      return NULL;
     }
   return entry;
 }
@@ -94,28 +114,32 @@ atom_entry_delete (AtomEntry *entry)
   if (entry->doc)
     xmlFreeDoc (entry->doc);
   if (entry->id)
-    g_free (entry->id);
+    atom_id_delete (entry->id);
   if (entry->title)
     g_free (entry->title);
   if (entry->authors)
     atom_entry_authors_delete (entry);
+  if (entry->categories)
+    atom_entry_categories_delete (entry);
   if (entry->summary)
     g_free (entry->summary);
   g_slice_free (AtomEntry, entry);
 }
 
-char *
+AtomID *
 atom_entry_id (AtomEntry *entry)
 {
   return entry->id;
 }
 
 void
-atom_entry_id_set (AtomEntry *entry, char *id)
+atom_entry_id_set (AtomEntry *entry, AtomID *id)
 {
+  if (id == NULL)
+    return;
   if (entry->id)
-    g_free (entry->id);
-  entry->id = g_strdup (id);
+    atom_id_delete (entry->id);
+  entry->id = id;
 }
 
 char *
@@ -127,11 +151,42 @@ atom_entry_title (AtomEntry *entry)
 void
 atom_entry_title_set (AtomEntry *entry, char *title)
 {
+  if (title == NULL)
+    return;
   if (entry->title)
     g_free (title);
   entry->title = g_strdup (title);
 }
 
+time_t
+atom_entry_updated (AtomEntry *entry)
+{
+  return entry->updated;
+}
+
+void
+atom_entry_updated_set (AtomEntry *entry, time_t updated)
+{
+  entry->updated = updated;
+}
+
+static void
+atom_entry_updated_set_from_iso8601 (AtomEntry *entry, char *updated)
+{
+  GTimeVal gtv;
+  g_time_val_from_iso8601 (updated, &gtv);
+  entry->updated = gtv.tv_sec;
+}
+
+static char *
+atom_entry_updated_to_iso8601 (AtomEntry *entry)
+{
+  GTimeVal gtv;
+  gtv.tv_sec = entry->updated;
+  gtv.tv_usec = 0;
+  return g_time_val_to_iso8601 (&gtv);
+}
+
 void
 atom_entry_authors (AtomEntry *entry, AtomPerson *** authors, size_t *len)
 {
@@ -161,6 +216,37 @@ atom_entry_authors_delete (AtomEntry *entry)
   g_ptr_array_free (entry->authors, TRUE);
 }
 
+void
+atom_entry_categories (AtomEntry *entry, AtomCategory *** categories,
+                       size_t *len)
+{
+  if (len)
+    *len = entry->categories->len;
+  if (categories)
+    *categories = entry->categories->pdata;
+}
+
+void
+atom_entry_category_add (AtomEntry *entry, AtomCategory *category)
+{
+  g_ptr_array_add (entry->categories, category);
+  if (entry->categories == NULL)
+    {
+      entry->categories = g_ptr_array_new ();
+    }
+  g_ptr_array_add (entry->categories, category);
+}
+
+static void
+atom_entry_categories_delete (AtomEntry *entry)
+{
+  size_t len = entry->categories->len;
+  int i;
+  for (i = 0; i < len; i++)
+    atom_category_delete (g_ptr_array_index (entry->categories, i));
+  g_ptr_array_free (entry->categories, TRUE);
+}
+
 char *
 atom_entry_summary (AtomEntry *entry)
 {
@@ -181,8 +267,11 @@ atom_entry_update_xmlnode (AtomEntry *entry)
   xmlNodePtr root;
   xmlNodePtr id;
   xmlNodePtr title;
+  xmlNodePtr updated;
   xmlNodePtr summary;
   xmlNodePtr author;
+  xmlNodePtr cat;
+  char *updatedstr;
   int i;
   if (entry->doc == NULL)
     {
@@ -202,8 +291,10 @@ atom_entry_update_xmlnode (AtomEntry *entry)
           next = child->next;
           if (!xmlStrcmp (child->name, "id") ||
               !xmlStrcmp (child->name, "title") ||
+              !xmlStrcmp (child->name, "updated") ||
               !xmlStrcmp (child->name, "summary") ||
-              !xmlStrcmp (child->name, "author"))
+              !xmlStrcmp (child->name, "author") ||
+              !xmlStrcmp (child->name, "category"))
             {
               xmlUnlinkNode (child);
               xmlFreeNode (child);
@@ -211,8 +302,11 @@ atom_entry_update_xmlnode (AtomEntry *entry)
           child = next;
         }
     }
-  id = xmlNewTextChild (root, NULL, "id", entry->id);
+  id = xmlNewTextChild (root, NULL, "id", atom_id_string (entry->id));
   title = xmlNewTextChild (root, NULL, "title", entry->title);
+  updatedstr = atom_entry_updated_to_iso8601 (entry);
+  updated = xmlNewTextChild (root, NULL, "updated", updatedstr);
+  g_free (updatedstr);
   if (entry->summary)
     summary = xmlNewTextChild (root, NULL, "summary", entry->summary);
   for (i = 0; i < entry->authors->len; i++)
@@ -222,6 +316,13 @@ atom_entry_update_xmlnode (AtomEntry *entry)
       author = atom_person_to_xmlnode (person, "author");
       xmlAddChild (root, author);
     }
+  for (i = 0; entry->categories && i < entry->categories->len; i++)
+    {
+      AtomCategory *category;
+      category = g_ptr_array_index (entry->categories, i);
+      cat = atom_category_to_xmlnode (category, "category");
+      xmlAddChild (root, cat);
+    }
 }
 
 void