ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/proj/trunk/Search/Page.cpp

Comparing trunk/Search/Page.cpp (file contents):
Revision 199 by douglas, 2003-07-15T00:22:06-07:00 vs.
Revision 310 by douglas, 2003-12-26T19:31:33-08:00

#	Line 46 | Line 46
46		//
47		// Douglas Thrift
48		//
49	<	// $Id: Page.cpp,v 1.4 2003/07/15 07:22:06 douglas Exp $
49	>	// $Id: Page.cpp,v 1.5 2003/12/27 03:31:33 douglas Exp $
50
51		#include "Page.h"
52
#	Line 83 | Line 83 | void Page::setHeadings(vector<string>& h
83		istream& operator>>(istream& is, Page& data)
84		{
85		string line;
86	+	#ifdef _OpenSSL_
87	+	bool set = false;
88	+	#endif
89	+
90		getline(is, line);
91	+
92		if (line == "   <page>")
93		{
94		do
#	Line 114 | Line 119 | istream& operator>>(istream& is, Page& d
119		buffer >> port;
120
121		data.setPort(port);
122	+
123	+	#ifdef _OpenSSL_
124	+	set = true;
125	+	#endif
126		}
127		#ifdef _OpenSSL_
128		else if (line.find("            <tls>") == 0)
#	Line 128 | Line 137 | istream& operator>>(istream& is, Page& d
137		buffer >> tls;
138
139		data.setTls(tls);
140	+
141	+	if (!set && tls) data.setPort(443);
142		}
143		#endif
144		else if (line.find("            <path>") == 0)
#	Line 248 | Line 259 | ostream& operator<<(ostream& os, Page& d
259		#ifndef _OpenSSL_
260		if (data.getPort() != 80)
261		#else
262	<	if (data.getPort() != 80 && !data.getTls())
262	>	if ((data.getPort() != 80 && !data.getTls()) || data.getPort() != 443)
263		#endif
264		{
265		os << "         <port>" << data.getPort() << "</port>\n";

Diff Legend

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