highlight matches in clips

This commit is contained in:
rolux 2012-02-01 12:01:39 +00:00
commit daaabba071
12 changed files with 59 additions and 39 deletions

View file

@ -642,7 +642,7 @@
"icons": "posters",
"infoIconSize": 256,
"item": "",
"itemFind": {"conditions": [], "operator": "&"},
"itemFind": "",
"itemSort": [{"key": "position", "operator": "+"}],
"itemView": "info",
"listColumns": ["title", "director", "country", "year", "language", "runtime", "genre"],

View file

@ -124,7 +124,7 @@ class Annotation(models.Model):
layer = self.get_layer()
if self.value:
self.value = utils.cleanup_value(self.value, layer['type'])
self.findvalue = ox.stripTags(self.value).strip()
self.findvalue = ox.decodeHtml(ox.stripTags(self.value).strip())
sortvalue = sort_string(self.findvalue)
if sortvalue:
self.sortvalue = sortvalue[:1000]

View file

@ -552,7 +552,7 @@ class Item(models.Model):
if isinstance(value, bool):
value = value and 'true' or 'false'
if isinstance(value, basestring):
value = value.strip()
value = ox.decodeHtml(ox.stripTags(value.strip()))
f.value = value
f.save()
else:

View file

@ -53,7 +53,7 @@
/*
clipLayers is the ordered list of public layers that will appear as the
text of clips. Excluding a layer from this list means it will not be
included in find annotations.
included in find annotations. // FIXME: the last bit is not implemented.
*/
"clipLayers": ["transcripts", "keywords", "places", "events", "descriptions"],
// fixme: either this, or filter: true in itemKeys, but not both
@ -221,7 +221,7 @@
},
{
"id": "annotations",
"title": "Annotation",
"title": "Annotations",
"type": "string",
"find": true
},