--- dao/DelphiScanner/Main.pas 2015/09/03 14:16:31 2691
+++ dao/DelphiScanner/Main.pas 2015/09/03 14:31:39 2694
@@ -93,9 +93,6 @@
PanelManglendePakker6: TPanel;
menuIndlevering: TMenuItem;
-
- function Sto_GetFmtFileVersion(const FileName: String = ''): String;
-
function getProddato() : TDate;
function getProddag() : String;
function retRutenummer(rutenummer : String) : String;
@@ -103,7 +100,6 @@
function SavePChar(p: PChar): PChar;
function FileTime2DateTime(FileTime: TFileTime): TDateTime;
- function CheckUrl(url:string):boolean;
procedure PlaySound(filename : PWideChar);
procedure StartScreen();
@@ -605,7 +601,7 @@
if (SkrivLog = '1') then
begin
- logTekst := 'Program start (Version: ' + Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
+ logTekst := 'Program start (Version: ' + TUtils.Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
try
SkrivScanningLogFil(logTekst);
Uploadlogfil1.Enabled := true;
@@ -1131,7 +1127,7 @@
Scanningtype := gemScanningtype;
SendInfoTilServer(Sted, Scanningtype, 'Begin', '');
- SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', Sto_GetFmtFileVersion(''));
+ SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', TUtils.Sto_GetFmtFileVersion(''));
end;
@@ -2658,7 +2654,7 @@
// Tjekker UrlNormal
if PanelValg1.Enabled = true then
begin
- if CheckUrl(UrlNormal) then
+ if TUtils.CheckUrl(UrlNormal) then
begin
logTekst := 'UrlNormal accepteret: ' + UrlNormal;
SkrivScanningLogFil(logTekst);
@@ -2687,7 +2683,7 @@
// Tjekker UrlReturDAO
if PanelValg2.Enabled = true then
begin
- if CheckUrl(UrlReturDAO) then
+ if TUtils.CheckUrl(UrlReturDAO) then
begin
logTekst := 'UrlReturDAO accepteret: ' + UrlReturDAO;
SkrivScanningLogFil(logTekst);
@@ -2715,7 +2711,7 @@
// Tjekker UrlReturBoghandler
if PanelValg3.Enabled = true then
begin
- if CheckUrl(UrlReturBoghandler) then
+ if TUtils.CheckUrl(UrlReturBoghandler) then
begin
logTekst := 'UrlReturBoghandler accepteret: ' + UrlReturBoghandler;
SkrivScanningLogFil(logTekst);
@@ -2743,7 +2739,7 @@
// Tjekker UrlBudlevering
if PanelValg4.Enabled = true then
begin
- if CheckUrl(UrlBudlevering) then
+ if TUtils.CheckUrl(UrlBudlevering) then
begin
logTekst := 'UrlBudlevering accepteret: ' + UrlBudlevering;
SkrivScanningLogFil(logTekst);
@@ -2771,7 +2767,7 @@
// Tjekker UrlPakkeshoplevering
if PanelValg5.Enabled = true then
begin
- if CheckUrl(UrlPakkeshoplevering) then
+ if TUtils.CheckUrl(UrlPakkeshoplevering) then
begin
logTekst := 'UrlPakkeshoplevering accepteret: ' + UrlPakkeshoplevering;
SkrivScanningLogFil(logTekst);
@@ -2799,7 +2795,7 @@
// Tjekker UrlReturPakkeshop
if PanelValg6.Enabled = true then
begin
- if CheckUrl(UrlReturPakkeshop) then
+ if TUtils.CheckUrl(UrlReturPakkeshop) then
begin
logTekst := 'UrlReturPakkeshop accepteret: ' + UrlReturPakkeshop;
SkrivScanningLogFil(logTekst);
@@ -2828,7 +2824,7 @@
if (PanelValg1.Enabled = true)
or (PanelValg4.Enabled = true) then
begin
- if CheckUrl(UrlManglendeScanninger) then
+ if TUtils.CheckUrl(UrlManglendeScanninger) then
begin
logTekst := 'UrlManglendeScanninger accepteret: ' + UrlManglendeScanninger;
SkrivScanningLogFil(logTekst);
@@ -2856,7 +2852,7 @@
// Tjekker UrlPakkeshopManglendeScanninger
if PanelValg5.Enabled = true then
begin
- if CheckUrl(UrlPakkeshopManglendeScanninger) then
+ if TUtils.CheckUrl(UrlPakkeshopManglendeScanninger) then
begin
logTekst := 'UrlPakkeshopManglendeScanninger accepteret: ' + UrlPakkeshopManglendeScanninger;
SkrivScanningLogFil(logTekst);
@@ -2884,7 +2880,7 @@
// Tjekker UrlPakkeshopManglendeReturScanninger
if PanelValg6.Enabled = true then
begin
- if CheckUrl(UrlPakkeshopManglendeReturScanninger) then
+ if TUtils.CheckUrl(UrlPakkeshopManglendeReturScanninger) then
begin
logTekst := 'UrlPakkeshopManglendeReturScanninger accepteret: ' + UrlPakkeshopManglendeReturScanninger;
SkrivScanningLogFil(logTekst);
@@ -2912,7 +2908,7 @@
// Tjekker UrlIndleveringsPakke og UrlIndleveringsPakkeManglendeScanninger
if PanelValg7.Enabled = true then
begin
- if CheckUrl(UrlIndleveringsPakke) then
+ if TUtils.CheckUrl(UrlIndleveringsPakke) then
begin
logTekst := 'UrlIndleveringsPakke accepteret: ' + UrlIndleveringsPakke;
SkrivScanningLogFil(logTekst);
@@ -2936,7 +2932,7 @@
end;
end;
- if CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then
+ if TUtils.CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then
begin
logTekst := 'UrlIndleveringsPakkeManglendeScanninger accepteret: ' + UrlIndleveringsPakkeManglendeScanninger;
SkrivScanningLogFil(logTekst);
@@ -2964,7 +2960,7 @@
// Tjekker UrlEKLoverforsel
if PanelValg1.Enabled = true then
begin
- if CheckUrl(UrlEKLoverforsel) then
+ if TUtils.CheckUrl(UrlEKLoverforsel) then
begin
logTekst := 'UrlEKLoverforsel accepteret: ' + UrlEKLoverforsel;
SkrivScanningLogFil(logTekst);
@@ -2993,7 +2989,7 @@
// Tjekker UrlEKLoverforselPakkeshop
if PanelValg5.Enabled = true then
begin
- if CheckUrl(UrlEKLoverforselPakkeshop) then
+ if TUtils.CheckUrl(UrlEKLoverforselPakkeshop) then
begin
logTekst := 'UrlEKLoverforselPakkeshop accepteret: ' + UrlEKLoverforselPakkeshop;
SkrivScanningLogFil(logTekst);
@@ -3020,7 +3016,7 @@
// Tjekker UrlFindPakketype
- if CheckUrl(UrlFindPakketype) then
+ if TUtils.CheckUrl(UrlFindPakketype) then
begin
logTekst := 'UrlFindPakketype accepteret: ' + UrlFindPakketype;
SkrivScanningLogFil(logTekst);
@@ -3045,7 +3041,7 @@
end;
// Tjekker UrlSendPrograminfo
- if CheckUrl(UrlSendPrograminfo) then
+ if TUtils.CheckUrl(UrlSendPrograminfo) then
begin
logTekst := 'UrlSendPrograminfo accepteret: ' + UrlSendPrograminfo;
SkrivScanningLogFil(logTekst);
@@ -3244,27 +3240,14 @@
procedure TMainForm.PanelValgAClick(Sender: TObject);
begin
-// 20150311: start
-(*
- if PanelValgA.Color = clBtnFace then
- begin
- AutomatiskValg1.Checked := true;
- PanelValgA.Color := clGreen;
- PanelValgA.Font.Color := clWhite;
- end
- else
- begin
- AutomatiskValg1.Checked := false;
- PanelValgA.Color := clBtnFace;
- PanelValgA.Font.Color := clWindowText;
- end;
-*)
// Skal ikke toggle men bare sætte funktionen on
// Fravælges ved at vælge en scanningstype
- AutomatiskValg1.Checked := true;
- PanelValgA.Color := clGreen;
- PanelValgA.Font.Color := clWhite;
-// 20150311: slut
+ AutomatiskValg1.Checked := true;
+ PanelValgA.Color := clGreen;
+ PanelValgA.Font.Color := clWhite;
+
+
+
end;
procedure TMainForm.Pakkernormal1Click(Sender: TObject);
@@ -3379,7 +3362,7 @@
tekst, filversion : String;
begin
- filversion := Sto_GetFmtFileVersion('');
+ filversion := TUtils.Sto_GetFmtFileVersion('');
tekst := 'Program til indscanning af pakker'+crlf+'Version '+filversion+crlf+crlf+'Udviklet af it afdelingen, DAO';
tekst := tekst+crlf+crlf;
@@ -3817,60 +3800,7 @@
// 20150310: slut
end;
-///
-/// This function reads the file resource of "FileName" and returns
-/// the version number as formatted text.
-///
-/// Sto_GetFmtFileVersion() = '4.13.128.0'
-/// Sto_GetFmtFileVersion('', '%.2d-%.2d-%.2d') = '04-13-128'
-///
-/// If "Fmt" is invalid, the function may raise an
-/// EConvertError exception.
-/// Full path to exe or dll. If an empty
-/// string is passed, the function uses the filename of the
-/// running exe or dll.
-/// Format string, you can use at most four integer
-/// values.
-/// Formatted version number of file, '' if no version
-/// resource found.
-function TMainForm.Sto_GetFmtFileVersion(const FileName: String = ''): String;
-var
- sFileName: String;
- iBufferSize: DWORD;
- iDummy: DWORD;
- pBuffer: Pointer;
- pFileInfo: Pointer;
- iVer: array[1..4] of Integer;
-begin
- // set default value
- Result := '';
- // get filename of exe/dll if no filename is specified
- sFileName := Trim(FileName);
- if (sFileName = '') then
- sFileName := GetModuleName(HInstance);
- // get size of version info (0 if no version info exists)
- iBufferSize := GetFileVersionInfoSize(PChar(sFileName), iDummy);
- if (iBufferSize > 0) then
- begin
- GetMem(pBuffer, iBufferSize);
- try
- // get fixed file info (language independent)
- GetFileVersionInfo(PChar(sFileName), 0, iBufferSize, pBuffer);
- VerQueryValue(pBuffer, '\', pFileInfo, iDummy);
- // read version blocks
- iVer[1] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
- iVer[2] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
- iVer[3] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
- iVer[4] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
- finally
- FreeMem(pBuffer);
- end;
-
- // format result string
- Result := Format('%d.%d.%d.%d', [iVer[1], iVer[2], iVer[3], iVer[4]]);
- end;
-end;
procedure TMainForm.PlaySound(filename : PWideChar);
begin
@@ -5424,44 +5354,7 @@
-function TMainForm.CheckUrl(url:string):boolean;
-var
- hSession, hfile: hInternet;
- dwindex,dwcodelen :dword;
- dwcode:array[1..20] of char;
- res : pchar;
-begin
- if pos('http://',lowercase(url))=0 then
- url := 'http://'+url;
- Result := false;
- hSession := InternetOpen('InetURL:/1.0',
- INTERNET_OPEN_TYPE_PRECONFIG,
- nil,
- nil,
- 0);
- if assigned(hsession) then
- begin
- hfile := InternetOpenUrl(hsession,
- pchar(url),
- nil,
- 0,
- INTERNET_FLAG_RELOAD,
- 0);
- dwIndex := 0;
- dwCodeLen := 10;
- HttpQueryInfo(hfile,
- HTTP_QUERY_STATUS_CODE,
- @dwcode,
- dwcodeLen,
- dwIndex);
- res := pchar(@dwcode);
- result:= (res ='200') or (res ='302');
- if assigned(hfile) then
- InternetCloseHandle(hfile);
- InternetCloseHandle(hsession);
- end;
-end;
procedure TMainForm.CheckPrintQue(tjektype : string);