X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=examples%2Fselfcheck.js;h=4955e54f30b3e627339663e7be984f73071a40a6;hb=a32bdef661b26489f2b6db3622700846c61f4018;hp=ce05385082db2669acf24908d30dcfcdde9edbff;hpb=8b4eba88846a2bd91f62639b3adca643b884aea6;p=Biblio-RFID.git

diff --git a/examples/selfcheck.js b/examples/selfcheck.js
index ce05385..4955e54 100644
--- a/examples/selfcheck.js
+++ b/examples/selfcheck.js
@@ -15,7 +15,7 @@ if(!window.console) {
 
 var state;
 var scan_timeout;
-var scan_tags_active = true;
+var pending_jsonp = 0;
 
 function change_page(new_state) {
 	if ( state != new_state ) {
@@ -48,6 +48,7 @@ function change_page(new_state) {
 			circulation_type = 'checkout';
 			book_barcodes = {};
 			$('ul#books').html(''); // clear book list
+			$('#books_count').html( 0 );
 			scan_tags();
 		}
 
@@ -72,20 +73,13 @@ function got_visible_tags(data,textStatus) {
 		$.each(data.tags, function(i,tag) {
 			console.debug( i, tag );
 			html += '<li><tt class="' + tag.security + '">' + tag.sid;
-			var content = tag.content
-			if (typeof content === undefined && typeof tag.borrower !== undefined) 
-				content = tag.borrower.cardnumber;
-
-			var is_book = false;
-			var is_borrower = false;
+			var content = tag.content || tag.borrower.cardnumber;
 
 			if ( content ) {
 				var link;
 				if ( content.length = 10 && content.substr(0,3) == 130 ) { // book
-					is_book = true;
 					link = 'catalogue/search.pl?q=';
 				} else if ( content.length == 12 && content.substr(0,2) == 20 ) {
-					is_borrower = true;
 					link = 'members/member.pl?member=';
 				} else {
 					html += '<b>UNKNOWN TAG</b> '+content;
@@ -104,6 +98,7 @@ function got_visible_tags(data,textStatus) {
 			}
 		});
 		html += '</ul>';
+
 	}
 
 	var arrows = Array( 8592, 8598, 8593, 8599, 8594, 8600, 8595, 8601 );
@@ -114,19 +109,23 @@ function got_visible_tags(data,textStatus) {
 		+ '</div>'
 		+ html
 		;
-	$('#tags').html( html );
-	scan_timeout = window.setTimeout(function(){
-		scan_tags();
-	},tag_rescan);	// re-scan every 200ms
+	$('#tags').html( html ); // FIXME leaks memory?
+
+	pending_jsonp--;
 };
 
 function scan_tags() {
-	if ( scan_tags_active ) {
+	if ( pending_jsonp ) {
+		console.debug('scan_tags disabled ', pending_jsonp, ' requests waiting');
+	} else {
 		console.info('scan_tags');
+		pending_jsonp++;
 		$.getJSON("/scan?callback=?", got_visible_tags);
-	} else {
-		console.debug('scan_tags disabled');
 	}
+
+	scan_timeout = window.setTimeout(function(){
+		scan_tags();
+	},tag_rescan);	// re-scan every 200ms
 }
 
 $(document).ready(function() {
@@ -157,27 +156,22 @@ function start( cardnumber ) {
 		return;
 	}
 
-	borrower_cardnumber = cardnumber;
-
-	change_page('borrower_check');
-}
-
-function borrower_check() {
+	borrower_cardnumber = cardnumber; // for circulation
 
-	fill_in( 'borrower_number', borrower_cardnumber );
+	fill_in( 'borrower_number', cardnumber );
 
-	scan_tags_active = false;
-	$.getJSON('/sip2/patron_info/'+borrower_cardnumber)
+	pending_jsonp++;
+	$.getJSON('/sip2/patron_info/'+cardnumber)
 	.done( function( data ) {
 		console.info('patron', data);
 		fill_in( 'borrower_name', data['AE'] );
 		fill_in( 'borrower_email', data['BE'] );
 		fill_in( 'hold_items',    data['fixed'].substr( 2 + 14 + 3 + 18 + ( 0 * 4 ), 4 ) ) * 1;
 		fill_in( 'overdue_items', data['fixed'].substr( 2 + 14 + 3 + 18 + ( 1 * 4 ), 4 ) ) * 1;
-		scan_tags_active = true;
+		pending_jsonp--;
 		change_page('borrower_info');
 	}).fail( function(data) {
-		scan_tags_active = true;
+		pending_jsonp--;
 		change_page('error');
 	});
 }
@@ -192,17 +186,21 @@ function circulation( barcode, sid ) {
 			&& barcode.substr(0,3) == 130
 			&& book_barcodes[barcode] != 1
 	) { // book, not seen yet
-		scan_tags_active = false;
+		book_barcodes[ barcode ] = 1;
+		pending_jsonp++;
 		$.getJSON('/sip2/'+circulation_type+'/'+borrower_cardnumber+'/'+barcode+'/'+sid , function( data ) {
 			console.info( circulation_type, data );
-			$('ul#books').append('<li>' + ( data['AJ'] || barcode ) + ' <small>' + data['AF'] + '</small></li>');
-			book_barcodes[ barcode ] = 1;
+			$('ul#books').append('<li>' + ( data['AJ'] || barcode ) + ( data['AF'] ? ' <b>' + data['AF'] + '</b>' : '' ) + '</li>');
+			$('#books_count').html( $('ul#books > li').length );
 			console.debug( book_barcodes );
-			scan_tags_active = true;
+			pending_jsonp--;
 		}).fail( function() {
 			change_page('error');
-			scan_tags_active = true;
+			pending_jsonp--;
 		});
 	}
 }
 
+function end() {
+	// nop
+}