Merge with 2446fff2bea0dd8f373aa7a947c22d866454c4a8
authorymh <ymh.work@gmail.com>
Tue, 31 Jul 2012 17:45:14 +0200
changeset 724 30f0bf1d3f58
parent 723 6fe56c8896e3 (current diff)
parent 722 2446fff2bea0 (diff)
child 725 4f4005df9a97
Merge with 2446fff2bea0dd8f373aa7a947c22d866454c4a8
--- 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)
--- 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', "")
--- 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',
     },
 }
-
-
-