Change lookup method to find if content is of XML type.

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

diff --git a/atom/content.c b/atom/content.c
index 2adb776..4dea453 100644 (file)
--- a/atom/content.c
+++ b/atom/content.c
@@ -56,26 +56,18 @@ atom_content_new_src (char *type, char *src)
 }
 
 AtomContent *
-atom_content_new_data_len (char *buffer, size_t len)
+atom_content_new_from_xmlnode (xmlNodePtr root)
 {
   AtomContent *content;
-  xmlDocPtr doc;
-  xmlNodePtr root;
   xmlNodePtr child;
-  doc = xmlReadMemory (buffer, len, NULL, NULL,
-                      XML_PARSE_RECOVER | XML_PARSE_NOERROR);
-  if (doc == NULL || (root = xmlDocGetRootElement (doc)) == NULL)
-    return NULL;
   if (xmlStrcmp (root->name, "content"))
     {
-      xmlFreeDoc (doc);
       return NULL;
     }
   content = g_slice_new0 (AtomContent);
   if ((content->type = xmlGetProp (root, "type")) == NULL)
     {
       g_slice_free (AtomContent, content);
-      xmlFreeDoc (doc);
       return NULL;
     }
   content->src = xmlGetProp (root, "src");
@@ -85,7 +77,10 @@ atom_content_new_data_len (char *buffer, size_t len)
         XML child or a content child. Using the type attribute might
         be a good idead. Let's just ask that the current method
         works. */
-      if (root->children && root->children->type == XML_ELEMENT_NODE)
+      child = root->children;
+      while (child && child->type != XML_ELEMENT_NODE)
+       child = child->next;
+      if (child)
        {
          content->xmlcontent = xmlCopyNodeList (root->children);
        }
@@ -95,6 +90,20 @@ atom_content_new_data_len (char *buffer, size_t len)
          content->content_len = xmlStrlen (content->content);
        }
     }
+  return content;
+}
+
+AtomContent *
+atom_content_new_data_len (char * buffer, size_t len)
+{
+  AtomContent *content;
+  xmlDocPtr doc;
+  xmlNodePtr root;
+  doc = xmlReadMemory (buffer, len, NULL, NULL,
+                      XML_PARSE_RECOVER | XML_PARSE_NOERROR);
+  if (doc == NULL || (root = xmlDocGetRootElement (doc)) == NULL)
+    return NULL;
+  content = atom_content_new_from_xmlnode (root);
   xmlFreeDoc (doc);
   return content;
 }
@@ -248,13 +257,13 @@ atom_content_to_xmlnode (AtomContent *content)
 }
 
 xmlNodePtr
-atom_content_content_xmlnode (AtomContent *content)
+atom_content_xmlcontent (AtomContent *content)
 {
   return content->xmlcontent;
 }
 
 void
-atom_content_content_set_xmlnode (AtomContent *content, xmlNodePtr node)
+atom_content_xmlcontent_set (AtomContent *content, xmlNodePtr node)
 {
   if (content->xmlcontent)
     xmlFreeNode (content->xmlcontent);