You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/12/30 09:52:45 UTC
svn commit: r1053822 - in /tuscany/sca-cpp/trunk/modules: atom/atom-test.cpp
atom/atom.hpp rss/rss-test.cpp rss/rss.hpp
Author: jsdelfino
Date: Thu Dec 30 08:52:44 2010
New Revision: 1053822
URL: http://svn.apache.org/viewvc?rev=1053822&view=rev
Log:
Support ATOM and RSS entries with no content or description.
Modified:
tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp
tuscany/sca-cpp/trunk/modules/atom/atom.hpp
tuscany/sca-cpp/trunk/modules/rss/rss-test.cpp
tuscany/sca-cpp/trunk/modules/rss/rss.hpp
Modified: tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp?rev=1053822&r1=1053821&r2=1053822&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp Thu Dec 30 08:52:44 2010
@@ -56,6 +56,13 @@ string itemTextEntry("<?xml version=\"1.
"<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>"
"</entry>\n");
+string itemNoContentEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<entry xmlns=\"http://www.w3.org/2005/Atom\">"
+ "<title type=\"text\">item</title>"
+ "<id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>"
+ "<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>"
+ "</entry>\n");
+
string incompleteEntry("<entry xmlns=\"http://www.w3.org/2005/Atom\">"
"<title>item</title><content type=\"text/xml\">"
"<Item xmlns=\"http://services/\">"
@@ -94,6 +101,12 @@ bool testEntry() {
assert(str(os) == itemTextEntry);
}
{
+ const list<value> a = mklist<value>(string("item"), string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"), list<value>());
+ ostringstream os;
+ writeATOMEntry<ostream*>(writer, &os, a);
+ assert(str(os) == itemNoContentEntry);
+ }
+ {
const list<value> a = content(readATOMEntry(mklist(itemEntry)));
ostringstream os;
writeATOMEntry<ostream*>(writer, &os, a);
@@ -106,6 +119,12 @@ bool testEntry() {
assert(str(os) == itemTextEntry);
}
{
+ const list<value> a = content(readATOMEntry(mklist(itemNoContentEntry)));
+ ostringstream os;
+ writeATOMEntry<ostream*>(writer, &os, a);
+ assert(str(os) == itemNoContentEntry);
+ }
+ {
const list<value> a = content(readATOMEntry(mklist(incompleteEntry)));
ostringstream os;
writeATOMEntry<ostream*>(writer, &os, a);
Modified: tuscany/sca-cpp/trunk/modules/atom/atom.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/atom/atom.hpp?rev=1053822&r1=1053821&r2=1053822&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/atom/atom.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/atom/atom.hpp Thu Dec 30 08:52:44 2010
@@ -44,7 +44,7 @@ const list<value> entryElementsToValues(
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> > readATOMEnt
*/
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 lis
+ 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)));
}
Modified: tuscany/sca-cpp/trunk/modules/rss/rss-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/rss/rss-test.cpp?rev=1053822&r1=1053821&r2=1053822&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/rss/rss-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/rss/rss-test.cpp Thu Dec 30 08:52:44 2010
@@ -54,6 +54,12 @@ string itemTextEntry("<?xml version=\"1.
"<description>Apple</description>"
"</item>\n");
+string itemNoDescriptionEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<item>"
+ "<title>fruit</title>"
+ "<link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>"
+ "</item>\n");
+
string incompleteEntry("<item>"
"<title>fruit</title><description>"
"<Item xmlns=\"http://services/\">"
@@ -92,6 +98,12 @@ bool testEntry() {
assert(str(os) == itemTextEntry);
}
{
+ const list<value> a = mklist<value>(string("fruit"), string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"), list<value>());
+ ostringstream os;
+ writeRSSEntry<ostream*>(writer, &os, a);
+ assert(str(os) == itemNoDescriptionEntry);
+ }
+ {
const list<value> a = content(readRSSEntry(mklist(itemEntry)));
ostringstream os;
writeRSSEntry<ostream*>(writer, &os, a);
@@ -104,6 +116,12 @@ bool testEntry() {
assert(str(os) == itemTextEntry);
}
{
+ const list<value> a = content(readRSSEntry(mklist(itemNoDescriptionEntry)));
+ ostringstream os;
+ writeRSSEntry<ostream*>(writer, &os, a);
+ assert(str(os) == itemNoDescriptionEntry);
+ }
+ {
const list<value> a = content(readRSSEntry(mklist(incompleteEntry)));
ostringstream os;
writeRSSEntry<ostream*>(writer, &os, a);
Modified: tuscany/sca-cpp/trunk/modules/rss/rss.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/rss/rss.hpp?rev=1053822&r1=1053821&r2=1053822&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/rss/rss.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/rss/rss.hpp Thu Dec 30 08:52:44 2010
@@ -44,7 +44,7 @@ const list<value> entryElementsToValues(
const list<value> li = filter<value>(selector(mklist<value>(element, "link")), e);
const value i = isNil(li)? value(emptyString) : elementValue(car(li));
const list<value> ld = filter<value>(selector(mklist<value>(element, "description")), e);
- return mklist<value>(t, i, elementValue(car(ld)));
+ return mklist<value>(t, i, isNil(ld)? (value)list<value>() : elementValue(car(ld)));
}
/**
@@ -80,7 +80,7 @@ const failable<list<value> > readRSSEntr
*/
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)));
}
/**
@@ -121,7 +121,7 @@ const list<value> entryElement(const lis
+ element + "item"
+ (list<value>() + element + "title" + car(l))
+ (list<value>() + element + "link" + cadr(l))
- + (list<value>() + element + "description" + caddr(l));
+ + (isNil(cddr(l))? list<value>() : list<value>() + element + "description" + caddr(l));
}
/**