/[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 3097 by torben, Sun Aug 21 22:34:01 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        AlarmLyd : String;
63        ScannetOkLyd : String;
64        ScannetOkStorLyd : String;
65    
66        ScannetOkTilTjekkodeLyd : String;
67    
68        PrinterNavn : String;
69        TjekPrinter : String;
70    
71        SporgEfterBoghandler : String;
72    
73        ScanTjekkode : String;
74        ScanTjekkodeAutomatik : string;
75    
76        TjekUrls : String;
77        TestFunktionen : String;
78    
79        LabelStor : integer;
80    
81    
82    
83      procedure ReadFromInifile( iniFile: TIniFile);      procedure ReadFromInifile( iniFile: TIniFile);
# Line 65  type Line 87  type
87    
88  implementation  implementation
89    
90  uses Utils;  uses Utils, SysUtils;
91    
92    
93  procedure TConfiguration.ReadFromInifile( iniFile: TIniFile);  procedure TConfiguration.ReadFromInifile( iniFile: TIniFile);
# Line 97  begin Line 119  begin
119      SporgEfterBoghandler := ReadString('Settings','SporgEfterBoghandler','0');      SporgEfterBoghandler := ReadString('Settings','SporgEfterBoghandler','0');
120      ScanTjekkode := ReadString('Settings','ScanTjekkode','0');      ScanTjekkode := ReadString('Settings','ScanTjekkode','0');
121      ScanTjekkodeAutomatik := ReadString('Settings','ScanTjekkodeAutomatik','1');      ScanTjekkodeAutomatik := ReadString('Settings','ScanTjekkodeAutomatik','1');
122      Scanningtype := ReadString('Settings','Scanningtype','A');  
123      Pakketype := ReadString('Settings','Pakketype','0');      //Scanningtype := ReadString('Settings','Scanningtype','A');  //Scanningstype skal ikke lęses fra config
124        //Pakketype := ReadString('Settings','Pakketype','0');        //Pakketype Skal ikke lęses fra config
125    
126      TestFunktionen := ReadString('Settings','TestFunktion','0');      TestFunktionen := ReadString('Settings','TestFunktion','0');
127    
128      AlarmLyd := ReadString('Settings','AlarmLyd','Sounds\Alarm.wav');      AlarmLyd := ReadString('Settings','AlarmLyd','Sounds\Alarm.wav');
129      ScannetOkLyd := ReadString('Settings','ScannetOkLyd','Sounds\Ok.wav');      ScannetOkLyd := ReadString('Settings','ScannetOkLyd','Sounds\Ok.wav');
130      ScannetOkStorLyd := ReadString('Settings','ScannetOkStorLyd','Sounds\Ok_stor.wav');      ScannetOkStorLyd := ReadString('Settings','ScannetOkStorLyd','Sounds\Ok_stor.wav');
# Line 111  begin Line 136  begin
136      TjekUrls := ReadString('Settings','TjekUrls','2');      TjekUrls := ReadString('Settings','TjekUrls','2');
137    
138    
139      LabelType := ReadInteger('Settings','LabelType',1);      LabelType := ReadInteger('Settings','LabelType', 1);
140    
141        LabelStor := ReadInteger('Settings','LabelStor', 0);
142    
143      if LabelType = 0 then      if LabelType = 0 then
144      begin      begin
# Line 232  begin Line 259  begin
259      URLOmdirigerTilPakkeshop := BaseURL + '/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s';      URLOmdirigerTilPakkeshop := BaseURL + '/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s';
260      URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);      URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);
261    
262      URLPrintLabel := BaseURL + '/BogpakkeKontrol/PrintLabel.php?stregkode=%s';      UrlEmballageRepareret := BaseURL + '/webservices/pakkeshop/EmballageRepareret.php?sted=%s&stregkode=%s';
263        UrlEmballageRepareret := InjectURL(UrlEmballageRepareret);
264    
265        URLUdenforSpecifikation := BaseURL + '/webservices/pakkeshop/UdenforSpecifikation.php?sted=%s&stregkode=%s';
266        URLUdenforSpecifikation := InjectURL(URLUdenforSpecifikation);
267    
268    
269        URLPrintLabel := BaseURL + '/WebServices/BogpakkeKontrol/PrintLabel.php?stregkode=%s';
270      URLPrintLabel := InjectURL(URLPrintLabel);      URLPrintLabel := InjectURL(URLPrintLabel);
271    
272    
273    
274        //Finally check for files:
275        if not FileExists(AlarmLyd) then
276        begin
277          AlarmLyd := '';
278        end;
279    
280        if not FileExists(ScannetOkLyd) then
281        begin
282          ScannetOkLyd := '';
283        end;
284    
285        if not FileExists(ScannetOkStorLyd) then
286        begin
287          ScannetOkStorLyd := '';
288        end;
289    
290    
291        if not FileExists(ScannetOkTilTjekkodeLyd) then
292        begin
293          ScannetOkTilTjekkodeLyd := '';
294        end;
295    
296    
297    
298  end;  end;
299    
300    
Legend:
Removed from v.3089  
changed lines
  Added in v.3097
  ViewVC Help
Powered by ViewVC 1.1.20