diff options
Diffstat (limited to 'project2/envproc.cpp')
| -rw-r--r-- | project2/envproc.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/project2/envproc.cpp b/project2/envproc.cpp index e5c2a52..be864a5 100644 --- a/project2/envproc.cpp +++ b/project2/envproc.cpp @@ -21,20 +21,15 @@ EnvironmentProcessor::init() boost::shared_ptr<xmlpp::Document> EnvironmentProcessor::process() const { - fprintf(stderr, "parsing present .xml\n"); xmlpp::DomParser present("present/" + page + ".xml"); - fprintf(stderr, "performing xincludes\n"); while (xmlXIncludeProcessFlags(present.get_document()->cobj(), XML_PARSE_NOXINCNODE) > 0); - fprintf(stderr, "getting root\n"); xmlpp::Element * presentRoot = present.get_document()->get_root_node(); // Collect datasources - fprintf(stderr, "collecting datasources\n"); RdbmsDataSources rdbmsDataSources; - collectAll<_RdbmsDataSource>(rdbmsDataSources, presentRoot, "rdbmsdatasource", &_Project2SourceObject::name); + collectAll<_RdbmsDataSource>(rdbmsDataSources, presentRoot, "rdbmsdatasource", &_Project2SourceObject::name, true, true); // Collect views - fprintf(stderr, "collecting sqlviews\n"); SqlViews sqlViews; - collectAll<_SqlView>(sqlViews, presentRoot, "sqlview", &_SqlView::name); + collectAll<_SqlView>(sqlViews, presentRoot, "sqlview", &_SqlView::name, true, true); // boost::shared_ptr<xmlpp::Document> responseDoc = boost::shared_ptr<xmlpp::Document>(new xmlpp::Document("1.0")); xmlpp::Element * responseRoot = responseDoc->create_root_node(presentRoot->get_attribute_value("root")); @@ -45,7 +40,6 @@ EnvironmentProcessor::process() const } catch (...) { } - fprintf(stderr, "done views\n"); // These were for debug... but why not pass them on? xmlNewNs(responseRoot->cobj(), BAD_CAST "http://project2.randomdan.homeip.net/", BAD_CAST "project2"); responseRoot->add_child("fqdn", "project2")->set_child_text(http_host); @@ -70,7 +64,6 @@ EnvironmentProcessor::process() const xmlNewDocPI(responseDoc->cobj(), BAD_CAST "xml-stylesheet", BAD_CAST buf)); } free(buf); - fprintf(stderr, "done style pi\n"); return responseDoc; } |