diff options
| author | randomdan <randomdan@localhost> | 2011-03-11 22:28:23 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2011-03-11 22:28:23 +0000 |
| commit | f2ee8e15a8cf2c824d7b111fb9f19e7ad273e8bf (patch) | |
| tree | 4b095e9eb26cfcc5bab5b5ff6f3ed39a4b1e6b4c | |
| parent | Allow scripts to propergate messages from parameter checks into the presentat... (diff) | |
| download | project2-f2ee8e15a8cf2c824d7b111fb9f19e7ad273e8bf.tar.bz2 project2-f2ee8e15a8cf2c824d7b111fb9f19e7ad273e8bf.tar.xz project2-f2ee8e15a8cf2c824d7b111fb9f19e7ad273e8bf.zip | |
Fix linking problem where binaries linked against the installed libs, not the dev ones
Allow a null xpath, return a null value, don't crash
Fix method setting in curlHelper
Remove useless Views object in console appengine, there's one in the base, fixes views in console mode
| -rw-r--r-- | project2/Jamfile.jam | 4 | ||||
| -rw-r--r-- | project2/console/consoleAppEngine.h | 2 | ||||
| -rw-r--r-- | project2/curlHelper.cpp | 2 | ||||
| -rw-r--r-- | project2/xslRows.cpp | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/project2/Jamfile.jam b/project2/Jamfile.jam index 0b8425e..575d4f9 100644 --- a/project2/Jamfile.jam +++ b/project2/Jamfile.jam @@ -26,7 +26,6 @@ lib curl : : <name>curl ; lib osspuuid : : <name>ossp-uuid++ ; alias p2parts : : : : - <library>p2common <library>p2url <library>p2files <library>p2processes @@ -181,6 +180,8 @@ lib p2web : <library>p2xmlSession : : <library>p2parts + <library>p2xmlSession + <library>p2uuid ; exe p2cgi : @@ -203,6 +204,7 @@ exe p2console : [ glob console/*.cpp ] : <library>p2parts + <library>p2common <include>../libmisc ; diff --git a/project2/console/consoleAppEngine.h b/project2/console/consoleAppEngine.h index b7b4f1d..93e76ed 100644 --- a/project2/console/consoleAppEngine.h +++ b/project2/console/consoleAppEngine.h @@ -48,8 +48,6 @@ class ConsoleApplicationEngine : public ApplicationEngine, public Presenter, Req typedef Storage<ParamChecker>::Objects ParamCheckers; ParamCheckers parameterChecks; - typedef Storage<View>::Objects Views; - Views views; SessionPtr runtime; FileStreamVariableWriter out; }; diff --git a/project2/curlHelper.cpp b/project2/curlHelper.cpp index 742e4de..7c204aa 100644 --- a/project2/curlHelper.cpp +++ b/project2/curlHelper.cpp @@ -5,7 +5,7 @@ CurlHelper::CurlHelper(const xmlpp::Element * p) : userAgent(p, "useragent", false, "project2/0.3"), cookieJar(p, "cookiejar", false), proxy(p, "proxy", false), - method(p, "username", false), + method(p, "method", false), userName(p, "username", false), password(p, "password", false), timeout(p, "timeout", false, Variable(6000)) diff --git a/project2/xslRows.cpp b/project2/xslRows.cpp index 9793119..82c9d4a 100644 --- a/project2/xslRows.cpp +++ b/project2/xslRows.cpp @@ -116,6 +116,10 @@ XslRows::execute(const RowProcessor * rp) const xpathCtx->node = rowRoot; values.clear(); BOOST_FOREACH(const FilterView::XPaths::value_type & xp, fv->xpaths) { + if (boost::get<Null>(&xp.second())) { + values[xp.first] = Null(); + continue; + } xmlXPathObjectSPtr xpathObjI = xmlXPathObjectSPtr(xmlXPathEvalExpression(xp.second(), xpathCtx.get()), xmlXPathFreeObject); if (!xpathObjI) { throw XpathEvalError(xmlGetLastError()->message); |