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

Comparing:
trunk/Search/Search.cpp (file contents), Revision 351 by Douglas Thrift, 2004-05-30T22:03:07-07:00 vs.
Search/trunk/Search.cpp (file contents), Revision 377 by douglas, 2008-08-24T00:40:38-07:00

# Line 1 | Line 1
1   /* ============================================================================
2   * Douglas Thrift's Search Engine License
3   *
4 < * Copyright (C) 2002-2004, Douglas Thrift. All Rights Reserved.
4 > * Copyright (C) 2002-2004, 2008, 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 69 | Line 69
69   #endif
70  
71   string program, programName("Douglas Thrift's Search Engine"),
72 <        programVersion("1.3svn");
72 >        programVersion("1.3");
73   bool debug(false);
74  
75   int main(int argc, char* argv[])
# Line 78 | Line 78 | int main(int argc, char* argv[])
78  
79          bool indexMode(false);
80          set<string> indexDomains, indexRestrictions;
81 <        unsigned page(1);
81 >        size_t page(1);
82          vector<string> indices;
83          string indexURL, query, header("header.html"), body("body.html"),
84                  footer("footer.html"), notfound("notfound.html"), pages("pages.html");
# Line 264 | Line 264 | int main(int argc, char* argv[])
264          else
265          {
266                  string line;
267 <                
267 >
268                  getline(cin, line);
269  
270                  query = line;
# Line 294 | Line 294 | string platform()
294  
295          string os(computer->dwPlatformId == VER_PLATFORM_WIN32_NT ? "Windows NT" :
296                  "Windows");
297 <        unsigned major(computer->dwMajorVersion), minor(computer->dwMinorVersion);
297 >        size_t major(computer->dwMajorVersion), minor(computer->dwMinorVersion);
298  
299          platform << os << ' ' << major << '.' << minor;
300  
# Line 322 | Line 322 | string platform()
322          }
323          else if (major == 5 && minor == 2 && os == "Windows NT")
324          {
325 <                platform << " [Windows .NET Server]";
325 >                platform << " [Windows Server 2003 or Windows XP x64]";
326 >        }
327 >        else if (major == 6 && minor == 0 && os == "Windows NT")
328 >        {
329 >                platform << " [Windows Vista or Windows Server 2008]";
330          }
331  
332          platform << ' ';
# Line 423 | Line 427 | void usage()
427   void version()
428   {
429          cout << programName << " " << programVersion << " "<< platform() << "\n\n"
430 <                << "   Copyright (C) 2002-2004, Douglas Thrift. All Rights Reserved.\n"
430 >                << "   Copyright (C) 2002-2004, 2008, Douglas Thrift. All Rights Reserved.\n"
431                  << "\n"
432                  << "   This product includes software developed by Douglas Thrift\n"
433                  << "   (http://computers.douglasthrift.net/searchengine/).\n";
# Line 437 | Line 441 | void license()
441   {
442          cout << "License:\n"
443                  << "   Douglas Thrift's Search Engine License\n\n"
444 <                << "   Copyright (C) 2002-2004, Douglas Thrift. All Rights Reserved.\n"
444 >                << "   Copyright (C) 2002-2004, 2008, Douglas Thrift. All Rights Reserved.\n"
445                  << "\n"
446                  << "   Redistribution and use in source and binary forms, with or with"
447                  << "out\n"

Diff Legend

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