Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cybertron
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
cybertron
Commits
1f2aed04
Commit
1f2aed04
authored
Jul 16, 2019
by
lixiaofang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
899dc6b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
43 deletions
+44
-43
workspace.xml
.idea/workspace.xml
+42
-41
pictorial.py
index_contrast/pictorial.py
+2
-2
No files found.
.idea/workspace.xml
View file @
1f2aed04
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"7b835479-ee84-40d6-9b97-0e9285d92119"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/index_contrast/pictorial.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/index_contrast/pictorial.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/index_contrast/user.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/index_contrast/user.py"
afterDir=
"false"
/>
</list>
<list
default=
"true"
id=
"7b835479-ee84-40d6-9b97-0e9285d92119"
name=
"Default Changelist"
comment=
""
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
<option
name=
"HIGHLIGHT_NON_ACTIVE_CHANGELIST"
value=
"false"
/>
...
...
@@ -28,13 +25,13 @@
<usages-collector
id=
"statistics.file.extensions.edit"
>
<counts>
<entry
key=
"dummy"
value=
"1"
/>
<entry
key=
"py"
value=
"15
18
"
/>
<entry
key=
"py"
value=
"15
32
"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.types.edit"
>
<counts>
<entry
key=
"PLAIN_TEXT"
value=
"1"
/>
<entry
key=
"Python"
value=
"15
18
"
/>
<entry
key=
"Python"
value=
"15
32
"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.lifecycle.project"
>
...
...
@@ -71,8 +68,8 @@
<file
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/pictorial.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
82
"
>
<caret
line=
"
194"
column=
"52"
selection-start-line=
"194"
selection-start-column=
"52"
selection-end-line=
"194"
selection-end-column=
"52
"
/>
<state
relative-caret-position=
"2
59
"
>
<caret
line=
"
316"
column=
"98"
lean-forward=
"true"
selection-start-line=
"316"
selection-start-column=
"65"
selection-end-line=
"316"
selection-end-column=
"98
"
/>
<folding>
<element
signature=
"e#530#960#0"
/>
<element
signature=
"e#1648#2194#0"
/>
...
...
@@ -90,8 +87,8 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/user.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-1015
"
>
<caret
line=
"1
88"
column=
"8"
selection-start-line=
"188"
selection-start-column=
"8"
selection-end-line=
"188"
selection-end-column=
"
8"
/>
<state
relative-caret-position=
"
167
"
>
<caret
line=
"1
93"
column=
"48"
lean-forward=
"true"
selection-start-line=
"193"
selection-start-column=
"48"
selection-end-line=
"193"
selection-end-column=
"4
8"
/>
<folding>
<element
signature=
"e#530#960#0"
/>
<element
signature=
"e#1676#2222#0"
/>
...
...
@@ -108,18 +105,15 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/tag.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-7
"
>
<caret
line=
"
300"
column=
"36"
lean-forward=
"true"
selection-start-line=
"300"
selection-start-column=
"36"
selection-end-line=
"300"
selection-end-column=
"36
"
/>
<state
relative-caret-position=
"
304
"
>
<caret
line=
"
49"
column=
"29"
selection-start-line=
"49"
selection-start-column=
"29"
selection-end-line=
"49"
selection-end-column=
"29
"
/>
<folding>
<element
signature=
"e#46#55#0"
expanded=
"true"
/>
<element
signature=
"e#349#16802#0"
/>
<element
signature=
"e#495#925#0"
/>
<element
signature=
"e#1023#1547#0"
/>
<element
signature=
"e#1613#2159#0"
/>
<element
signature=
"e#2237#3118#0"
/>
<element
signature=
"e#3240#3989#0"
/>
<element
signature=
"e#4094#4595#0"
/>
<element
signature=
"e#4729#6063#0"
/>
<element
signature=
"e#6360#8356#0"
/>
<element
signature=
"e#8453#9038#0"
/>
<element
signature=
"e#9108#10417#0"
/>
...
...
@@ -141,6 +135,11 @@
<findStrings>
<find>
/da
</find>
<find>
existing
</find>
<find>
mv-alpha-pictorial-test-190716901
</find>
<find>
mv-alpha-toipc-test-190712901
</find>
<find>
mv-alpha-user-test-190711901
</find>
<find>
mv-alpha-tag-test-190711901
</find>
<find>
mv-alpha-pictorial-test-1907129011
</find>
</findStrings>
</component>
<component
name=
"Git.Settings"
>
...
...
@@ -159,8 +158,8 @@
<option
value=
"$PROJECT_DIR$/reply_comment3.py"
/>
<option
value=
"$PROJECT_DIR$/reply_comment1.py"
/>
<option
value=
"$PROJECT_DIR$/answer_reply1.py"
/>
<option
value=
"$PROJECT_DIR$/index_contrast/tag.py"
/>
<option
value=
"$PROJECT_DIR$/index_contrast/user.py"
/>
<option
value=
"$PROJECT_DIR$/index_contrast/tag.py"
/>
<option
value=
"$PROJECT_DIR$/index_contrast/pictorial.py"
/>
</list>
</option>
...
...
@@ -321,14 +320,19 @@
</line-breakpoint>
<line-breakpoint
enabled=
"true"
suspend=
"THREAD"
type=
"python-line"
>
<url>
file://$PROJECT_DIR$/index_contrast/tag.py
</url>
<line>
1
68
</line>
<line>
1
70
</line>
<option
name=
"timeStamp"
value=
"10"
/>
</line-breakpoint>
<line-breakpoint
enabled=
"true"
suspend=
"THREAD"
type=
"python-line"
>
<url>
file://$PROJECT_DIR$/index_contrast/tag.py
</url>
<line>
2
0
</line>
<line>
2
1
</line>
<option
name=
"timeStamp"
value=
"12"
/>
</line-breakpoint>
<line-breakpoint
enabled=
"true"
suspend=
"THREAD"
type=
"python-line"
>
<url>
file://$PROJECT_DIR$/index_contrast/pictorial.py
</url>
<line>
190
</line>
<option
name=
"timeStamp"
value=
"14"
/>
</line-breakpoint>
</breakpoints>
<breakpoints-dialog>
<breakpoints-dialog
/>
...
...
@@ -558,20 +562,33 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/user.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"167"
>
<caret
line=
"193"
column=
"48"
lean-forward=
"true"
selection-start-line=
"193"
selection-start-column=
"48"
selection-end-line=
"193"
selection-end-column=
"48"
/>
<folding>
<element
signature=
"e#530#960#0"
/>
<element
signature=
"e#1676#2222#0"
/>
<element
signature=
"e#2300#3181#0"
/>
<element
signature=
"e#3303#4052#0"
/>
<element
signature=
"e#4157#4658#0"
/>
<element
signature=
"e#4792#6126#0"
/>
<element
signature=
"e#9522#10831#0"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/tag.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-7
"
>
<caret
line=
"
300"
column=
"36"
lean-forward=
"true"
selection-start-line=
"300"
selection-start-column=
"36"
selection-end-line=
"300"
selection-end-column=
"36
"
/>
<state
relative-caret-position=
"
304
"
>
<caret
line=
"
49"
column=
"29"
selection-start-line=
"49"
selection-start-column=
"29"
selection-end-line=
"49"
selection-end-column=
"29
"
/>
<folding>
<element
signature=
"e#46#55#0"
expanded=
"true"
/>
<element
signature=
"e#349#16802#0"
/>
<element
signature=
"e#495#925#0"
/>
<element
signature=
"e#1023#1547#0"
/>
<element
signature=
"e#1613#2159#0"
/>
<element
signature=
"e#2237#3118#0"
/>
<element
signature=
"e#3240#3989#0"
/>
<element
signature=
"e#4094#4595#0"
/>
<element
signature=
"e#4729#6063#0"
/>
<element
signature=
"e#6360#8356#0"
/>
<element
signature=
"e#8453#9038#0"
/>
<element
signature=
"e#9108#10417#0"
/>
...
...
@@ -579,26 +596,10 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/user.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1015"
>
<caret
line=
"188"
column=
"8"
selection-start-line=
"188"
selection-start-column=
"8"
selection-end-line=
"188"
selection-end-column=
"8"
/>
<folding>
<element
signature=
"e#530#960#0"
/>
<element
signature=
"e#1676#2222#0"
/>
<element
signature=
"e#2300#3181#0"
/>
<element
signature=
"e#3303#4052#0"
/>
<element
signature=
"e#4157#4658#0"
/>
<element
signature=
"e#4792#6126#0"
/>
<element
signature=
"e#9522#10831#0"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/index_contrast/pictorial.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
82
"
>
<caret
line=
"
194"
column=
"52"
selection-start-line=
"194"
selection-start-column=
"52"
selection-end-line=
"194"
selection-end-column=
"52
"
/>
<state
relative-caret-position=
"2
59
"
>
<caret
line=
"
316"
column=
"98"
lean-forward=
"true"
selection-start-line=
"316"
selection-start-column=
"65"
selection-end-line=
"316"
selection-end-column=
"98
"
/>
<folding>
<element
signature=
"e#530#960#0"
/>
<element
signature=
"e#1648#2194#0"
/>
...
...
index_contrast/pictorial.py
View file @
1f2aed04
...
...
@@ -192,7 +192,7 @@ class ESPerform(object):
try
:
assert
(
es_cli
is
not
None
)
official_index_name
=
sub_index_name
if
sub_index_name
!=
"mv-alpha-pictorial-test-19071
2901
1"
:
if
sub_index_name
!=
"mv-alpha-pictorial-test-19071
190
1"
:
official_index_name
=
cls
.
get_official_index_name
(
sub_index_name
,
"read"
)
index_exists
=
es_cli
.
indices
.
exists
(
official_index_name
)
...
...
@@ -314,7 +314,7 @@ for old_item in result_dict["hits"]:
"is_online"
:
True
}
}
result_dict_test
=
ESPerform
.
get_search_results
(
es_cli_obj
,
"mv-alpha-pictorial-test-19071
6
901"
,
q
,
0
,
1
)
result_dict_test
=
ESPerform
.
get_search_results
(
es_cli_obj
,
"mv-alpha-pictorial-test-19071
1
901"
,
q
,
0
,
1
)
for
new_item
in
result_dict_test
[
"hits"
]:
new_source
=
new_item
[
"_source"
]
new_id
=
new_source
[
"id"
]
...
...
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