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 202 by Douglas Thrift, 2004-08-30T23:18:58-07:00 vs.
Revision 229 by Douglas Thrift, 2004-09-06T16:50:13-07:00

# Line 5 | Line 5
5   // $Id$
6  
7   #include "Jargon.hpp"
8 + #include "Matcher.hpp"
9  
10 < Jargon::Jargon(const std::string& path)
10 > Jargon::Jargon(const ext::String& path, bool include,
11 >        const ext::String& relative) : include(include),
12 >        args(1, FeepingCreaturism::program)
13   {
14 <        std::vector<std::string> args(1, FeepingCreaturism::program);
14 >        args.push_back("-m");
15 >        args.push_back("-p");
16 >        args.push_back("include");
17 >        args.push_back(lexical_cast<ext::String>(include) + "()");
18 >
19 >        if (!relative.IsEmpty())
20 >        {
21 >                args.push_back("-p");
22 >                args.push_back("relative");
23 >                args.push_back("\"" + relative + "\"");
24 >        }
25  
26          args.push_back(path);
27          args.push_back("jargon.xsl");
15
16        redi::pstreambuf pin("/usr/local/bin/Xalan", args, std::ios_base::in);
17        ios::StreamBufInputAdapter adaptor(pin);
18        ext::Handle<xml::Document> document(xml::Parse(adaptor));
19        ext::Handle<xml::Node> jargon(*document/"jargon");
20
21        word = *jargon/"word";
22        pronunciation = *jargon/"pronunciation";
23        grammar = *jargon/"grammar";
24        definition = *jargon/"definition";
28   }
29  
30 < std::ostream& operator<<(std::ostream& sout, const Jargon& jargon)
30 > ios::PrintWriter& operator<<(ios::PrintWriter& pout, const Jargon& jargon)
31   {
32 <        ios::StreamBufOutputAdapter adaptor(*sout.rdbuf());
32 >        redi::ipstream pin("/usr/local/bin/Xalan", jargon.args);
33 >
34 >        if (jargon.include)
35 >        {
36 >                std::string ignore;
37 >
38 >                std::getline(pin, ignore);
39 >        }
40 >
41 >        do
42 >        {
43 >                std::string line;
44 >
45 >                std::getline(pin, line);
46  
47 <        sout << jargon.word << '\n' << jargon.pronunciation << '\n'
48 <                << jargon.grammar << '\n' << jargon.definition.GetSize() << '\n';
47 >                while (jargon.include && line.find(" xmlns=") != std::string::npos)
48 >                {
49 >                        std::string::size_type position(line.find(" xmlns="));
50  
51 < /*      ios::PrintWriter writer(adaptor);
51 >                        line.replace(position, 37, "");
52 >                }
53  
54 <        writer << jargon.definition << '\n';*/
54 >                pout << line << '\n';
55 >        }
56 >        while (pin.good());
57  
58 <        return sout;
58 >        return pout;
59   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines