Skip to content

C
cybertron
Commit 1f2aed04 authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent 899dc6b9
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 43 deletions
.idea/workspace.xml
View file @ 1f2aed04
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7b835479-ee84-40d6-9b97-0e9285d92119" name="Default Changelist" comment=""> <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>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
...@@ -28,13 +25,13 @@ ...@@ -28,13 +25,13 @@
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="dummy" value="1" /> <entry key="dummy" value="1" />
<entry key="py" value="1518" /> <entry key="py" value="1532" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="1518" /> <entry key="Python" value="1532" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
...@@ -71,8 +68,8 @@ ...@@ -71,8 +68,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index_contrast/pictorial.py"> <entry file="file://$PROJECT_DIR$/index_contrast/pictorial.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282"> <state relative-caret-position="259">
<caret line="194" column="52" selection-start-line="194" selection-start-column="52" selection-end-line="194" selection-end-column="52" /> <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> <folding>
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1648#2194#0" /> <element signature="e#1648#2194#0" />
...@@ -90,8 +87,8 @@ ...@@ -90,8 +87,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index_contrast/user.py"> <entry file="file://$PROJECT_DIR$/index_contrast/user.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1015"> <state relative-caret-position="167">
<caret line="188" column="8" selection-start-line="188" selection-start-column="8" selection-end-line="188" selection-end-column="8" /> <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> <folding>
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1676#2222#0" /> <element signature="e#1676#2222#0" />
...@@ -108,18 +105,15 @@ ...@@ -108,18 +105,15 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index_contrast/tag.py"> <entry file="file://$PROJECT_DIR$/index_contrast/tag.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7"> <state relative-caret-position="304">
<caret line="300" column="36" lean-forward="true" selection-start-line="300" selection-start-column="36" selection-end-line="300" selection-end-column="36" /> <caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
<folding> <folding>
<element signature="e#46#55#0" expanded="true" /> <element signature="e#46#55#0" expanded="true" />
<element signature="e#349#16802#0" />
<element signature="e#495#925#0" /> <element signature="e#495#925#0" />
<element signature="e#1023#1547#0" />
<element signature="e#1613#2159#0" /> <element signature="e#1613#2159#0" />
<element signature="e#2237#3118#0" /> <element signature="e#2237#3118#0" />
<element signature="e#3240#3989#0" /> <element signature="e#3240#3989#0" />
<element signature="e#4094#4595#0" /> <element signature="e#4094#4595#0" />
<element signature="e#4729#6063#0" />
<element signature="e#6360#8356#0" /> <element signature="e#6360#8356#0" />
<element signature="e#8453#9038#0" /> <element signature="e#8453#9038#0" />
<element signature="e#9108#10417#0" /> <element signature="e#9108#10417#0" />
...@@ -141,6 +135,11 @@ ...@@ -141,6 +135,11 @@
<findStrings> <findStrings>
<find>/da</find> <find>/da</find>
<find>existing</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> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -159,8 +158,8 @@ ...@@ -159,8 +158,8 @@
<option value="$PROJECT_DIR$/reply_comment3.py" /> <option value="$PROJECT_DIR$/reply_comment3.py" />
<option value="$PROJECT_DIR$/reply_comment1.py" /> <option value="$PROJECT_DIR$/reply_comment1.py" />
<option value="$PROJECT_DIR$/answer_reply1.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/user.py" />
<option value="$PROJECT_DIR$/index_contrast/tag.py" />
<option value="$PROJECT_DIR$/index_contrast/pictorial.py" /> <option value="$PROJECT_DIR$/index_contrast/pictorial.py" />
</list> </list>
</option> </option>
...@@ -321,14 +320,19 @@ ...@@ -321,14 +320,19 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/index_contrast/tag.py</url> <url>file://$PROJECT_DIR$/index_contrast/tag.py</url>
<line>168</line> <line>170</line>
<option name="timeStamp" value="10" /> <option name="timeStamp" value="10" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/index_contrast/tag.py</url> <url>file://$PROJECT_DIR$/index_contrast/tag.py</url>
<line>20</line> <line>21</line>
<option name="timeStamp" value="12" /> <option name="timeStamp" value="12" />
</line-breakpoint> </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>
<breakpoints-dialog> <breakpoints-dialog>
<breakpoints-dialog /> <breakpoints-dialog />
...@@ -558,20 +562,33 @@ ...@@ -558,20 +562,33 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/index_contrast/tag.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7"> <state relative-caret-position="304">
<caret line="300" column="36" lean-forward="true" selection-start-line="300" selection-start-column="36" selection-end-line="300" selection-end-column="36" /> <caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
<folding> <folding>
<element signature="e#46#55#0" expanded="true" /> <element signature="e#46#55#0" expanded="true" />
<element signature="e#349#16802#0" />
<element signature="e#495#925#0" /> <element signature="e#495#925#0" />
<element signature="e#1023#1547#0" />
<element signature="e#1613#2159#0" /> <element signature="e#1613#2159#0" />
<element signature="e#2237#3118#0" /> <element signature="e#2237#3118#0" />
<element signature="e#3240#3989#0" /> <element signature="e#3240#3989#0" />
<element signature="e#4094#4595#0" /> <element signature="e#4094#4595#0" />
<element signature="e#4729#6063#0" />
<element signature="e#6360#8356#0" /> <element signature="e#6360#8356#0" />
<element signature="e#8453#9038#0" /> <element signature="e#8453#9038#0" />
<element signature="e#9108#10417#0" /> <element signature="e#9108#10417#0" />
...@@ -579,26 +596,10 @@ ...@@ -579,26 +596,10 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/index_contrast/pictorial.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282"> <state relative-caret-position="259">
<caret line="194" column="52" selection-start-line="194" selection-start-column="52" selection-end-line="194" selection-end-column="52" /> <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> <folding>
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1648#2194#0" /> <element signature="e#1648#2194#0" />
......
index_contrast/pictorial.py
View file @ 1f2aed04
...@@ -192,7 +192,7 @@ class ESPerform(object): ...@@ -192,7 +192,7 @@ class ESPerform(object):
try: try:
assert (es_cli is not None) assert (es_cli is not None)
official_index_name = sub_index_name official_index_name = sub_index_name
if sub_index_name != "mv-alpha-pictorial-test-1907129011": if sub_index_name != "mv-alpha-pictorial-test-190711901":
official_index_name = cls.get_official_index_name(sub_index_name, "read") official_index_name = cls.get_official_index_name(sub_index_name, "read")
index_exists = es_cli.indices.exists(official_index_name) index_exists = es_cli.indices.exists(official_index_name)
...@@ -314,7 +314,7 @@ for old_item in result_dict["hits"]: ...@@ -314,7 +314,7 @@ for old_item in result_dict["hits"]:
"is_online": True "is_online": True
} }
} }
result_dict_test = ESPerform.get_search_results(es_cli_obj, "mv-alpha-pictorial-test-190716901", q, 0, 1) result_dict_test = ESPerform.get_search_results(es_cli_obj, "mv-alpha-pictorial-test-190711901", q, 0, 1)
for new_item in result_dict_test["hits"]: for new_item in result_dict_test["hits"]:
new_source = new_item["_source"] new_source = new_item["_source"]
new_id = new_source["id"] new_id = new_source["id"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment