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

Comparing trunk/Search/Search.cpp (file contents):
Revision 199 by douglas, 2003-07-15T00:22:06-07:00 vs.
Revision 296 by douglas, 2003-11-17T16:11:07-08:00

# Line 46 | Line 46
46   //
47   // Douglas Thrift
48   //
49 < // $Id: Search.cpp,v 1.17 2003/07/15 07:22:06 douglas Exp $
49 > // $Id: Search.cpp,v 1.24 2003/11/18 00:11:07 douglas Exp $
50  
51   #include "Search.h"
52   #include "Indexer.h"
# Line 59 | Line 59
59   #include <windows.h>
60   #endif
61  
62 #ifdef _OpenSSL_
63 #include <openssl/crypto.h>
64
65 inline string openssl(bool agent = false)
66 {
67        ostringstream openssl;
68
69        openssl << "OpenSSL" << (agent ? "/" : " ");
70
71        long version = SSLeay();
72        long major = version / 0x10000000;
73        long minor = (version % 0x10000000) / 0x100000;
74        long fix = (version % 0x100000) / 0x1000;
75        long patch = (version % 0x1000);
76        
77        openssl << major << "." << minor << "." << fix;
78
79        if (patch == 0x0)
80        {
81                openssl << "-dev";
82        }
83        else if (patch >= 0x1 && patch <= 0xe)
84        {
85                openssl << "-beta" << patch;
86        }
87        else if (patch == 0xf)
88        {
89                // release
90        }
91        else if (patch > 0xf)
92        {
93                openssl << char('a' - 1 + (patch / 0x10) % 26);
94        }
95
96        openssl << " " << SSLeay_version(SSLEAY_PLATFORM);
97
98        return openssl.str();
99 }
100 #endif
101
62   string program;
63   string programName = "Douglas Thrift's Search Engine";
64 < string programVersion = "1.2alpha";
64 > string programVersion = "1.2rc1";
65   bool debug = false;
66  
67   int main(int argc, char* argv[])
# Line 149 | Line 109 | int main(int argc, char* argv[])
109                  {
110                          if (++index < argc)
111                          {
112 <                                page = strtoul(argv[index],0,0);
112 >                                istringstream number(argv[index]);
113 >
114 >                                number >> page;
115                          }
116                          else
117                          {
# Line 479 | Line 441 | void version()
441                  << "   This product includes software developed by Douglas Thrift\n"
442                  << "   (http://computers.douglasthrift.net/searchengine/).\n";
443   #ifdef _OpenSSL_
444 <        cout << "\n" << openssl() << "\n";
444 >        cout << "\n" << openssl() << " " << SSLeay_version(SSLEAY_BUILT_ON) << " "
445 >                << SSLeay_version(SSLEAY_PLATFORM) << "\n";
446   #endif
447   }
448  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines