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 35 by douglas, 2003-01-16T17:27:03-08:00 vs.
Revision 201 by douglas, 2003-07-15T01:01:00-07:00

# Line 46 | Line 46
46   //
47   // Douglas Thrift
48   //
49 < // Search.cpp
49 > // $Id: Search.cpp,v 1.19 2003/07/15 08:01:00 douglas Exp $
50  
51   #include "Search.h"
52   #include "Indexer.h"
# Line 57 | Line 57
57   #include <sys/utsname.h>
58   #else
59   #include <windows.h>
60 < #endif // _WIN32
60 > #endif
61  
62   string program;
63   string programName = "Douglas Thrift's Search Engine";
64 < string programVersion = "1.1alpha2";
64 > string programVersion = "1.2alpha";
65   bool debug = false;
66  
67   int main(int argc, char* argv[])
# Line 84 | Line 84 | int main(int argc, char* argv[])
84          string notfound = "notfound.html";
85          string pages = "pages.html";
86  
87 +        string email;
88 +
89          for (int index = 1; index < argc; index++)
90          {
91                  string arg(argv[index]);
# Line 222 | Line 224 | int main(int argc, char* argv[])
224                                  return 1;
225                          }
226                  }
225 –                else if (arg == "-e")
226 –                {
227 –                        if (++index < argc)
228 –                        {
229 –                                // set from email
230 –                        }
231 –                        else
232 –                        {
233 –                                cerr << program << ": Bad arguments\n";
234 –                                usage();
235 –                                return 1;
236 –                        }
237 –                }
227                  else if (arg == "-D")
228                  {
229                          debug = true;
230 +                        cerr.setf(ios_base::boolalpha);
231                  }
232                  else
233                  {
# Line 257 | Line 247 | int main(int argc, char* argv[])
247                  {
248                          cerr << program << ": Too many indices, can only build one index"
249                                  << " at a time\n";
250 +                        usage();
251                          return 1;
252                  }
253  
254                  if (indexDomains.size() < 1)
255                  {
256                          cerr << program << ": Must specify at least one domain\n";
257 +                        usage();
258                          return 1;
259                  }
260  
# Line 395 | Line 387 | string platform()
387  
388   void usage()
389   {
390 + #ifdef _WIN32
391 +        OSVERSIONINFO* computer = new OSVERSIONINFO;
392 +        computer->dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
393 +        GetVersionEx(computer);
394 +
395 +        string program = ::program;
396 +        if (computer->dwPlatformId != VER_PLATFORM_WIN32_NT)
397 +        {
398 +                program = "Search";
399 +        }
400 +
401 +        delete computer;
402 + #endif // _WIN32
403 +
404          string tab(8 + program.length(), ' ');
405  
406          cout << "Usage: " << program << " [index ...] [-P page] [-h header] [-b bo"
# Line 432 | Line 438 | void version()
438                  << "\n"
439                  << "   This product includes software developed by Douglas Thrift\n"
440                  << "   (http://computers.douglasthrift.net/searchengine/).\n";
441 + #ifdef _OpenSSL_
442 +        cout << "\n" << openssl() << "\n";
443 + #endif
444   }
445  
446   void license()

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines