From b83ed4fbc41f49614029c899d09c9f943d1ab192 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sat, 4 Feb 2017 14:41:31 +0100 Subject: [PATCH] RFID: select one of available readers --- ffzg/rfid/koha-reader.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ffzg/rfid/koha-reader.pl b/ffzg/rfid/koha-reader.pl index d7225d8cb9..77e208256b 100755 --- a/ffzg/rfid/koha-reader.pl +++ b/ffzg/rfid/koha-reader.pl @@ -27,12 +27,16 @@ my $url = $query->url; my ( $redirect, $reader_ip_port ) = ( $1 . $3 , $2 ) if $url =~ s{(^.+)/ffzg/rfid/reader/([^/]+)(/.+)$}{$1}; warn "## $session $reader_ip_port"; - my $session_file = "/dev/shm/rfid.$session"; + +if ( $reader_ip_port ) { + open(my $fh, '>', $session_file) || die "$session_file: $!"; print $fh $reader_ip_port; close($fh); +} # $reader_ip_port + sub check_rfid_reader { my $host_port = shift; if ( my $sock = IO::Socket::INET->new($reader_ip_port) ) { @@ -45,12 +49,19 @@ sub check_rfid_reader { } +my $reader_url = $query->url( -path => 1 ); +$reader_url =~ s{/[^/]+$}{}; # strip script name +$reader_url . '/ffzg/rfid/'; + output_html_with_http_headers $query, $cookie, join('',qq{ $redirect
  1. Koha session: 
    $session },(-e $session_file ? 'OK' : 'ERROR: MISSING'),qq{
    2. -
  2. RFID reader: 
    $reader_ip_port }, check_rfid_reader( $reader_ip_port ), qq{
    3. +}, ( $reader_ip_port + ? qq{
  3. RFID reader: 
    $reader_ip_port } . check_rfid_reader( $reader_ip_port ) . qq{
    4. } + : qq{RFID available:} +), qq{