ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/FeepingCreaturism/Jargon.cpp
(Generate patch)

Comparing FeepingCreaturism/Jargon.cpp (file contents):
Revision 254 by Douglas Thrift, 2004-09-14T17:42:21-07:00 vs.
Revision 265 by Douglas Thrift, 2004-10-27T01:50:34-07:00

# Line 8 | Line 8
8   #include "Matcher.hpp"
9  
10   Jargon::Jargon(const ext::String& path, const ext::String& jargon, bool include,
11 <        const ext::String& relative) : include(include),
12 <        args(1, FeepingCreaturism::program)
11 >        const ext::String& relative) : include(include), args(1, "jargon.xsl")
12   {
13 <        args.push_back("-m");
14 <        args.push_back("-p");
15 <        args.push_back("jargon");
16 <        args.push_back("\"" + jargon + "\"");
18 <        args.push_back("-p");
19 <        args.push_back("include");
20 <        args.push_back(lexical_cast<ext::String>(include) + "()");
13 >        args.InsertLast(ios::String() << path << "/" << jargon);
14 >        args.InsertLast(ios::String() << "$jargon=" << jargon);
15 >
16 >        if (include) args.InsertLast("$include=true()");
17  
18          if (!relative.IsEmpty())
19          {
20 <                args.push_back("-p");
25 <                args.push_back("relative");
26 <                args.push_back("\"" + relative + "\"");
20 >                args.InsertLast(ios::String() << "$relative=" << relative);
21          }
28
29        args.push_back(path + "/" + jargon);
30        args.push_back("jargon.xsl");
22   }
23  
24   ios::PrintWriter& operator<<(ios::PrintWriter& pout, const Jargon& jargon)
25   {
26 <        redi::ipstream pin("/usr/local/bin/Xalan", jargon.args);
36 <
37 <        if (jargon.include)
38 <        {
39 <                std::string ignore;
26 >        _S<api::Process> xslt("/usr/local/bin/sabcmd", jargon.args);
27  
28 <                std::getline(pin, ignore);
42 <        }
28 >        if (jargon.include) ios::ReadLine(*xslt.GetReader());
29  
30 <        do
45 <        {
46 <                std::string line;
47 <
48 <                std::getline(pin, line);
49 <
50 <                while (jargon.include && line.find(" xmlns=") != std::string::npos)
51 <                {
52 <                        std::string::size_type position(line.find(" xmlns="));
53 <
54 <                        line.replace(position, 37, "");
55 <                }
56 <
57 <                pout << line << "\n";
58 <        }
59 <        while (pin.good());
30 >        ios::ReadToWrite(*xslt.GetReader(), pout);
31  
32          return pout;
33   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines