--- dao/DelphiScanner/Main.pas 2015/08/27 12:31:30 2685 +++ dao/DelphiScanner/Main.pas 2015/09/03 13:43:10 2689 @@ -193,7 +193,7 @@ SkrivLog : String; Sted : String; StedNavn : String; - Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlEKLoverforsel : String; + Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlIndleveringsPakkeManglendeScanninger,UrlEKLoverforsel : String; // 29150330: start UrlEKLoverforselPakkeshop : String; // 20150330: slut @@ -562,7 +562,10 @@ UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s'); UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s'); + UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s'); + UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s'); + LabelType := ReadInteger('Settings','LabelType',1); @@ -2906,6 +2909,58 @@ end; end; + // Tjekker UrlIndleveringsPakke og UrlIndleveringsPakkeManglendeScanninger + if PanelValg7.Enabled = true then + begin + if CheckUrl(UrlIndleveringsPakke) then + begin + logTekst := 'UrlIndleveringsPakke accepteret: ' + UrlIndleveringsPakke; + SkrivScanningLogFil(logTekst); + end + else + begin + inc(urlFejl); // Optæller antal fejl + logTekst := 'UrlIndleveringsPakke svarer ikke: ' + UrlIndleveringsPakke; + ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst); + if TjekUrls = '1' then + begin + logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... '; + end; + SkrivScanningLogFil(logTekst); + if TjekUrls = '1' then + begin + ShowMessage(logTekst); + UrlSendPrograminfo := ''; // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut + Application.Terminate; + exit; + end; + end; + + if CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then + begin + logTekst := 'UrlIndleveringsPakkeManglendeScanninger accepteret: ' + UrlIndleveringsPakkeManglendeScanninger; + SkrivScanningLogFil(logTekst); + end + else + begin + inc(urlFejl); // Optæller antal fejl + logTekst := 'UrlIndleveringsPakkeManglendeScanninger svarer ikke: ' + UrlIndleveringsPakkeManglendeScanninger; + ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst); + if TjekUrls = '1' then + begin + logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... '; + end; + SkrivScanningLogFil(logTekst); + if TjekUrls = '1' then + begin + ShowMessage(logTekst); + UrlSendPrograminfo := ''; // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut + Application.Terminate; + exit; + end; + end; + end; + // Tjekker UrlEKLoverforsel if PanelValg1.Enabled = true then begin @@ -4668,13 +4723,18 @@ end; - if (Scanningtype = '6') then + + if (Scanningtype = '7') then + begin + URLStr := Format(UrlIndleveringsPakkeManglendeScanninger, [StedKode]); + end + else if (Scanningtype = '6') then begin - URLStr := Format(UrlPakkeshopManglendeReturScanninger,[StedKode]); + URLStr := Format(UrlPakkeshopManglendeReturScanninger, [StedKode]); end else if (Scanningtype = '5') then begin - URLStr := Format(UrlPakkeshopManglendeScanninger,[StedKode]); + URLStr := Format(UrlPakkeshopManglendeScanninger, [StedKode]); end else if (Scanningtype = '1') then begin