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 364 by Douglas Thrift, 2004-06-04T04:08:28-07:00 vs.
Revision 365 by douglas, 2008-08-11T15:16:35-07:00

#	Line 67 | Line 67 | istream& operator>>(istream& is, Page& d
67
68		if (line.find("         <address>") == 0)
69		{
70	<	unsigned start = line.find("<address>") + 9;
71	<	unsigned finish = line.find("</address>", start);
70	>	size_t start = line.find("<address>") + 9;
71	>	size_t finish = line.find("</address>", start);
72
73		string address = line.substr(start, finish - start);
74
#	Line 80 | Line 80 | istream& operator>>(istream& is, Page& d
80		}
81		else if (line.find("            <port>") == 0)
82		{
83	<	unsigned start = line.find("<port>") + 6;
84	<	unsigned finish = line.find("</port>", start);
83	>	size_t start = line.find("<port>") + 6;
84	>	size_t finish = line.find("</port>", start);
85
86		istringstream buffer(line.substr(start, finish - start));
87	<	unsigned port;
87	>	size_t port;
88
89		buffer >> port;
90
#	Line 97 | Line 97 | istream& operator>>(istream& is, Page& d
97		#ifdef _OpenSSL_
98		else if (line.find("            <tls>") == 0)
99		{
100	<	unsigned start = line.find("<tls>") + 5;
101	<	unsigned finish = line.find("</tls>", start);
100	>	size_t start = line.find("<tls>") + 5;
101	>	size_t finish = line.find("</tls>", start);
102
103		istringstream buffer(line.substr(start, finish - start));
104		bool tls;
#	Line 113 | Line 113 | istream& operator>>(istream& is, Page& d
113		#endif
114		else if (line.find("            <path>") == 0)
115		{
116	<	unsigned start = line.find("<path>") + 6;
117	<	unsigned finish = line.find("</path>", start);
116	>	size_t start = line.find("<path>") + 6;
117	>	size_t finish = line.find("</path>", start);
118
119		string path = line.substr(start, finish - start);
120
#	Line 126 | Line 126 | istream& operator>>(istream& is, Page& d
126		}
127		else if (line.find("            <size>") == 0)
128		{
129	<	unsigned start = line.find("<size>") + 6;
130	<	unsigned finish = line.find("</size>", start);
129	>	size_t start = line.find("<size>") + 6;
130	>	size_t finish = line.find("</size>", start);
131
132		istringstream buffer(line.substr(start, finish - start));
133	<	unsigned size;
133	>	size_t size;
134
135		buffer >> size;
136
#	Line 138 | Line 138 | istream& operator>>(istream& is, Page& d
138		}
139		else if (line.find("            <title>") == 0)
140		{
141	<	unsigned start = line.find("<title>") + 7;
142	<	unsigned finish = line.find("</title>", start);
141	>	size_t start = line.find("<title>") + 7;
142	>	size_t finish = line.find("</title>", start);
143
144		string title = line.substr(start, finish - start);
145
#	Line 158 | Line 158 | istream& operator>>(istream& is, Page& d
158		}
159		else if (line.find("            <description>") == 0)
160		{
161	<	unsigned start = line.find("<description>") + 13;
162	<	unsigned finish = line.find("</description>", start);
161	>	size_t start = line.find("<description>") + 13;
162	>	size_t finish = line.find("</description>", start);
163
164		string description = line.substr(start, finish - start);
165
#	Line 171 | Line 171 | istream& operator>>(istream& is, Page& d
171		}
172		else if (line.find("            <text>") == 0)
173		{
174	<	unsigned start = line.find("<text>") + 6;
175	<	unsigned finish = line.find("</text>", start);
174	>	size_t start = line.find("<text>") + 6;
175	>	size_t finish = line.find("</text>", start);
176
177		string text = line.substr(start, finish - start);
178
#	Line 191 | Line 191 | istream& operator>>(istream& is, Page& d
191		}
192		else if (line.find("            <heading>") == 0)
193		{
194	<	unsigned start = line.find("<heading>") + 9;
195	<	unsigned finish = line.find("</heading>", start);
194	>	size_t start = line.find("<heading>") + 9;
195	>	size_t finish = line.find("</heading>", start);
196
197		string heading = line.substr(start, finish - start);
198

Diff Legend

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