Commit 1163dc43 authored by lixiaofang's avatar lixiaofang

add

parent 41afc9ec
<?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/tag.py" beforeDir="false" afterPath="$PROJECT_DIR$/index_contrast/tag.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" />
...@@ -27,13 +25,13 @@ ...@@ -27,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="1401" /> <entry key="py" value="1427" />
</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="1401" /> <entry key="Python" value="1427" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
...@@ -60,11 +58,10 @@ ...@@ -60,11 +58,10 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<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="456"> <state relative-caret-position="61">
<caret line="179" column="44" selection-start-line="179" selection-start-column="44" selection-end-line="179" selection-end-column="44" /> <caret line="151" column="48" selection-start-line="151" selection-start-column="48" selection-end-line="151" selection-end-column="48" />
<folding> <folding>
<element signature="e#46#55#0" expanded="true" /> <element signature="e#46#55#0" expanded="true" />
<element signature="e#6883#8757#0" />
<element signature="e#8854#9452#0" /> <element signature="e#8854#9452#0" />
<element signature="e#9522#10831#0" /> <element signature="e#9522#10831#0" />
<element signature="e#10934#13999#0" /> <element signature="e#10934#13999#0" />
...@@ -175,11 +172,6 @@ ...@@ -175,11 +172,6 @@
<item name="cybertron" type="b2602c69:ProjectViewProjectNode" /> <item name="cybertron" type="b2602c69:ProjectViewProjectNode" />
<item name="cybertron" type="462c0819:PsiDirectoryNode" /> <item name="cybertron" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="cybertron" type="b2602c69:ProjectViewProjectNode" />
<item name="cybertron" type="462c0819:PsiDirectoryNode" />
<item name="index_contrast" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -242,7 +234,6 @@ ...@@ -242,7 +234,6 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="720" extended-state="6" /> <frame x="0" y="23" width="1280" height="720" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Structure" order="0" sideWeight="0.21188119" side_tool="true" weight="0.19112115" /> <window_info id="Structure" order="0" sideWeight="0.21188119" side_tool="true" weight="0.19112115" />
<window_info id="Favorites" order="1" side_tool="true" /> <window_info id="Favorites" order="1" side_tool="true" />
...@@ -256,7 +247,7 @@ ...@@ -256,7 +247,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.49960285" visible="true" weight="0.0" /> <window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.49960285" visible="true" weight="0.21652892" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50039715" side_tool="true" weight="0.32890365" /> <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50039715" side_tool="true" weight="0.32890365" />
<window_info anchor="bottom" id="Python Console" order="10" /> <window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="DB Execution Console" order="11" /> <window_info anchor="bottom" id="DB Execution Console" order="11" />
...@@ -313,12 +304,12 @@ ...@@ -313,12 +304,12 @@
</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>170</line> <line>169</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>22</line> <line>21</line>
<option name="timeStamp" value="12" /> <option name="timeStamp" value="12" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
...@@ -519,11 +510,10 @@ ...@@ -519,11 +510,10 @@
</entry> </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="456"> <state relative-caret-position="61">
<caret line="179" column="44" selection-start-line="179" selection-start-column="44" selection-end-line="179" selection-end-column="44" /> <caret line="151" column="48" selection-start-line="151" selection-start-column="48" selection-end-line="151" selection-end-column="48" />
<folding> <folding>
<element signature="e#46#55#0" expanded="true" /> <element signature="e#46#55#0" expanded="true" />
<element signature="e#6883#8757#0" />
<element signature="e#8854#9452#0" /> <element signature="e#8854#9452#0" />
<element signature="e#9522#10831#0" /> <element signature="e#9522#10831#0" />
<element signature="e#10934#13999#0" /> <element signature="e#10934#13999#0" />
......
...@@ -470,9 +470,11 @@ for old_item in result_dict["hits"]: ...@@ -470,9 +470,11 @@ for old_item in result_dict["hits"]:
es_cli_obj = ESPerform.get_cli() es_cli_obj = ESPerform.get_cli()
q = {} q = {}
q["query"] = { q["query"] = {
"term": { "bool": {
"id": old_id, "must": [
"is_online": True {"term": {"id": old_id}},
{"term": {"is_online": True}}
]
} }
} }
result_dict_test = ESPerform.get_search_results(es_cli_obj, "mv-alpha-tag-test-190711901", q, 0, 1) result_dict_test = ESPerform.get_search_results(es_cli_obj, "mv-alpha-tag-test-190711901", q, 0, 1)
......
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