Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
87bb4229
Commit
87bb4229
authored
May 28, 2015
by
Mathieu Rodic
Committed by
Elias
May 31, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BUGFIX] 500 error when filtering by ngrams in advanced chart
https://forge.iscpif.fr/issues/1503
parent
be1301dc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
api.py
gargantext_web/api.py
+8
-3
No files found.
gargantext_web/api.py
View file @
87bb4229
...
...
@@ -3,6 +3,11 @@ from django.core.exceptions import PermissionDenied, SuspiciousOperation
from
django.core.exceptions
import
ValidationError
from
django.core.urlresolvers
import
reverse
from
django.db.models
import
Avg
,
Max
,
Min
,
Count
,
Sum
# from node.models import Language, ResourceType, Resource
# from node.models import Node, NodeType, Node_Resource, Project, Corpus
from
sqlalchemy
import
text
,
distinct
,
or_
from
sqlalchemy.sql
import
func
from
sqlalchemy.orm
import
aliased
...
...
@@ -64,7 +69,7 @@ _operators = {
">"
:
lambda
field
,
value
:
(
field
>
value
),
"<="
:
lambda
field
,
value
:
(
field
<=
value
),
">="
:
lambda
field
,
value
:
(
field
>=
value
),
"in"
:
lambda
field
,
value
:
(
field
.
in_
(
value
)),
"in"
:
lambda
field
,
value
:
(
or_
(
*
tuple
(
field
==
x
for
x
in
value
)
)),
"contains"
:
lambda
field
,
value
:
(
field
.
contains
(
value
)),
"startswith"
:
lambda
field
,
value
:
(
field
.
startswith
(
value
)),
}
...
...
@@ -481,10 +486,10 @@ class NodesChildrenQueries(APIView):
query
=
query
.
filter
(
Node
.
id
.
in_
(
session
.
query
(
Node_Ngram
.
node_id
)
.
filter
(
Node_Ngram
.
ngram_id
==
Ngram
.
id
)
.
join
(
Ngram
,
Ngram
.
id
==
Node_Ngram
.
ngram_
id
)
.
filter
(
operator
(
getattr
(
Ngram
,
field
[
1
]),
value
map
(
lambda
x
:
x
.
replace
(
'-'
,
' '
),
value
)
))
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment