Add support for RSS feeds and minor fixes to ATOM support.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949652 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 68 insertions, 1 deletions

diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index 724d001cb8..224fcc1557 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -23,6 +23,9 @@ moddir=$(prefix)/modules/http
 curl_test_SOURCES = curl-test.cpp
 curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+curl_get_SOURCES = curl-get.cpp
+curl_get_LDFLAGS = -lxml2 -lcurl -lmozjs
+
 mod_DATA = httpd.prefix curl.prefix
 nobase_dist_mod_DATA = conf/*
 
@@ -34,5 +37,5 @@ curl.prefix: $(top_builddir)/config.status
 	echo ${CURL_PREFIX} >curl.prefix
 
 dist_noinst_SCRIPTS = httpd-test http-test
-noinst_PROGRAMS = curl-test
+noinst_PROGRAMS = curl-test curl-get
 TESTS = httpd-test http-test
diff --git a/sca-cpp/trunk/modules/http/curl-get.cpp b/sca-cpp/trunk/modules/http/curl-get.cpp
new file mode 100644
index 0000000000..cbd693092a
--- /dev/null
+++ b/sca-cpp/trunk/modules/http/curl-get.cpp
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* $Rev$ $Date$ */
+
+/**
+ * HTTP client command line test tool.
+ */
+
+#include <assert.h>
+#include "stream.hpp"
+#include "string.hpp"
+#include "perf.hpp"
+#include "curl.hpp"
+
+namespace tuscany {
+namespace http {
+
+const bool testGet(const string& url) {
+    CURLSession ch;
+    const failable<value> val = get(url, ch);
+    assert(hasContent(val));
+    cout << val << endl;
+    return true;
+}
+
+}
+}
+
+int main(unused const int argc, const char** argv) {
+    tuscany::http::testGet(tuscany::string(argv[1]));
+    return 0;
+}
+
diff --git a/sca-cpp/trunk/modules/http/curl.hpp b/sca-cpp/trunk/modules/http/curl.hpp
index 95c81d9b94..3d11ac56b1 100644
--- a/sca-cpp/trunk/modules/http/curl.hpp
+++ b/sca-cpp/trunk/modules/http/curl.hpp
@@ -37,6 +37,7 @@
 #include "monad.hpp"
 #include "parallel.hpp"
 #include "../atom/atom.hpp"
+#include "../rss/rss.hpp"
 #include "../json/json.hpp"
 
 namespace tuscany {
@@ -330,10 +331,23 @@ const failable<value> get(const string& url, const CURLSession& ch) {
 
     const string ct(content(contentType(car(content(res)))));
     if (ct == "application/atom+xml;type=entry") {
+        // Read an ATOM entry
         const value val(atom::entryValue(content(atom::readATOMEntry(ls))));
         debug(val, "http::get::result");
         return val;
     }
+    if (ct == "application/atom+xml;type=feed" || atom::isATOMFeed(ls)) {
+        // Read an ATOM feed
+        const value val(atom::feedValues(content(atom::readATOMFeed(ls))));
+        debug(val, "http::get::result");
+        return val;
+    }
+    if (ct == "application/rss+xml" || rss::isRSSFeed(ls)) {
+        // Read an RSS feed
+        const value val(rss::feedValues(content(rss::readRSSFeed(ls))));
+        debug(val, "http::get::result");
+        return val;
+    }
 
     // Return the content as a list of values
     const value val(mkvalues(ls));