--- a/src/ldt/ldt/__init__.py Fri May 06 01:01:59 2011 +0200
+++ b/src/ldt/ldt/__init__.py Fri May 06 01:37:04 2011 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 9, 0, "final", 0)
+VERSION = (0, 10, 0, "final", 0)
def get_version():
--- a/src/ldt/ldt/indexation/__init__.py Fri May 06 01:01:59 2011 +0200
+++ b/src/ldt/ldt/indexation/__init__.py Fri May 06 01:37:04 2011 +0200
@@ -18,7 +18,7 @@
lucene.getVMEnv().attachCurrentThread()
return lucene.IndexSearcher(STORE)
-def get_query_parser():
+def get_query_parser(field):
queryParser = lucene.QueryParser(lucene.Version.LUCENE_30, field, lucene.FrenchAnalyzer(lucene.Version.LUCENE_30))
queryParser.setDefaultOperator(lucene.QueryParser.Operator.AND)
return queryParser
--- a/src/ldt/ldt/ldt_utils/contentindexer.py Fri May 06 01:01:59 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/contentindexer.py Fri May 06 01:37:04 2011 +0200
@@ -115,7 +115,8 @@
author=author,
start_ts=start_ts,
date=date_str,
- project_obj=project)
+ project_obj=project,
+ project_id=ldt_id)
seg.save()
self.writer.addDocument(doc)
--- a/src/ldt/ldt/ldt_utils/models.py Fri May 06 01:01:59 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/models.py Fri May 06 01:37:04 2011 +0200
@@ -335,7 +335,7 @@
@staticmethod
def create_project(user, title, contents):
- owner = Owner.objects.get(user=user)
+ owner = Owner.objects.get(user=user) #@UndefinedVariable
project = Project(title=title, owner=owner)
project.ldt_id = str(uuid.uuid1()) #@UndefinedVariable
project.created_by = user.username
@@ -348,7 +348,7 @@
return create_ldt(project, user)
def copy_project(self, user, title):
- owner = Owner.objects.get(user=user)
+ owner = Owner.objects.get(user=user) #@UndefinedVariable
project = Project(title=title, owner=owner)
project = copy_ldt(self, project, user)
project.save()
--- a/src/ldt/ldt/ldt_utils/utils.py Fri May 06 01:01:59 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/utils.py Fri May 06 01:37:04 2011 +0200
@@ -38,14 +38,14 @@
def query(self, field, query):
indexSearcher = get_searcher()
- queryParser = get_query_parser()
+ queryParser = get_query_parser(field)
queryObj = queryParser.parse(query)
hits = indexSearcher.search(queryObj, settings.LDT_MAX_SEARCH_NUMBER)
res = []
for hit in hits.scoreDocs:
doc = indexSearcher.doc(hit.doc)
- res.append({"iri_id":doc.get("iri_id"), "ensemble_id":doc.get("ensemble_id"), "decoupage_id":doc.get("decoupage_id"), "element_id":doc.get("element_id")})
+ res.append({"iri_id":doc.get("iri_id"), "ensemble_id":doc.get("ensemble_id"), "decoupage_id":doc.get("decoupage_id"), "element_id":doc.get("element_id"), "project_id":doc.get("project_id")})
indexSearcher.close()
return res