# HG changeset patch # User ymh # Date 1343749514 -7200 # Node ID 30f0bf1d3f58574c16f9f180bd56b22c5853b571 # Parent 6fe56c8896e3f7a3e0e0421cdd29428826cfe182# Parent 2446fff2bea0dd8f373aa7a947c22d866454c4a8 Merge with 2446fff2bea0dd8f373aa7a947c22d866454c4a8 diff -r 6fe56c8896e3 -r 30f0bf1d3f58 src/ldt/ldt/ldt_utils/views/json.py --- a/src/ldt/ldt/ldt_utils/views/json.py Tue Jul 31 17:44:44 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/views/json.py Tue Jul 31 17:45:14 2012 +0200 @@ -130,7 +130,7 @@ } #filtered_results = [] for res in results: - cur_in = float(res["begin"]) + cur_in = float(res["start_ts"]) cur_out = cur_in + float(res["duration"]) if tc_in<=cur_in and cur_out<=tc_out: #filtered_results.append(res) diff -r 6fe56c8896e3 -r 30f0bf1d3f58 src/ldt/ldt/ldt_utils/views/lignesdetemps.py --- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Tue Jul 31 17:44:44 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Tue Jul 31 17:45:14 2012 +0200 @@ -50,7 +50,7 @@ for result in results: ids[result["iri_id"]] = "" projIds[result["project_id"]] = "" - typesIds[result["decoupage_id"]] = "" + typesIds[result["cutting_id"]] = "" id_list = ids.keys() projId_list = projIds.keys() @@ -97,7 +97,7 @@ seg = lxml.etree.SubElement(iri, 'seg') seg.set('idctt', resultMap['iri_id']) seg.set('idens', resultMap['ensemble_id']) - seg.set('iddec', resultMap['decoupage_id']) + seg.set('iddec', resultMap['cutting_id']) seg.set('idseg', resultMap['element_id']) seg.set('idvue', "") seg.set('crit', "") diff -r 6fe56c8896e3 -r 30f0bf1d3f58 web/ldtplatform/config.py.tmpl --- a/web/ldtplatform/config.py.tmpl Tue Jul 31 17:44:44 2012 +0200 +++ b/web/ldtplatform/config.py.tmpl Tue Jul 31 17:45:14 2012 +0200 @@ -102,8 +102,7 @@ 'default': { #for elasticsearch use ldt.indexation.backends.elasticsearch_backend.ElasticsearchSearchEngine 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine', + #'URL': 'http://127.0.0.1:9200/', + #'INDEX_NAME': 'ldt', }, } - - -