diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-30 08:52:44 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-30 08:52:44 +0000 |
| commit | 910ecec91d3de8d43eee9eef9201dd3fb1e00060 (patch) | |
| tree | d355820ae11b2b4c0f75dafed195c450040d47d2 /sca-cpp/trunk/modules/atom/atom.hpp | |
| parent | fc4d80fd2083d48e6923faac1b6a038247079e50 (diff) | |
Support ATOM and RSS entries with no content or description.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1053822 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/atom/atom.hpp')
| -rw-r--r-- | sca-cpp/trunk/modules/atom/atom.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sca-cpp/trunk/modules/atom/atom.hpp b/sca-cpp/trunk/modules/atom/atom.hpp index ff172170f7..0201995f9c 100644 --- a/sca-cpp/trunk/modules/atom/atom.hpp +++ b/sca-cpp/trunk/modules/atom/atom.hpp @@ -44,7 +44,7 @@ const list<value> entryElementsToValues(const list<value>& e) { const list<value> li = filter<value>(selector(mklist<value>(element, "id")), e); const value i = isNil(li)? value(emptyString) : elementValue(car(li)); const list<value> lc = filter<value>(selector(mklist<value>(element, "content")), e); - return mklist<value>(t, i, elementValue(car(lc))); + return mklist<value>(t, i, isNil(lc)? (value)list<value>() : elementValue(car(lc))); } /** @@ -89,7 +89,7 @@ const failable<list<value> > readATOMEntry(const list<string>& ilist) { */ const value entryValue(const list<value>& e) { const list<value> v = elementsToValues(mklist<value>(caddr(e))); - return cons(car(e), mklist<value>(cadr(e), isList(car(v))? (value)cdr<value>(car(v)) : car(v))); + return cons(car(e), mklist<value>(cadr(e), isList(car(v))? (isNil((list<value>)car(v))? car(v) : (value)cdr<value>(car(v))) : car(v))); } /** @@ -129,8 +129,9 @@ const list<value> entryElement(const list<value>& l) { + element + "entry" + (list<value>() + attribute + "xmlns" + "http://www.w3.org/2005/Atom") + (list<value>() + element + "title" + (list<value>() + attribute + "type" + "text") + car(l)) + (list<value>() + element + "id" + cadr(l)) - + (list<value>() + element + "content" - + (list<value>() + attribute + "type" + (isList(caddr(l))? "application/xml" : "text")) + caddr(l)) + + (isNil(cddr(l))? + list<value>() : + list<value>() + element + "content" + (list<value>() + attribute + "type" + (isList(caddr(l))? "application/xml" : "text")) + caddr(l)) + (list<value>() + element + "link" + (list<value>() + attribute + "href" + cadr(l))); } |