Subversion Repositories Kolibri OS

Rev

Rev 2420 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2420 Rev 2428
Line 60... Line 60...
60 
 
 60 
 
61 
 
 61 
 
62 
void TWebBrowser::Scan(dword id) {
 62 
void TWebBrowser::Scan(dword id) {
63 
	if (id > 399)
 63 
	if (id > 399)
- 
 
 64 
	{
- 
 
 65 
		GetURLfromPageLinks(id);
64 
	{
 66
65 
		//Lee 21.02 {
 67 
		//ýòó âñþ õðåíü íóæíî â GetNewUrl() ïåðåìåñòèòü
66 
		IF (URL[0] == '#') {  //ìû íå óìååì ïåðåõîäèòü ïî ññûëêå âíóòðè äîêóìåíòà. Ïîêà ÷òî...
 68 
		IF (URL[0] == '#') {  //ìû íå óìååì ïåðåõîäèòü ïî ññûëêå âíóòðè äîêóìåíòà. Ïîêà ÷òî...
67 
			copystr(#editURL, #URL);
 69 
			copystr(#editURL, #URL);
Line 68... Line -...
68 
			return;
 - 
 
69 
		}
 - 
 
70 
 
 70 
			return;
Line 71... Line 71...
71 
		GetURLfromPageLinks(id);
 71 
		}
Line -... Line 72...
- 
 
 72
- 
 
 73 
		URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü)
- 
 
 74 
 
72
75 
		GetNewUrl();
- 
 
 76 
 
73 
		URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü)
 77 
		//ïðûãàåò èçîáðàæåíèå ïîëîñà, áåëàÿ ðèñóåòñÿ ñíèçó
- 
 
 78 
		if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
Line 74... Line 79...
74
79 
		{
75 
		GetNewUrl();
 80 
			RunProgram("/sys/media/kiv", #URL);
- 
 
 81 
			copystr(#editURL, #URL);
- 
 
 82 
			return;
- 
 
 83 
		}
76 
 
 84 
 
77 
		if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
 85 
		copystr(#URL, #editURL);
78 
		//Lee 21.02 }
 86 
		za_kadrom = count = 0;
Line 79... Line 87...
79
87
Line 173... Line 181...
173 
	}
 181 
	}
174 
	ParseHTML(buf, filesize);
 182 
	ParseHTML(buf, filesize);
175 
}
 183 
}
Line 176... Line 184...
176 
 
 184 
 
177 
void GetNewUrl(){
 185 
void GetNewUrl(){
Line 178... Line -...
178 
  IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+1,#URL);
 - 
 
179
- 
 
180 
	//IF (!strcmp(get_URL_part(3),"../"))
 186 
	IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+2,#URL);
181 
	//{
 - 
 
182 
 	//	//DrawTitle(#URL+7);
 - 
 
183 
	//}
 - 
 
184 
 	if (strcmp(get_URL_part(3),"/rd")<>0) && (strcmp(get_URL_part(5),"/sys/")<>0) && (strcmp(get_URL_part(3),"/hd")<>0)
 187
185 
	&& (strcmp(get_URL_part(3),"/bd")<>0) && (strcmp(get_URL_part(3),"/fd")<>0) && (strcmp(get_URL_part(3),"/cd")<>0)
 188 
	if (URL[0] <> '/')
186 
	&& (strcmp(get_URL_part(5),"http:")<>0)	&& (strcmp(get_URL_part(5),"mailt")<>0)	&& (strcmp(get_URL_part(5),"ftp:/")<>0)
189 
	&& (strcmp(get_URL_part(5),"http:")<>0)	&& (strcmp(get_URL_part(5),"mailt")<>0)	&& (strcmp(get_URL_part(5),"ftp:/")<>0)
Line -... Line 190...
- 
 
 190 
	{
- 
 
 191 
		copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
187 
	{
 192
188 
		copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 193 
		_CUT_ST_LEVEL_MARK:
189
194
190 
		IF (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua
 - 
 
191 
		{
 195 
		IF (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà???
- 
 
 196 
		{
- 
 
 197 
			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
- 
 
 198 
		}
- 
 
 199
- 
 
 200 
		IF (!strcmp(get_URL_part(3),"../")) //íà óðîâåíü ââåðõ
- 
 
 201 
		{
- 
 
 202 
			copystr(#URL+3,#URL);
- 
 
 203 
			editURL[find_symbol(#editURL, '/')-1] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
192 
			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 204 
			goto _CUT_ST_LEVEL_MARK;
193 
			IF (URL[0]=='/') copystr(#URL+1,#URL);
 205 
		}
194 
		}
 206
195 
		copystr(#URL, #editURL + strlen(#editURL)); //êëåèì íîâûé àäðåñ
 207 
		copystr(#URL, #editURL + strlen(#editURL)); //êëåèì íîâûé àäðåñ