/[projects]/dao/DelphiScanner/Configuration.pas
ViewVC logotype

Diff of /dao/DelphiScanner/Configuration.pas

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3089 by torben, Mon Aug 15 19:09:21 2016 UTC revision 3124 by torben, Wed Oct 19 06:59:57 2016 UTC
# Line 54  type Line 54  type
54      URLPrintLabel : String;      URLPrintLabel : String;
55      UrlEKLoverforselPakkeshop : String;      UrlEKLoverforselPakkeshop : String;
56    
57        URLUdenforSpecifikation : String;
58        UrlEmballageRepareret : String;
59    
60      UrlFindPakketype, UrlSendPrograminfo: String;      UrlFindPakketype, UrlSendPrograminfo: String;
61    
62        UrlHentPakkeAntal: String;
63    
64        AlarmLyd : String;
65        ScannetOkLyd : String;
66        ScannetOkStorLyd : String;
67    
68        ScannetOkTilTjekkodeLyd : String;
69    
70        PrinterNavn : String;
71        TjekPrinter : String;
72    
73        SporgEfterBoghandler : String;
74    
75        ScanTjekkode : String;
76        ScanTjekkodeAutomatik : string;
77    
78        TjekUrls : String;
79        TestFunktionen : String;
80    
81        LabelStor : integer;
82    
83    
84    
85      procedure ReadFromInifile( iniFile: TIniFile);      procedure ReadFromInifile( iniFile: TIniFile);
# Line 65  type Line 89  type
89    
90  implementation  implementation
91    
92  uses Utils;  uses Utils, SysUtils;
93    
94    
95  procedure TConfiguration.ReadFromInifile( iniFile: TIniFile);  procedure TConfiguration.ReadFromInifile( iniFile: TIniFile);
# Line 97  begin Line 121  begin
121      SporgEfterBoghandler := ReadString('Settings','SporgEfterBoghandler','0');      SporgEfterBoghandler := ReadString('Settings','SporgEfterBoghandler','0');
122      ScanTjekkode := ReadString('Settings','ScanTjekkode','0');      ScanTjekkode := ReadString('Settings','ScanTjekkode','0');
123      ScanTjekkodeAutomatik := ReadString('Settings','ScanTjekkodeAutomatik','1');      ScanTjekkodeAutomatik := ReadString('Settings','ScanTjekkodeAutomatik','1');
124      Scanningtype := ReadString('Settings','Scanningtype','A');  
125      Pakketype := ReadString('Settings','Pakketype','0');      //Scanningtype := ReadString('Settings','Scanningtype','A');  //Scanningstype skal ikke lęses fra config
126        //Pakketype := ReadString('Settings','Pakketype','0');        //Pakketype Skal ikke lęses fra config
127    
128      TestFunktionen := ReadString('Settings','TestFunktion','0');      TestFunktionen := ReadString('Settings','TestFunktion','0');
129    
130      AlarmLyd := ReadString('Settings','AlarmLyd','Sounds\Alarm.wav');      AlarmLyd := ReadString('Settings','AlarmLyd','Sounds\Alarm.wav');
131      ScannetOkLyd := ReadString('Settings','ScannetOkLyd','Sounds\Ok.wav');      ScannetOkLyd := ReadString('Settings','ScannetOkLyd','Sounds\Ok.wav');
132      ScannetOkStorLyd := ReadString('Settings','ScannetOkStorLyd','Sounds\Ok_stor.wav');      ScannetOkStorLyd := ReadString('Settings','ScannetOkStorLyd','Sounds\Ok_stor.wav');
# Line 111  begin Line 138  begin
138      TjekUrls := ReadString('Settings','TjekUrls','2');      TjekUrls := ReadString('Settings','TjekUrls','2');
139    
140    
141      LabelType := ReadInteger('Settings','LabelType',1);      LabelType := ReadInteger('Settings','LabelType', 1);
142    
143        LabelStor := ReadInteger('Settings','LabelStor', 0);
144    
145      if LabelType = 0 then      if LabelType = 0 then
146      begin      begin
# Line 232  begin Line 261  begin
261      URLOmdirigerTilPakkeshop := BaseURL + '/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s';      URLOmdirigerTilPakkeshop := BaseURL + '/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s';
262      URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);      URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);
263    
264      URLPrintLabel := BaseURL + '/BogpakkeKontrol/PrintLabel.php?stregkode=%s';      UrlEmballageRepareret := BaseURL + '/webservices/pakkeshop/EmballageRepareret.php?sted=%s&stregkode=%s';
265        UrlEmballageRepareret := InjectURL(UrlEmballageRepareret);
266    
267        URLUdenforSpecifikation := BaseURL + '/webservices/pakkeshop/UdenforSpecifikation.php?sted=%s&stregkode=%s';
268        URLUdenforSpecifikation := InjectURL(URLUdenforSpecifikation);
269    
270    
271        URLPrintLabel := BaseURL + '/WebServices/BogpakkeKontrol/PrintLabel.php?stregkode=%s';
272      URLPrintLabel := InjectURL(URLPrintLabel);      URLPrintLabel := InjectURL(URLPrintLabel);
273    
274        UrlHentPakkeAntal := BaseURL + '/WebServices/BogpakkeKontrol/HentPakkeAntal.php?sted=%s';
275        UrlHentPakkeAntal := InjectURL(UrlHentPakkeAntal);
276    
277    
278    
279        //Finally check for files:
280        if not FileExists(AlarmLyd) then
281        begin
282          AlarmLyd := '';
283        end;
284    
285        if not FileExists(ScannetOkLyd) then
286        begin
287          ScannetOkLyd := '';
288        end;
289    
290        if not FileExists(ScannetOkStorLyd) then
291        begin
292          ScannetOkStorLyd := '';
293        end;
294    
295    
296        if not FileExists(ScannetOkTilTjekkodeLyd) then
297        begin
298          ScannetOkTilTjekkodeLyd := '';
299        end;
300    
301    
302    
303  end;  end;
304    

Legend:
Removed from v.3089  
changed lines
  Added in v.3124

  ViewVC Help
Powered by ViewVC 1.1.20