pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/376'

Browse Source 
Conflicts:
	AUTHORS
This commit is contained in:
Ross Lawley
2013-07-10 13:50:52 +00:00
parent f34e8a0ff6 caff44c663
commit f4ea1ad517
3 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mongoengine/queryset/queryset.py
View File

@@ -1068,7 +1068,22 @@ class QuerySet(object):
"""
map_func = Code("""
function() {
emit(1, this[field] || 0);
function deepFind(obj, path) {
var paths = path.split('.')
, current = obj
, i;
for (i = 0; i < paths.length; ++i) {
if (current[paths[i]] == undefined) {
return undefined;
} else {
current = current[paths[i]];
}
}
return current;
}
emit(1, deepFind(this, field) || 0);
}
""", scope={'field': field})
@@ -1098,8 +1113,24 @@ class QuerySet(object):
"""
map_func = Code("""
function() {
if (this.hasOwnProperty(field))
emit(1, {t: this[field] || 0, c: 1});
function deepFind(obj, path) {
var paths = path.split('.')
, current = obj
, i;
for (i = 0; i < paths.length; ++i) {
if (current[paths[i]] == undefined) {
return undefined;
} else {
current = current[paths[i]];
}
}
return current;
}
val = deepFind(this, field)
if (val !== undefined)
emit(1, {t: val || 0, c: 1});
}
""", scope={'field': field})