Use AtomID instead of string consistently in entry

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

diff --git a/atom/entry.c b/atom/entry.c
index 7faccd3..99a4172 100644 (file)
--- a/atom/entry.c
+++ b/atom/entry.c
@@ -26,7 +26,7 @@
 struct _atom_entry
 {
   xmlDocPtr doc;
-  char *id;
+  AtomID *id;
   char *title;
   GPtrArray *authors;
   char *summary;
@@ -75,15 +75,15 @@ 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, "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
-       xmlFree (content);
+        xmlFree (content);
     }
   return entry;
 }
@@ -94,7 +94,7 @@ 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)
@@ -104,18 +104,18 @@ atom_entry_delete (AtomEntry *entry)
   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 (entry->id)
-    g_free (entry->id);
-  entry->id = g_strdup (id);
+    atom_id_delete (entry->id);
+  entry->id = id;
 }
 
 char *
@@ -129,7 +129,7 @@ atom_entry_title_set (AtomEntry *entry, char *title)
 {
   if (entry->title)
     g_free (title);
-  entry->title = g_strdup (entry);
+  entry->title = g_strdup (title);
 }
 
 void
@@ -175,16 +175,65 @@ atom_entry_summary_set (AtomEntry *entry, char *summary)
   entry->summary = g_strdup (summary);
 }
 
+static void
+atom_entry_update_xmlnode (AtomEntry *entry)
+{
+  xmlNodePtr root;
+  xmlNodePtr id;
+  xmlNodePtr title;
+  xmlNodePtr summary;
+  xmlNodePtr author;
+  int i;
+  if (entry->doc == NULL)
+    {
+      entry->doc = xmlNewDoc ("1.0");
+      root = xmlNewNode (NULL, "entry");
+      xmlNewNs (root, ATOM_NAMESPACE, NULL);
+      xmlDocSetRootElement (entry->doc, root);
+    }
+  else
+    {
+      xmlNodePtr child;
+      xmlNodePtr next;
+      root = xmlDocGetRootElement (entry->doc);
+      child = root->xmlChildrenNode;
+      while (child != NULL)
+        {
+          next = child->next;
+          if (!xmlStrcmp (child->name, "id") ||
+              !xmlStrcmp (child->name, "title") ||
+              !xmlStrcmp (child->name, "summary") ||
+              !xmlStrcmp (child->name, "author"))
+            {
+              xmlUnlinkNode (child);
+              xmlFreeNode (child);
+            }
+          child = next;
+        }
+    }
+  id = xmlNewTextChild (root, NULL, "id", atom_id_string (entry->id));
+  title = xmlNewTextChild (root, NULL, "title", entry->title);
+  if (entry->summary)
+    summary = xmlNewTextChild (root, NULL, "summary", entry->summary);
+  for (i = 0; i < entry->authors->len; i++)
+    {
+      AtomPerson *person;
+      person = g_ptr_array_index (entry->authors, i);
+      author = atom_person_to_xmlnode (person, "author");
+      xmlAddChild (root, author);
+    }
+}
+
 void
 atom_entry_string (AtomEntry *entry, char **buffer, size_t *len)
 {
+  atom_entry_update_xmlnode (entry);
   xmlDocDumpMemory (entry->doc, buffer, len);
 }
 
 xmlNodePtr
 atom_entry_to_xmlnode (AtomEntry *entry)
 {
-  if (entry->doc)
-    return xmlCopyNodeList (xmlDocGetRootElement (entry->doc));
-  return NULL;
+  atom_entry_update_xmlnode (entry);
+  return xmlCopyNodeList (xmlDocGetRootElement (entry->doc));
 }