Skip to content

Commit 36ae894

Browse files
committed
Report scope hits on summary sheet
Provides a fix for #3
1 parent 8832d09 commit 36ae894

4 files changed

Lines changed: 15 additions & 2 deletions

File tree

Java/src/main/java/com/nuix/nx/SearchModuleVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
*/
88
public class SearchModuleVersion {
99
public static String getVersion(){
10-
return "3.15.0";
10+
return "3.16.0";
1111
}
1212
}

Java/src/main/java/com/nuix/nx/controls/QueryBuilderControl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,7 @@ public void populateMenuBar(JMenuBar menuBar){
615615
logicalMenuItem = new JMenuItem(key);
616616
Class<? extends LogicalQueryCriteria> classToAdd = logicalEntries.get(key);
617617
logicalMenuItem.addActionListener(new ActionListener(){
618+
@SuppressWarnings("deprecation")
618619
@Override
619620
public void actionPerformed(ActionEvent arg0) {
620621
try {
@@ -649,6 +650,7 @@ public void actionPerformed(ActionEvent arg0) {
649650
logicalMenuItem = new JMenuItem(key);
650651
Class<? extends NegatableQueryCriteria> classToAdd = negatableCriteria.get(key);
651652
logicalMenuItem.addActionListener(new ActionListener(){
653+
@SuppressWarnings("deprecation")
652654
@Override
653655
public void actionPerformed(ActionEvent arg0) {
654656
try {
@@ -685,6 +687,7 @@ public void actionPerformed(ActionEvent arg0) {
685687
commonMenuItem = new JMenuItem(key);
686688
Class<? extends CommonQueryCriteria> classToAdd = commonEntries.get(key);
687689
commonMenuItem.addActionListener(new ActionListener(){
690+
@SuppressWarnings("deprecation")
688691
@Override
689692
public void actionPerformed(ActionEvent arg0) {
690693
try {
@@ -758,6 +761,7 @@ public void actionPerformed(ActionEvent arg0) {
758761
for(final String key : commonKeys){
759762
commonMenuItem = new JMenuItem(key);
760763
commonMenuItem.addActionListener(new ActionListener(){
764+
@SuppressWarnings("deprecation")
761765
@Override
762766
public void actionPerformed(ActionEvent arg0) {
763767
try {

Java/src/main/java/com/nuix/searchmodule/BulkSearchAnnotater.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,25 @@ public List<SearchResult> performSearching(nuix.Case nuixCase, List<SearchTermIn
100100
String categoryTermTagKey = currentCategory.getCategoryKey()+"_term_tag";
101101
for(SearchResult result : results){
102102
sequence++;
103+
103104
if(result.getHadError()) continue;
105+
104106
template.put("term", result.getTerm());
105107
String sequenceString = String.format("%04d", sequence);
106108
template.put("sequence", sequenceString);
109+
107110
String shortName = result.getShortName();
108111
if(shortName == null || shortName.isEmpty()){
109112
template.put("shortname", sequenceString);
110113
}else{
111114
template.put("shortname", shortName);
112115
}
116+
113117
String tag = template.resolveTemplate();
114118
if(tag.length() > 256){
115119
tag = tag.substring(0, 256);
116120
}
121+
117122
Collection<Item> categoryItems = getResultCategoryItems(currentCategory,result);
118123
fireProgressUpdated("Tagging Per Term, Category: "+currentCategory.getCategoryTitle(), tag, sequence, results.size());
119124
try {

Ruby/SearchModule.nuixscript/SearchModule.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,12 @@ module Dialogs
364364
end
365365

366366
#SUMMARY SHEET
367+
scope_query_string = scope_query_generator.toQuery
368+
scope_hits = $current_case.count(scope_query_string,{"defaultFields"=>fields.join(", ")})
369+
367370
sheet = xlsx.get_sheet("Summary")
368371
sheet << ["Scope Query",""] #We will populate this after column sizing so it can overflow
372+
sheet << ["Scope Query Hits",scope_hits]
369373
sheet << ["Default Fields",fields.join(", ")]
370374
sheet << ["Terms",terms.size]
371375

@@ -398,7 +402,7 @@ module Dialogs
398402

399403
sheet.style_cells(nil,0,headers_style)
400404
sheet.auto_fit_columns
401-
sheet[0,1] = scope_query_generator.toQuery #Write scope query after other data is autosized to
405+
sheet[0,1] = scope_query_string #Write scope query after other data is autosized to
402406
sheet.set_landscape
403407
sheet.set_print_gridlines(true)
404408

0 commit comments

Comments
 (0)