Skip to content

gargantext
gargantext
Commit 386b552a authored by delanoe's avatar delanoe
Browse files
Options

Merge branch 'samuel' into unstable

parents aac9569c c6cefede
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 85 deletions
static/js/NGrams_dyna_chart_and_table.js
View file @ 386b552a
...@@ -897,10 +897,6 @@ function GET_( url , callback ) { ...@@ -897,10 +897,6 @@ function GET_( url , callback ) {
// [ = = = = = = = = = = INIT = = = = = = = = = = ] // [ = = = = = = = = = = INIT = = = = = = = = = = ]
// http://localhost:8000/api/node/84592/ngrams?format=json&score=tfidf,occs&list=miam // http://localhost:8000/api/node/84592/ngrams?format=json&score=tfidf,occs&list=miam
var corpus_id = getIDFromURL( "corpus" ) var corpus_id = getIDFromURL( "corpus" )
// var url0=window.location.origin+"/api/node/"+corpus_id+"/ngrams?format=json&score=tfidf,occs&list=stop&limit=1000",
// url1=window.location.origin+"/api/node/"+corpus_id+"/ngrams/group",
// url2=window.location.origin+"/api/node/"+corpus_id+"/ngrams/list/map",
// url3=window.location.origin+"/api/node/"+corpus_id+"/ngrams?format=json&score=tfidf,occs&list=miam&limit=1000";
var NGrams = { var NGrams = {
"group" : {}, "group" : {},
"stop" : {}, "stop" : {},
...@@ -911,44 +907,10 @@ var NGrams = { ...@@ -911,44 +907,10 @@ var NGrams = {
$("#corpusdisplayer").hide() $("#corpusdisplayer").hide()
// // The AJAX's in cascade:
// GET_( url0 , function(result) {
// if(result!=false) {
// for(var i in result) {
// NGrams["stop"][result[i].id] = result[i]
// }
// }
// GET_( url1 , function(result) {
// if(result!=false) {
// NGrams["group"] = result
// }
// GET_( url2 , function(result) {
// if(result!=false) {
// NGrams["map"] = result
// }
// GET_( url3 , function(result) {
// if(result!=false) {
// NGrams["main"] = {
// "ngrams": result,
// "scores": {
// "initial":"tfidf",
// "nb_docs":result.length,
// "orig_nb_ngrams":1,
// "nb_ngrams":result.length,
// }
// }
// AfterAjax()
// }
// });
// });
// });
// });
var url = [ var url = [
window.location.origin+"/api/node/"+corpus_id+"/ngrams/list/map?custom", window.location.origin+"/api/node/"+corpus_id+"/ngrams/list/miam?custom",
window.location.origin+"/api/node/"+corpus_id+"/ngrams/list/map",
window.location.origin+"/api/node/"+corpus_id+"/ngrams/group", window.location.origin+"/api/node/"+corpus_id+"/ngrams/group",
window.location.origin+"/api/node/"+corpus_id+"/ngrams?format=json&score=tfidf,occs&list=stop&limit=1000", window.location.origin+"/api/node/"+corpus_id+"/ngrams?format=json&score=tfidf,occs&list=stop&limit=1000",
] ]
...@@ -956,9 +918,10 @@ var url = [ ...@@ -956,9 +918,10 @@ var url = [
// The AJAX's in cascade: // The AJAX's in cascade:
GET_( url[0] , function(result) { GET_( url[0] , function(result) {
// = = = = MIAM = = = = //
if(result!=false) { if(result!=false) {
NGrams["main"] = { NGrams["main"] = {
"ngrams": [], "ngrams": [],
"scores": { "scores": {
...@@ -968,26 +931,35 @@ GET_( url[0] , function(result) { ...@@ -968,26 +931,35 @@ GET_( url[0] , function(result) {
"nb_ngrams":result.length, "nb_ngrams":result.length,
} }
} }
var counter = 0
for(var i in result) {
NGrams["map"][result[i].id] = true
NGrams["main"].ngrams.push(result[i])
NGrams["main"].ngrams[counter]["state"] = System[0]["statesD"]["keep"]
counter++;
}
console.log(NGrams["main"])
AfterAjax() for(var i in result)
NGrams["main"].ngrams.push(result[i])
} }
// = = = = /MIAM = = = = //
GET_( url[1] , function(result) { GET_( url[1] , function(result) {
// = = = = MAP = = = = //
if(result!=false) { if(result!=false) {
NGrams["group"] = result NGrams["map"] = result
} }
// = = = = /MAP = = = = //
GET_( url[2] , function(result) { GET_( url[2] , function(result) {
for(var i in result) { // = = = = GROUP = = = = //
NGrams["stop"][result[i].id] = result[i] if(result!=false) {
} NGrams["group"] = result
}
// = = = = /GROUP = = = = //
AfterAjax()
GET_( url[3] , function(result) {
// = = = = STOP = = = = //
for(var i in result) {
NGrams["stop"][result[i].id] = result[i]
}
// = = = = /STOP = = = = //
});
}); });
}); });
}); });
...@@ -996,35 +968,35 @@ GET_( url[0] , function(result) { ...@@ -996,35 +968,35 @@ GET_( url[0] , function(result) {
function AfterAjax() { function AfterAjax() {
// // Deleting subforms from the ngrams-table, clean start baby! // // Deleting subforms from the ngrams-table, clean start baby!
// if( Object.keys(NGrams["group"].links).length>0 ) { if( Object.keys(NGrams["group"].links).length>0 ) {
// var _forms = { "main":{} , "sub":{} } var _forms = { "main":{} , "sub":{} }
// for(var i in NGrams["group"].links) { for(var i in NGrams["group"].links) {
// _forms["main"][i] = true _forms["main"][i] = true
// for(var j in NGrams["group"].links[i]) { for(var j in NGrams["group"].links[i]) {
// _forms["sub"][ NGrams["group"].links[i][j] ] = true _forms["sub"][ NGrams["group"].links[i][j] ] = true
// } }
// } }
// var ngrams_data_ = [] var ngrams_data_ = []
// for(var i in NGrams["main"].ngrams) { for(var i in NGrams["main"].ngrams) {
// if(_forms["sub"][NGrams["main"].ngrams[i].id]) { if(_forms["sub"][NGrams["main"].ngrams[i].id]) {
// NGrams["group"]["nodes"][NGrams["main"].ngrams[i].id] = NGrams["main"].ngrams[i] NGrams["group"]["nodes"][NGrams["main"].ngrams[i].id] = NGrams["main"].ngrams[i]
// } else { } else {
// // if( _forms["main"][ NGrams["main"].ngrams[i].id ] ) // if( _forms["main"][ NGrams["main"].ngrams[i].id ] )
// // NGrams["main"].ngrams[i].name = "*"+NGrams["main"].ngrams[i].name // NGrams["main"].ngrams[i].name = "*"+NGrams["main"].ngrams[i].name
// ngrams_data_.push( NGrams["main"].ngrams[i] ) ngrams_data_.push( NGrams["main"].ngrams[i] )
// } }
// } }
// NGrams["main"].ngrams = ngrams_data_; NGrams["main"].ngrams = ngrams_data_;
// } }
// if( Object.keys(NGrams["map"]).length>0 ) { if( Object.keys(NGrams["map"]).length>0 ) {
// for(var i in NGrams["main"].ngrams) { for(var i in NGrams["main"].ngrams) {
// if(NGrams["map"][NGrams["main"].ngrams[i].id]) { if(NGrams["map"][NGrams["main"].ngrams[i].id]) {
// NGrams["main"].ngrams[i]["state"] = System[0]["statesD"]["keep"] NGrams["main"].ngrams[i]["state"] = System[0]["statesD"]["keep"]
// } }
// } }
// } }
// Building the Score-Selector //NGrams["scores"] // Building the Score-Selector //NGrams["scores"]
var FirstScore = NGrams["main"].scores.initial var FirstScore = NGrams["main"].scores.initial
......
templates/corpus/terms.html
View file @ 386b552a
...@@ -233,7 +233,7 @@ input[type=radio]:checked + label { ...@@ -233,7 +233,7 @@ input[type=radio]:checked + label {
<div id="filter_search" style="visibility:hidden"> <div id="filter_search" style="visibility:hidden">
<select id="example-single-optgroups" onchange="SearchFilters(this);"> <select id="example-single-optgroups" onchange="SearchFilters(this);">
<!-- <optgroup label=""> --> <!-- <optgroup label=""> -->
<!-- <option id="filter_all" value="filter_all">All</option> --> <option id="filter_all" value="filter_all">All</option>
<!-- <option id="filter_title" value="filter_title">Title</option> --> <!-- <option id="filter_title" value="filter_title">Title</option> -->
<!-- <option id="filter_date" value="filter_date">Date</option> --> <!-- <option id="filter_date" value="filter_date">Date</option> -->
<!-- </optgroup> --> <!-- </optgroup> -->
......
templates/project.html
View file @ 386b552a
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
setTimeout( setTimeout(
function() { function() {
location.reload(); location.reload();
}, 5000); }, 3000);
}, },
error: function(result) { error: function(result) {
console.log("in doTheQuery(). Data not found"); console.log("in doTheQuery(). Data not found");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment