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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines