summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2014-11-05 00:41:27 +0200
committerLV-426 <lv-426@taproot.org.il>2014-11-09 14:56:58 +0200
commit753196f3dd62f8c1fedb0036e922d3a220093ee9 (patch)
tree2886afce457bef291d6745d4dc6bcd0ef7c8ee37
parent82e87d0f203d14097f818f84a27dfc92f267422c (diff)
commit diff_set upon sentence analysis:
- backend_commit - allows client accumulating changes & select better commit timing
-rw-r--r--scripts/model/graph.js10
-rw-r--r--scripts/textanalysis.js13
-rw-r--r--scripts/textanalysis.ui.js5
3 files changed, 26 insertions, 2 deletions
diff --git a/scripts/model/graph.js b/scripts/model/graph.js
index e3db1a1a..6ea6a3e4 100644
--- a/scripts/model/graph.js
+++ b/scripts/model/graph.js
@@ -478,6 +478,16 @@ function Graph(el) {
}
this.empty = empty;
+ // @ajax-trans
+ this.commit_diff_set = function (diff_set) {
+
+ function on_success(data){
+ // TODO impl
+ }
+
+ rz_api_mesh.broadcast_possible_next_diff_block(diff_set);
+ }
+
/**
/**
* perform initial DB load from backend
diff --git a/scripts/textanalysis.js b/scripts/textanalysis.js
index b323be63..dc9d1303 100644
--- a/scripts/textanalysis.js
+++ b/scripts/textanalysis.js
@@ -365,7 +365,7 @@ var textAnalyser = function (newtext, finalize) {
//FOR THE EXTERNAL ARROW-TYPE CHANGER
lastnode = newnodes[nodeindex];
- ret.applyToGraph = function(graph) {
+ ret.applyToGraph = function(graph, backend_commit) {
window.ret = ret;
var comp = graph.compareSubset('temp',
ret.nodes.filter(
@@ -407,6 +407,17 @@ var textAnalyser = function (newtext, finalize) {
}
}
}
+
+ if (finalize && backend_commit) {
+ // broadcast diff:
+ // - finalize?
+ // - broadcast_diff requested by caller
+ var topo_diff = model_util.adapt_format_write_topo_diff(ret.nodes, ret.links);
+ var diff_set = model_diff.new_diff_set();
+ diff_set.add_diff_obj(topo_diff);
+ graph.commit_diff_set(diff_set);
+ }
+
//UPDATE GRAPH ONCE
graph.update(!finalize && comp.graph_same);
};
diff --git a/scripts/textanalysis.ui.js b/scripts/textanalysis.ui.js
index 504f06df..99133b1b 100644
--- a/scripts/textanalysis.ui.js
+++ b/scripts/textanalysis.ui.js
@@ -21,7 +21,10 @@ function analyzeSentence(sentence, finalize)
$('.typeselection').css('left', 0);
break;
}
- ret.applyToGraph(RZ.graph);
+
+ var backend_commit = finalize;
+ ret.applyToGraph(RZ.graph, finalize, backend_commit);
+
if (finalize || sentence.length == 0) {
$('.typeselection').css('top', -300);
$('.typeselection').css('left', 0);