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

Comparing Bender/Bender.cpp (file contents):
Revision 272 by Douglas Thrift, 2004-10-28T13:57:02-07:00 vs.
Revision 355 by douglas, 2004-12-18T17:06:28-08:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 < #include "Bender.hpp"
8 < #include "Matcher.hpp"
7 > #include "Matcher/Matcher.hpp"
8  
9 < #include <menes-api/exename.hpp>
9 > #include <menes-api/console.hpp>
10 > #include <menes-api/environment.hpp>
11   #include <menes-api/files.hpp>
12   #include <menes-api/process.hpp>
13   #include <menes-app/simple.hpp>
14 + #include <menes-ios/helpers.hpp>
15  
16 < struct
16 > class Bender
17   {
18 <        ext::String get(const ext::String& name)
19 <        {
20 <                try
21 <                {
22 <                        return api::TheEnvironment.Get(name);
23 <                }
24 <                catch (ext::Exception)
25 <                {
26 <                        return ext::String();
27 <                }
28 <        }
18 > private:
19 >        void bend(const ext::String& path, const ext::String& agent);
20 >        void bend(const ext::String& path);
21 >        void pass(const ext::String& path);
22 > public:
23 >        Bender();
24 > };
25 >
26 > struct Environment
27 > {
28 >        ext::String get(const ext::String& name) { try { return api::TheEnvironment.Get(name); } catch (ext::Exception) { return ext::String(); } }
29   } env;
30  
31   int Main(const app::Options& options)
# Line 62 | Line 63 | Bender::Bender()
63                                  << env.get("SERVER_SIGNATURE") << "</body></html>\n";
64                  }
65          }
66 <        else
66 <        {
67 <                api::Cout << "Location: http://computers.douglasthrift.net/bender.xml\r\n\r\n";
68 <        }
66 >        else api::Cout << "Location: http://computers.douglasthrift.net/bender.xml\r\n\r\n";
67   }
68  
69   void Bender::bend(const ext::String& path, const ext::String& agent)
70   {
71          Matcher matcher;
72  
73 <        if (agent == matcher("Opera( |\\/)(\\d+)\\.(\\d+)"))
76 <        {
77 <                bend(path);
78 <        }
79 <        else if (agent == matcher("rv:(\\d+)\\.(\\d+).*\\) Gecko"))
73 >        if (agent == matcher("Opera( |\\/)(\\d+)\\.(\\d+)")) bend(path); else if (agent == matcher("rv:(\\d+)\\.(\\d+).*\\) Gecko"))
74          {
75                  int major_(lexical_cast<int>(matcher[1])), minor_(lexical_cast<int>(matcher[2]));
76  
77 <                if (major_ > 1 || (major_ == 1 && minor_ >= 5))
84 <                {
85 <                        pass(path);
86 <                }
87 <                else bend(path);
77 >                if (major_ > 1 || (major_ == 1 && minor_ >= 5)) pass(path); else bend(path);
78          }
79          else bend(path);
80   }
81  
82   void Bender::bend(const ext::String& path)
83   {
84 <        _L<ext::String> args(1, "-IN");
84 >        _L<ext::String> args(1, "-a");
85  
86          args.InsertLast(path);
87  
88 <        _S<api::Process> xslt("/usr/local/bin/xalan-j", args);
88 > #if defined(__FreeBSD__)
89 >        _S<api::Process> xslt("/usr/local/bin/Xalan", args);
90 > #elif defined(_WIN32)
91 >        _S<api::Process> xslt("Xalan.exe", args);
92 > #else
93 >        _S<api::Process> xslt("Xalan", args);
94 > #endif
95          ios::String output;
96  
97          ios::ReadToWrite(*xslt.GetReader(), output);
# Line 103 | Line 99 | void Bender::bend(const ext::String& pat
99          if (!output.IsEmpty())
100          {
101                  ext::String type("text/xml");
102 <                Matcher matcher("http-equiv=\"Content-Type\" content=\"(.*)\"");
102 >                Matcher matcher("http-equiv=\"Content-Type\" content=\"(.*)\"", PCRE_MULTILINE);
103  
104                  if (matcher == output) type = matcher[1];
105  
106                  api::Cout << "Content-Type: " << type << "\r\n\r\n" << output;
107          }
108          else pass(path);
113
114        xslt.Join();
109   }
110  
111   void Bender::pass(const ext::String& path)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines