void SQLApp::Query()

{
	SqlBool where;
	SqlSet borrowed = Select(BOOK_ID).From(BORROW_RECORD).Where(IsNull(RETURNED));
	int q_date_from = ~query.date_from - Date(1970, 1, 1); 	// <== NEW
	int q_date_to = ~query.date_to - Date(1970, 1, 1); 	// <== NEW
	if(query.status == 1)
		where = ID != borrowed;
	if(query.status == 2)
		where = ID == borrowed;
	SqlBool bdate;
	if(!IsNull(query.borrowed_from))
//		bdate = BORROWED >= ~query.borrowed_from;
		bdate = BORROWED >= q_borrowed_from;   		// <== NEW
	if(!IsNull(query.borrowed_to))
//		bdate = BORROWED <= ~query.borrowed_to;
		bdate = BORROWED <= q_borrowed_to;		// <== NEW

	if(!bdate.IsEmpty())
		where = where && ID == Select(BOOK_ID).From(BORROW_RECORD).Where(bdate);
	book.Query(where);
}