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 194 by douglas, 2003-07-11T00:54:47-07:00 vs.
Revision 312 by douglas, 2004-01-01T15:00:34-08:00

# Line 1 | Line 1
1   /* ============================================================================
2   * Douglas Thrift's Search Engine License
3   *
4 < * Copyright (C) 2002-2003, Douglas Thrift. All Rights Reserved.
4 > * Copyright (C) 2002-2004, Douglas Thrift. All Rights Reserved.
5   * Redistribution and use in source and binary forms, with or without
6   * modification, are permitted provided that the following conditions are met:
7   *
# Line 46 | Line 46
46   //
47   // Douglas Thrift
48   //
49 < // $Id: Search.cpp,v 1.16 2003/07/11 07:54:47 douglas Exp $
49 > // $Id: Search.cpp,v 1.26 2004/01/01 23:00:34 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.2alpha";
64 > string programVersion = "1.2rc2";
65   bool debug = false;
66  
67   int main(int argc, char* argv[])
# Line 109 | 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 434 | Line 436 | void usage()
436   void version()
437   {
438          cout << programName << " " << programVersion << " "<< platform() << "\n\n"
439 <                << "   Copyright (C) 2002-2003, Douglas Thrift. All Rights Reserved.\n"
439 >                << "   Copyright (C) 2002-2004, Douglas Thrift. All Rights Reserved.\n"
440                  << "\n"
441                  << "   This product includes software developed by Douglas Thrift\n"
442                  << "   (http://computers.douglasthrift.net/searchengine/).\n";
443 + #ifdef _OpenSSL_
444 +        cout << "\n" << openssl() << " " << SSLeay_version(SSLEAY_BUILT_ON) << " "
445 +                << SSLeay_version(SSLEAY_PLATFORM) << "\n";
446 + #endif
447   }
448  
449   void license()
450   {
451          cout << "License:\n"
452                  << "   Douglas Thrift's Search Engine License\n\n"
453 <                << "   Copyright (C) 2002-2003, Douglas Thrift. All Rights Reserved.\n"
453 >                << "   Copyright (C) 2002-2004, Douglas Thrift. All Rights Reserved.\n"
454                  << "\n"
455                  << "   Redistribution and use in source and binary forms, with or with"
456                  << "out\n"

Diff Legend

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