Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
physical
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpha
physical
Commits
7242a64e
Commit
7242a64e
authored
Apr 08, 2019
by
lixiaofang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
del logging
parent
72be759b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
11 deletions
+0
-11
group.py
search/utils/group.py
+0
-3
group.py
search/views/group.py
+0
-8
No files found.
search/utils/group.py
View file @
7242a64e
...
@@ -103,12 +103,9 @@ class GroupUtils(object):
...
@@ -103,12 +103,9 @@ class GroupUtils(object):
if
len
(
result_dict
[
"hits"
])
>
0
:
if
len
(
result_dict
[
"hits"
])
>
0
:
topic_ids_list
=
[
item
[
"_source"
][
"id"
]
for
item
in
result_dict
[
"hits"
]]
topic_ids_list
=
[
item
[
"_source"
][
"id"
]
for
item
in
result_dict
[
"hits"
]]
logging
.
info
(
"get topic_ids_list:
%
s"
%
topic_ids_list
)
if
len
(
topic_ids_list
)
>
5
:
if
len
(
topic_ids_list
)
>
5
:
pictorial_del_ids_list
.
append
(
id
)
pictorial_del_ids_list
.
append
(
id
)
logging
.
info
(
"get---all pictorial_id:
%
s"
%
pictorial_del_ids_list
)
return
pictorial_del_ids_list
[
offset
:(
offset
+
size
)]
return
pictorial_del_ids_list
[
offset
:(
offset
+
size
)]
else
:
else
:
...
...
search/views/group.py
View file @
7242a64e
...
@@ -53,16 +53,12 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
...
@@ -53,16 +53,12 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
if
sort_type
==
GroupSortTypes
.
HOT_RECOMMEND
:
if
sort_type
==
GroupSortTypes
.
HOT_RECOMMEND
:
pictorial_ids_list
=
GroupUtils
.
get_hot_pictorial_recommend_result_list
(
offset
,
size
,
es_cli_obj
)
pictorial_ids_list
=
GroupUtils
.
get_hot_pictorial_recommend_result_list
(
offset
,
size
,
es_cli_obj
)
logging
.
info
(
"get---pictorial_ids_list:
%
s"
%
pictorial_ids_list
)
return
{
"pictorial_recommend_ids"
:
pictorial_ids_list
}
return
{
"pictorial_recommend_ids"
:
pictorial_ids_list
}
elif
sort_type
==
GroupSortTypes
.
ATTENTION_RECOMMEND
:
elif
sort_type
==
GroupSortTypes
.
ATTENTION_RECOMMEND
:
attention_pictorial_list
=
GroupUtils
.
get_user_attention_pictorial_list
(
user_id
,
offset
=
0
,
size
=
1
,
attention_pictorial_list
=
GroupUtils
.
get_user_attention_pictorial_list
(
user_id
,
offset
=
0
,
size
=
1
,
es_cli_obj
=
es_cli_obj
)
es_cli_obj
=
es_cli_obj
)
if
len
(
attention_pictorial_list
)
==
0
:
if
len
(
attention_pictorial_list
)
==
0
:
logging
.
info
(
"get attention_pictorial_list:
%
s"
%
attention_pictorial_list
)
return
{
"pictorial_recommend_ids"
:
[]}
return
{
"pictorial_recommend_ids"
:
[]}
else
:
else
:
...
@@ -77,9 +73,6 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
...
@@ -77,9 +73,6 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
for
item
in
sorted_attention_pictorial_list
:
for
item
in
sorted_attention_pictorial_list
:
if
item
[
"pictorial_id"
]
not
in
pictorial_recommend_ids_list
:
if
item
[
"pictorial_id"
]
not
in
pictorial_recommend_ids_list
:
pictorial_recommend_ids_list
.
append
(
item
[
"pictorial_id"
])
pictorial_recommend_ids_list
.
append
(
item
[
"pictorial_id"
])
logging
.
info
(
"get pictorial_recommend_ids:
%
s"
%
pictorial_recommend_ids_list
[
offset
:(
offset
+
size
)])
return
{
"pictorial_recommend_ids"
:
pictorial_recommend_ids_list
[
offset
:(
offset
+
size
)]}
return
{
"pictorial_recommend_ids"
:
pictorial_recommend_ids_list
[
offset
:(
offset
+
size
)]}
except
:
except
:
...
@@ -112,7 +105,6 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
...
@@ -112,7 +105,6 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
"includes"
:
[
"id"
,
"pictorial_id"
,
"tag_list"
]
"includes"
:
[
"id"
,
"pictorial_id"
,
"tag_list"
]
}
}
result_dict
=
ESPerform
.
get_search_results
(
es_cli_obj
,
"topic"
,
q
,
offset
,
size
)
result_dict
=
ESPerform
.
get_search_results
(
es_cli_obj
,
"topic"
,
q
,
offset
,
size
)
logging
.
info
(
"get result_dict:
%
s"
%
result_dict
)
pict_pictorial_ids_list
=
[]
pict_pictorial_ids_list
=
[]
topic_tag_list
=
[]
topic_tag_list
=
[]
pictorial_id_list
=
[]
pictorial_id_list
=
[]
...
...
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