@@ -400,12 +400,15 @@ $("#search").click(function(){
400
400
//event.preventDefault();
401
401
} ) ;
402
402
403
- $ ( "#xtract_csv" ) . click ( function ( ) {
403
+ $ ( ".xtract_it" ) . click ( function ( ) {
404
404
$ ( "#loading" ) . removeClass ( 'invisible' ) ;
405
405
fname = ( Math . random ( ) + 1 ) . toString ( 36 ) . substring ( 4 ) ;
406
406
fields = [ ]
407
407
tf = [ ]
408
408
xql = $ ( '#xql' ) . val ( )
409
+ format = $ ( this ) . hasClass ( 'csv' ) ? 'csv' : 'json'
410
+ filePath = '/data/' + fname + "." + format
411
+ action = 'prepare_' + format
409
412
indexOfLargestValue = 0
410
413
for ( var k in fmapping ) {
411
414
if ( fmapping [ k ] == "date" ) {
@@ -425,7 +428,7 @@ $("#xtract_csv").click(function(){
425
428
fields = mapping ;
426
429
}
427
430
var post = {
428
- "action" : "prepare_csv" ,
431
+ "action" : action ,
429
432
"search" : {
430
433
"index" : $ ( '#igs' ) . val ( ) ,
431
434
"fields" : fields ,
@@ -449,8 +452,8 @@ $("#xtract_csv").click(function(){
449
452
contentType : 'application/json' ,
450
453
success : function ( data ) { } ,
451
454
error : function ( data ) {
452
- $ ( "#download_link" ) . html ( "<a href='/data/" + fname + ".csv '>скачать</a>") ;
453
- document . location . href = "/data/" + fname + ".csv" ;
455
+ $ ( "#download_link" ) . html ( "<a href='" + filePath + " '>скачать</a>") ;
456
+ document . location . href = filePath ;
454
457
}
455
458
} )
456
459
$ ( "#loading" ) . addClass ( 'invisible' ) ;
0 commit comments