X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=checkcard.pl;h=cc1d1b715a11cddcf31e92213e0afddd542e0af7;hb=44da1f523dcdaf2fef158076f138ac8be5cb89fe;hp=b948393935c0cf4e7a19e397f6d32aae52d8abad;hpb=889622e0c6757408211798cfe8562a026a93b5b2;p=svn42.git

diff --git a/checkcard.pl b/checkcard.pl
index b948393..cc1d1b7 100755
--- a/checkcard.pl
+++ b/checkcard.pl
@@ -3,19 +3,19 @@
 use Socket;
 use strict;
 my $fh;
-#my $fifofile = "/tmp/door_cmd.fifo";
 
-my $socketfile = "/tmp/door_cmd.socket";
-exit(1) unless (-S $socketfile);
+my $socketfile = $ARGV[0] || "/var/run/tuer/door_cmd.socket";
+sleep(1) while (! -S $socketfile);
 my $socketaddr = sockaddr_un($socketfile);
 
 my $keys;
 my %good;
 
-open $keys,'/flash/realraum/keys';
+open $keys,'/flash/keys';
 while (<$keys>)
 {
-	if ($_ =~ /([0-9A-Fa-f]{8})\s(\S+)/)
+	chomp;
+	if ($_ =~ /^([0-9A-Fa-f]{8})\s+(.+)$/)
 	{
 		$good{$1}=$2;
  	}
@@ -31,7 +31,7 @@ sub send_to_fifo
 
 while (sleep 1)
 {
-	open $fh,'/flash/realraum/mifare-read 0 2>&1 |';
+	open $fh,'/flash/tuer/mifare-read 0 2>&1 |';
 	while (<$fh>)
 	{
 		next unless /UID/;
@@ -53,36 +53,5 @@ while (sleep 1)
 #
 #
 ###############################################################
-# /dev/ttyUSB0: door key printer
-#
-#
-#   Ok
-#   Ok, closing now
-#   Already closed
-#   Already opened
-#   close forced manually\nOk
-#   open forced manually\nOk
-#   Error: .*
-#   .* be: unknown command
-#          Operation in progress
-#          open/close took too long!
-#          last open/close operation took to long!
-#
-# commands:
-#  c ... close
-#   response: "Ok", "Already closed", "Error: .*"
-#  o ... open
-#   response: "Ok", "Already opened", "Error: .*"
-#  s ... status
-#   response: "Status: closed|opened|<->, opening|waiting|closing|idle"
-#         or  "Error: .*"
-#  r ... reset
-#   "Ok, closing now" or "Error: .*"
-#
-# open/close  will only be accepted if Status: ..., idle
-# Reset overrules all other operations in progress
-# s will always be accepted
-#
-###############################################################
 #
 #