use IO::Socket::INET;
use LWP::UserAgent;
use URI;
+use URI::Escape;
use POSIX qw(strftime);
use Encode;
-my $debug = 1;
+my $debug = 0;
my $listen = '127.0.0.1:9000';
$listen = ':9000';
my $reader;
-my $koha_url = 'http://ffzg.koha-dev.rot13.org:8080';
+my $koha_url = $ENV{KOHA_URL};
+warn "$koha_url";
# internal URL so we can find local address of machine and vmware NAT
-my $rfid_url = 'http://rfid.koha-dev.vbz.ffzg.hr';
+my $rfid_url = $ENV{RFID_URL};
my $sip2 = {
- server => '10.60.0.11:6002', # must be IP!
-# user => 'sip2-user',
-# password => 'sip2-passwd',
- user => 'sip2user',
- password => 'viva2koha',
- loc => 'FFZG',
+ server => $ENV{SIP2_SERVER}, # '10.60.0.11:6002' must be IP!
+ user => $ENV{SIP2_USER},
+ password => $ENV{SIP2_PASSWORD},
+ loc => $ENV{SIP2_LOC},
+};
+my $afi = {
+ secure => 0xDA,
+ unsecure => 0xD7,
};
use Getopt::Long;
'debug!' => \$debug,
'listen=s', => \$listen,
'reader=s', => \$reader,
- 'koha=s', => \$koha_url,
) || die $!;
+die "need KOHA_URL, eg. http://ffzg.koha-dev.rot13.org:8080" unless $koha_url;
+
our $rfid_sid_cache;
sub rfid_borrower {
my $in = <$sock>;
$in =~ s/^\n//;
+ $in =~ s/\r$//;
warn "SIP2 <<<< ",dump($in), "\n";
- die "expected $expect" unless substr($in,0,2) != $expect;
+ die "empty read from SIP server" unless length $in > 1;
- $in =~ s/\r$//;
+ die "expected $expect" unless substr($in,0,2) != $expect;
my $hash;
if ( $in =~ s/^([0-9\s]+)// ) {
print "Server $0 ready at $server_url\n";
while (my $client = $server->accept()) {
+
+ eval { # don't die inside here!
+
$client->autoflush(1);
my $request = <$client>;
}
close($fh);
}
- } elsif ( $method =~ m{/scan} ) {
- my @tags = $rfid->tags;
+ } elsif ( $method =~ m{/scan(/only/(.+))?} ) {
+ my $only = $2;
+ my @tags = $rfid->tags( reader => sub {
+ my $reader = shift;
+ return 1 unless $only;
+ if ( ref($reader) =~ m/$only/i ) {
+ return 1;
+ }
+ return 0;
+ });
my $json = { time => time() };
foreach my $tag ( @tags ) {
my $hash = $rfid->to_hash( $tag );
$hash->{sid} = $tag;
+ $hash->{reader} = $rfid->from_reader( $tag );
if ( $hash->{tag_type} eq 'SmartX' ) {
my $borrower = rfid_borrower $hash;
if ( exists $borrower->{error} ) {
warn "ERROR ", dump($borrower);
} else {
$hash->{borrower} = $borrower->{borrower};
+ $hash->{content} = $borrower->{borrower}->{cardnumber}; # compatibile with 3M tags
}
} else {
$hash->{security} = uc unpack 'H*', $rfid->afi( $tag );
warn "PROGRAM $tag $content\n";
$rfid->write_blocks( $tag => $content );
- $rfid->write_afi( $tag => chr( $param->{$p} =~ /^130/ ? 0xDA : 0xD7 ) );
+ $rfid->write_afi( $tag => chr( $param->{$p} =~ /^130/ ? $afi->{secure} : $afi->{unsecure} ) );
}
print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
$status = 302;
warn "SECURE $tag $data\n";
- $rfid->write_afi( $tag => hex($data) );
+ $rfid->write_afi( $tag => chr(hex($data)) );
}
if ( $json ) {
$hash = sip2_message("63000${ts} AO$loc|AA$patron|AC$password|");
} elsif ( $method eq 'checkout' ) {
- my ($patron,$barcode) = split(/\//, $args, 2);
+ my ($patron,$barcode,$sid) = split(/\//, $args, 3);
$hash = sip2_message("11YN${ts} AO$loc|AA$patron|AB$barcode|AC$password|BON|BIN|");
+ if ( substr( $hash->{fixed}, 2, 1 ) == 1 ) {
+ $rfid->write_afi( $sid => chr( $afi->{unsecure} ) );
+ }
} elsif ( $method eq 'checkin' ) {
- my $barcode = $args;
+ my ($patron,$barcode,$sid) = split(/\//, $args, 3);
$hash = sip2_message("09N${ts}${ts}AP|AO${loc}|AB$barcode|AC|BIN|");
+ if ( substr( $hash->{fixed}, 2, 1 ) == 1 ) {
+ $rfid->write_afi( $sid => chr( $afi->{secure} ) );
+ }
} else {
- print $client "HTTP/1.0 500 $method not implemented\r\n\r\n";
+ print $client "HTTP/1.0 501 $method not implemented\r\n\r\n";
+ warn "ERROR 501 $request\n";
}
if ( $hash ) {
encode_json( $hash );
}
+ } elsif ( $method =~ m{/beep/(.*)} ) {
+ my $error = uri_unescape($1);
+ system "beep -f 800 -r 2 -l 100";
+ print $client "HTTP/1.0 200 OK\r\nContent-Type: application/json\r\n\r\n{ beep: '$error' }\n";
+ print "BEEP $error\n";
} else {
print $client "HTTP/1.0 404 Unkown method\r\n\r\n";
+ warn "ERROR 404 $request\n";
}
} else {
print $client "HTTP/1.0 500 No method\r\n\r\n";
+ warn "ERROR 500 $request\n";
}
close $client;
+
+ }; # end of eval
+ if ( $@ ) {
+ print $client "HTTP/1.0 500 Error\r\n\r\nContent-Type: text/plain\r\n$@";
+ warn "ERROR: $@";
+ }
+
}
die "server died";
foreach ( split(/\n/, `ip addr` ) ) {
if ( /^\d:\s(\w+):\s/ ) {
- $ip->{last} = $1;
+ $ip->{_last} = $1;
} elsif ( /^\s+inet\s((\d+)\.(\d+)\.(\d+)\.(\d+))\/(\d+)/ ) {
- $ip->{ $ip->{last} } = $1;
+ $ip->{ $ip->{_last} } = $1;
} else {
- warn "# SKIP [$_]\n";
+ #warn "# SKIP [$_]\n";
}
-
}
+ warn dump($ip);
+
my $ua = LWP::UserAgent->new;
my $url = URI->new( $rfid_url . '/register.pl');
$url->query_form(
- local_ip => $ip->{eth0},
+ local_ip => $ip->{eth0} || $ip->{ (keys %$ip)[0] },
);
warn "GET ",$url->as_string;
my $response = $ua->get($url);
}
}
-rfid_register;
+rfid_register if $rfid_url;
http_server;
__DATA__
projects / Biblio-RFID.git / blobdiff