Changeset 42527
- Timestamp:
- 06/30/18 22:36:21 (6 years ago)
- Location:
- titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/wm2018/wm2018.h
r42517 r42527 350 350 debug(10, "GetWmFinalData IN-1 (%d)\n", wmGroupID); 351 351 352 wmsearch = ostrcat(" wm-2018", NULL, 0, 0);353 wmregexA = ostrcat("< th class=\"match-round\" colspan=\"10\">Achtelfinale</th>(.*?)Viertelfinale</th>", NULL, 0, 0);352 wmsearch = ostrcat("fussball/wm-2018/spielplan/spielplan-chronologisch-saison-2017-2018", NULL, 0, 0); 353 wmregexA = ostrcat("<li class=\"first\">WM 2018 Achtelfinale</li>(.*?)<div class=\"spacerFootExtra\">", NULL, 0, 0); 354 354 printf("[wm2018 Achtelfinale ] wmregexA: %s\n", wmregexA); 355 355 356 356 if (wmsearch != NULL) { 357 357 358 wmstr = gethttp(" maislabyrinth-erfurt.de", wmsearch, 80, NULL, NULL, 5000, NULL, 0);358 wmstr = gethttp("sportal.de", wmsearch, 80, NULL, NULL, 5000, NULL, 0); 359 359 //writesys("/tmp/_wmstr.html", wmstr, 0); 360 360 … … 380 380 //printf("[wm2018 A2 ] wmstrA2: %s\n", wmstrA2); 381 381 382 if(ostrstr(wmstrA2, "< th class=\"match-date\" colspan=\"10\">") != NULL) {382 if(ostrstr(wmstrA2, "<span class=\"date\">") != NULL) { 383 383 debug(30, "wmstrA2(%d): %s\n", i, wmstrA2); 384 wmstrA3 = string_striptags(wmstrA2); 384 wmstrA3 = ostrcat(wmstrA2, NULL, 0, 0); 385 wmstrA3 = string_replace_all("<li class=\"first\"><span class=\"date\">", "", wmstrA3, 1); 386 wmstrA3 = string_replace_all("</span><span class=\"time\">", "18 ", wmstrA3, 1); 387 wmstrA3 = string_replace_all("</span></li>", " Uhr", wmstrA3, 1); 385 388 debug(20, "wmstrA3(%d): %s\n", count, wmstrA3); 386 389 wmFinalMatches[0].date[count] = wmstrA3; 387 390 } 388 391 389 if(ostrstr(wmstrA2, "<td class=\"match-time\">") != NULL) {392 /*if(ostrstr(wmstrA2, "<td class=\"match-time\">") != NULL) { 390 393 debug(30, "wmstrA2(%d): %s\n", i, wmstrA2); 391 394 wmstrA3 = ostrcat(wmstrA2, NULL, 0, 0); … … 395 398 //printf("[wm2018 Top16 htime ] wmstrA4: %s\n", wmstrA4); 396 399 wmFinalMatches[0].htime[count] = wmstrA4; 397 } 398 399 if(ostrstr(wmstrA2, "< td class=\"team-shortname team-shortname-home\">") != NULL) {400 }*/ 401 402 if(ostrstr(wmstrA2, "<li class=\"heim\">") != NULL) { 400 403 debug(30, "wmstrA2(%d): %s\n", i, wmstrA2); 401 //wmstrA3 = ostrcat(wmstrA2, NULL, 0, 0);402 //wmstrA3 = string_replace("<td class=\"empty team-image team-image-home\"> </td>", " ", wmstrA3, 1);403 404 wmstrA3 = string_striptags(wmstrA2); 404 405 debug(20, "wmstrA3(%d): %s\n", count, wmstrA3); … … 406 407 } 407 408 408 if(ostrstr(wmstrA2, "< td class=\"match-result match-result-0\">") != NULL){409 if(ostrstr(wmstrA2, "<li class=\"score\">") != NULL) { 409 410 debug(30, "wmstrA2(%d): %s\n", i, wmstrA2); 410 wmstrA3 = ostrcat(wmstrA2, NULL, 0, 0); 411 wmstrA3 = string_replace("(-:-)", "", wmstrA3, 1); 412 wmstrA4 = string_striptags(wmstrA3); 413 debug(20, "wmstrA3(%d): %s\n", count, wmstrA4); 414 if( (ostrstr(wmstrA4, " ") != NULL) || (ostrstr(wmstrA4, "―") != NULL) ) { 415 wmstrA5 = ostrcat(wmstrA4, NULL, 0, 0); 416 wmstrA5 = string_replace(" ", " - ", wmstrA5, 1); 417 wmstrA5 = string_replace("―", " - ", wmstrA5, 1); 411 wmstrA3 = string_striptags(wmstrA2); 412 debug(20, "wmstrA3(%d): %s\n", count, wmstrA3); 413 if( (ostrstr(wmstrA3, " ") != NULL) || (ostrstr(wmstrA3, "―") != NULL) ) { 414 wmstrA4 = ostrcat(wmstrA3, NULL, 0, 0); 415 wmstrA4 = string_replace(" ", " - ", wmstrA4, 1); 416 wmstrA4 = string_replace("―", " - ", wmstrA4, 1); 418 417 } else { 419 wmstrA 5 = ostrcat(wmstrA4, NULL, 0, 0);418 wmstrA4 = ostrcat(wmstrA3, NULL, 0, 0); 420 419 } 421 debug(20, "wmstrA4(%d): %s\n", count, wmstrA5); 422 //printf("[wm2018 Top16 result ] wmstrA4: %s\n", wmstrA5); 423 wmFinalMatches[0].result[count] = wmstrA5; 424 } 425 426 if(ostrstr(wmstrA2, "<td class=\"team-shortname team-shortname-away\">") != NULL) { 420 debug(20, "wmstrA4(%d): %s\n", count, wmstrA4); 421 wmFinalMatches[0].result[count] = wmstrA4; 422 } 423 424 if(ostrstr(wmstrA2, "<li class=\"auswaerts\">") != NULL) { 427 425 debug(30, "wmstrA2(%d): %s\n", i, wmstrA2); 428 426 wmstrA3 = string_striptags(wmstrA2); … … 693 691 struct skin* flag1_7_last16 = getscreennode(wm2018_last16, "flag1_7"); 694 692 695 struct skin* htime_0_last16 = getscreennode(wm2018_last16, "htime_0");693 /*struct skin* htime_0_last16 = getscreennode(wm2018_last16, "htime_0"); 696 694 struct skin* htime_1_last16 = getscreennode(wm2018_last16, "htime_1"); 697 695 struct skin* htime_2_last16 = getscreennode(wm2018_last16, "htime_2"); … … 700 698 struct skin* htime_5_last16 = getscreennode(wm2018_last16, "htime_5"); 701 699 struct skin* htime_6_last16 = getscreennode(wm2018_last16, "htime_6"); 702 struct skin* htime_7_last16 = getscreennode(wm2018_last16, "htime_7"); 700 struct skin* htime_7_last16 = getscreennode(wm2018_last16, "htime_7");*/ 703 701 704 702 struct skin* result_0_last16 = getscreennode(wm2018_last16, "result_0"); … … 1063 1061 changetext(team1_7_last16, wmFinalMatches[0].team1[7]); 1064 1062 1065 changetext(htime_0_last16, wmFinalMatches[0].htime[0]);1063 /*changetext(htime_0_last16, wmFinalMatches[0].htime[0]); 1066 1064 changetext(htime_1_last16, wmFinalMatches[0].htime[1]); 1067 1065 changetext(htime_2_last16, wmFinalMatches[0].htime[2]); … … 1070 1068 changetext(htime_5_last16, wmFinalMatches[0].htime[5]); 1071 1069 changetext(htime_6_last16, wmFinalMatches[0].htime[6]); 1072 changetext(htime_7_last16, wmFinalMatches[0].htime[7]); 1070 changetext(htime_7_last16, wmFinalMatches[0].htime[7]);*/ 1073 1071 1074 1072 changetext(result_0_last16, wmFinalMatches[0].result[0]); -
titan/skins/wm2018/skin.xml
r42517 r42527 171 171 #node name="day_7" halign="left" valign="center" posx="30" posy="380" width="60" height="30" fontsize="30"> 172 172 173 <node name="date_0" halign="left" valign="center" posx="30" posy="100" width=" 170" height="30" fontsize="30">174 <node name="date_1" halign="left" valign="center" posx="30" posy="140" width=" 170" height="30" fontsize="30">175 <node name="date_2" halign="left" valign="center" posx="30" posy="180" width=" 170" height="30" fontsize="30">176 <node name="date_3" halign="left" valign="center" posx="30" posy="220" width=" 170" height="30" fontsize="30">177 <node name="date_4" halign="left" valign="center" posx="30" posy="260" width=" 170" height="30" fontsize="30">178 <node name="date_5" halign="left" valign="center" posx="30" posy="300" width=" 170" height="30" fontsize="30">179 <node name="date_6" halign="left" valign="center" posx="30" posy="340" width=" 170" height="30" fontsize="30">180 <node name="date_7" halign="left" valign="center" posx="30" posy="380" width=" 170" height="30" fontsize="30">181 182 <node name="htime_0" halign="right" valign="center" posx="170" posy="100" width="80" height="30" fontsize="30">183 <node name="htime_1" halign="right" valign="center" posx="170" posy="140" width="80" height="30" fontsize="30">184 <node name="htime_2" halign="right" valign="center" posx="170" posy="180" width="80" height="30" fontsize="30">185 <node name="htime_3" halign="right" valign="center" posx="170" posy="220" width="80" height="30" fontsize="30">186 <node name="htime_4" halign="right" valign="center" posx="170" posy="260" width="80" height="30" fontsize="30">187 <node name="htime_5" halign="right" valign="center" posx="170" posy="300" width="80" height="30" fontsize="30">188 <node name="htime_6" halign="right" valign="center" posx="170" posy="340" width="80" height="30" fontsize="30">189 <node name="htime_7" halign="right" valign="center" posx="170" posy="380" width="80" height="30" fontsize="30">173 <node name="date_0" halign="left" valign="center" posx="30" posy="100" width="250" height="30" fontsize="30"> 174 <node name="date_1" halign="left" valign="center" posx="30" posy="140" width="250" height="30" fontsize="30"> 175 <node name="date_2" halign="left" valign="center" posx="30" posy="180" width="250" height="30" fontsize="30"> 176 <node name="date_3" halign="left" valign="center" posx="30" posy="220" width="250" height="30" fontsize="30"> 177 <node name="date_4" halign="left" valign="center" posx="30" posy="260" width="250" height="30" fontsize="30"> 178 <node name="date_5" halign="left" valign="center" posx="30" posy="300" width="250" height="30" fontsize="30"> 179 <node name="date_6" halign="left" valign="center" posx="30" posy="340" width="250" height="30" fontsize="30"> 180 <node name="date_7" halign="left" valign="center" posx="30" posy="380" width="250" height="30" fontsize="30"> 181 182 #node name="htime_0" halign="right" valign="center" posx="170" posy="100" width="80" height="30" fontsize="30"> 183 #node name="htime_1" halign="right" valign="center" posx="170" posy="140" width="80" height="30" fontsize="30"> 184 #node name="htime_2" halign="right" valign="center" posx="170" posy="180" width="80" height="30" fontsize="30"> 185 #node name="htime_3" halign="right" valign="center" posx="170" posy="220" width="80" height="30" fontsize="30"> 186 #node name="htime_4" halign="right" valign="center" posx="170" posy="260" width="80" height="30" fontsize="30"> 187 #node name="htime_5" halign="right" valign="center" posx="170" posy="300" width="80" height="30" fontsize="30"> 188 #node name="htime_6" halign="right" valign="center" posx="170" posy="340" width="80" height="30" fontsize="30"> 189 #node name="htime_7" halign="right" valign="center" posx="170" posy="380" width="80" height="30" fontsize="30"> 190 190 191 191 <node name="team1_0" halign="center" valign="center" posx="290" posy="100" width="300" height="30" fontsize="30">
Note: See TracChangeset
for help on using the changeset viewer.