use only librfid reader for patron cards

[Biblio-RFID.git] / examples / selfcheck.js

diff --git a/examples/selfcheck.js b/examples/selfcheck.js
index 1803949..032aa7e 100644 (file)
--- a/examples/selfcheck.js
+++ b/examples/selfcheck.js
@@ -16,6 +16,7 @@ if(!window.console) {
 var state;
 var scan_timeout;
 var pending_jsonp = 0;
+var only_reader = '';
 
 // timeout warning dialog
 var tick_timeout = 25; // s
@@ -36,11 +37,13 @@ function change_page(new_state) {
                        $('.checkin').show();
                        circulation_type = 'checkin';
                        borrower_cardnumber = 0; // fake
+                       only_reader = '/only/3M';
                } else if ( new_state == 'checkout' ) {
                        new_state = 'circulation'; // page has different name
                        $('.checkout').show();
                        $('.checkin').hide();
                        circulation_type = 'checkout';
+                       only_reader = '/only/3M';
                }
 
                state = new_state;
@@ -59,6 +62,7 @@ function change_page(new_state) {
                        book_barcodes = {};
                        $('ul#books').html(''); // clear book list
                        $('#books_count').html( 0 );
+                       only_reader = '/only/librfid';
                        scan_tags();
                }
 
@@ -99,6 +103,8 @@ function got_visible_tags(data,textStatus) {
                                        link = 'catalogue/search.pl?q=';
                                } else if ( content.length == 12 && content.substr(0,2) == 20 ) {
                                        link = 'members/member.pl?member=';
+                               } else if ( tag.tag_type == 'SmartX' ) {
+                                       link = 'members/member.pl?member=';
                                } else {
                                        html += '<b>UNKNOWN TAG</b> '+content;
                                }
@@ -111,7 +117,7 @@ function got_visible_tags(data,textStatus) {
                                }
 
                                console.debug( 'calling', state, content );
-                               window[state]( content, tag.sid ); // call function with barcode
+                               window[state]( content, tag ); // call function with barcode
 
                        }
                });
@@ -132,13 +138,22 @@ function got_visible_tags(data,textStatus) {
        pending_jsonp--;
 };
 
+var wait_counter = 0;
+
 function scan_tags() {
        if ( pending_jsonp ) {
-               console.debug('scan_tags disabled ', pending_jsonp, ' requests waiting');
+               wait_counter++;
+               console.debug('scan_tags disabled ', pending_jsonp, ' requests waiting counter', wait_counter);
+               if ( wait_counter > 3 ) $('#working').show();
        } else {
-               console.info('scan_tags');
+               console.info('scan_tags', only_reader);
                pending_jsonp++;
-               $.getJSON("/scan?callback=?", got_visible_tags);
+               $.getJSON("/scan"+only_reader+"?callback=?", got_visible_tags).fail( function(data) {
+                       console.error('scan error pending jsonp', pending_jsonp);
+                       pending_jsonp--;
+               });
+               wait_counter = 0;
+               $('#working').hide();
        }
 
        if ( tick > 0 ) {
@@ -179,10 +194,10 @@ var borrower_cardnumber;
 var circulation_type;
 var book_barcodes = {};
 
-function start( cardnumber ) {
+function start( cardnumber, tag ) {
 
-       if ( cardnumber.length != 12 || cardnumber.substr(0,2) != "20" ) {
-               console.error(cardnumber, ' is not borrower card');
+       if ( tag.tag_type != 'SmartX' && ( cardnumber.length != 12 || cardnumber.substr(0,2) != "20" ) ) {
+               console.error(cardnumber, 'is not borrower card', tag);
                return;
        }
 
@@ -212,7 +227,7 @@ function borrower_info() {
        // nop
 }
 
-function circulation( barcode, sid ) {
+function circulation( barcode, tag ) {
        if ( barcode
                        && barcode.length == 10
                        && barcode.substr(0,3) == 130
@@ -220,7 +235,7 @@ function circulation( barcode, sid ) {
        ) { // book, not seen yet
                book_barcodes[ barcode ] = 1;
                pending_jsonp++;
-               $.getJSON('/sip2/'+circulation_type+'/'+borrower_cardnumber+'/'+barcode+'/'+sid , function( data ) {
+               $.getJSON('/sip2/'+circulation_type+'/'+borrower_cardnumber+'/'+barcode+'/'+tag.sid , function( data ) {
                        console.info( circulation_type, data );
 
                        var color = 'red';