Skip to content

Commit

Permalink
Fixes bug 877175 - Fixed a missing uppercase letter in plugin related…
Browse files Browse the repository at this point in the history
… fields.
  • Loading branch information
adngdb committed Jun 4, 2013
1 parent 7ed5d9f commit fe06aaa
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion socorro/external/elasticsearch/base.py
Expand Up @@ -188,7 +188,7 @@ def build_query_from_params(params, config):
if params['plugin_terms']:
# change plugin field names to match what is in elasticsearch
params['plugin_in'] = [
'plugin%s' % x.capitalize()
'Plugin%s' % x.capitalize()
for x in params['plugin_in']
]

Expand Down
6 changes: 3 additions & 3 deletions socorro/external/elasticsearch/search.py
Expand Up @@ -124,9 +124,9 @@ def search_for_signatures(self, params, es_result, query):
plugin_fields = []
if params['report_process'] == 'plugin':
plugin_fields = [
'pluginFilename',
'pluginName',
'pluginVersion',
'PluginFilename',
'PluginName',
'PluginVersion',
]

facets = self.get_count_facets(
Expand Down
12 changes: 6 additions & 6 deletions socorro/external/elasticsearch/socorro_index_settings.json
Expand Up @@ -59,10 +59,10 @@
}
}
},
"pluginFilename": {
"PluginFilename": {
"type": "multi_field",
"fields": {
"pluginFilename": {
"PluginFilename": {
"type": "string",
"index": "analyzed"
},
Expand All @@ -72,10 +72,10 @@
}
}
},
"pluginName": {
"PluginName": {
"type": "multi_field",
"fields": {
"pluginName": {
"PluginName": {
"type": "string",
"index": "analyzed"
},
Expand All @@ -85,10 +85,10 @@
}
}
},
"pluginVersion": {
"PluginVersion": {
"type": "multi_field",
"fields": {
"pluginVersion": {
"PluginVersion": {
"type": "string",
"index": "analyzed"
},
Expand Down
12 changes: 6 additions & 6 deletions socorro/unittest/external/elasticsearch/test_search.py
Expand Up @@ -262,9 +262,9 @@ def setUp(self):
uuid=11,
product='PluginSoft',
process_type='plugin',
pluginFilename='carly.dll',
pluginName='Hey I just met you',
pluginVersion='1.2',
PluginFilename='carly.dll',
PluginName='Hey I just met you',
PluginVersion='1.2',
)
)

Expand All @@ -274,9 +274,9 @@ def setUp(self):
uuid=12,
product='PluginSoft',
process_type='plugin',
pluginFilename='hey.dll',
pluginName='Hey Plugin',
pluginVersion='10.7.0.2a',
PluginFilename='hey.dll',
PluginName='Hey Plugin',
PluginVersion='10.7.0.2a',
)
)

Expand Down

0 comments on commit fe06aaa

Please sign in to comment.