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 256 by Douglas Thrift, 2004-09-17T16:37:49-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 > #include <menes-ios/stdadapters.hpp>
11 >
12 > Jargon::Jargon(const ext::String& path, const ext::String& jargon, bool include,
13 >        const ext::String& relative) : include(include),
14 >        args(1, FeepingCreaturism::program)
15   {
16 <        std::vector<std::string> args(1, FeepingCreaturism::program);
16 >        args.push_back("-m");
17 >        args.push_back("-p");
18 >        args.push_back("jargon");
19 >        args.push_back("\"" + jargon + "\"");
20 >        args.push_back("-p");
21 >        args.push_back("include");
22 >        args.push_back(lexical_cast<ext::String>(include) + "()");
23 >
24 >        if (!relative.IsEmpty())
25 >        {
26 >                args.push_back("-p");
27 >                args.push_back("relative");
28 >                args.push_back("\"" + relative + "\"");
29 >        }
30  
31 <        args.push_back(path);
31 >        args.push_back(path + "/" + jargon);
32          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";
33   }
34  
35 < std::ostream& operator<<(std::ostream& sout, const Jargon& jargon)
35 > ios::PrintWriter& operator<<(ios::PrintWriter& pout, const Jargon& jargon)
36   {
37 <        ios::StreamBufOutputAdapter adaptor(*sout.rdbuf());
37 >        redi::ipstream pin("/usr/local/bin/Xalan", jargon.args);
38 >
39 >        if (jargon.include)
40 >        {
41 >                std::string ignore;
42 >
43 >                std::getline(pin, ignore);
44 >        }
45 >
46 >        do
47 >        {
48 >                std::string line;
49 >
50 >                std::getline(pin, line);
51  
52 <        sout << jargon.word << '\n' << jargon.pronunciation << '\n'
53 <                << jargon.grammar << '\n' << jargon.definition.GetSize() << '\n';
52 >                while (jargon.include && line.find(" xmlns=") != std::string::npos)
53 >                {
54 >                        std::string::size_type position(line.find(" xmlns="));
55  
56 < /*      ios::PrintWriter writer(adaptor);
56 >                        line.replace(position, 37, "");
57 >                }
58  
59 <        writer << jargon.definition << '\n';*/
59 >                pout << line << "\n";
60 >        }
61 >        while (pin.good());
62  
63 <        return sout;
63 >        return pout;
64   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines