modify SearchedResult

madneal · Nov 18, 2017 · 1d3e5ae · 1d3e5ae
1 parent ce8a413
commit 1d3e5ae
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 39 deletions.
diff --git a/search/src/main/java/search/SearchUtil.java b/search/src/main/java/search/SearchUtil.java
@@ -7,11 +7,9 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.*;
 import org.apache.lucene.search.highlight.*;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
@@ -38,8 +36,13 @@ public static TopDocs getTopDocs(IndexSearcher searcher, Query query, int num) t
     public static Query buildQuery(String searchText, String searchField) {
         Query query = null;
         try {
-            QueryParser qp = new QueryParser(searchField, analyzer);
-            query = qp.parse(searchText);
+            if (searchField.equals(LuceneConstants.CONTENT)) {
+                QueryParser qp = new QueryParser(searchField, analyzer);
+                query = qp.parse(searchText);
+            } else {
+                Term term = new Term(LuceneConstants.PATH, searchText);
+                query = new TermQuery(term);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -77,17 +80,12 @@ private static List<String> getContextListByDocumentList(List<Document> document
         return contextList;
     }
 
-    private static List<SearchedResult> getSearchedResultsByTopDocs(TopDocs topDocs) {
-        List<SearchedResult> searchedResults = new ArrayList<>();
-        return searchedResults;
-    }
-
     public static List<SearchedResult> executeSearch(String searchText, String searchField) {
         List<SearchedResult> searchResults = new ArrayList<>();
         try {
             Query query = buildQuery(searchText, searchField);
             searcher = getSearcher();
-            TopDocs topDocs = getTopDocs(searcher, query, 10);
+            TopDocs topDocs = getTopDocs(searcher, query, 100);
             List<Document> documentList = getDocumentListByScoreDocs(topDocs.scoreDocs);
             List<String> contextList = getContextListByDocumentList(documentList, query, searchField);
             for (int i = 0; i < documentList.size(); i++) {

diff --git a/search/src/main/java/search/SearchedResult.java b/search/src/main/java/search/SearchedResult.java
@@ -1,7 +1,5 @@
 package search;
 
-import javafx.scene.control.Hyperlink;
-
 public class SearchedResult {
 
     private String filepath;
@@ -10,8 +8,6 @@ public class SearchedResult {
 
     private String context;
 
-    private Hyperlink hyperlink;
-
     public String getFilepath() {
         return filepath;
     }
@@ -35,12 +31,5 @@ public String getContext() {
     public void setContext(String context) {
         this.context = context;
     }
-
-    public Hyperlink getHyperlink() {
-        return hyperlink;
-    }
-
-    public void setHyperlink(Hyperlink hyperlink) {
-        this.hyperlink = hyperlink;
-    }
+
 }
diff --git a/search/target/classes/search/SearchUtil.class b/search/target/classes/search/SearchUtil.class
diff --git a/ui/src/main/java/client/ClientWindow.java b/ui/src/main/java/client/ClientWindow.java
@@ -40,7 +40,7 @@ public void initRootLayout() {
             Scene scene = new Scene(rootLayout);
             primaryStage.setScene(scene);
             primaryStage.setMaximized(true);
-//            primaryStage.show();
+            primaryStage.show();
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -52,8 +52,6 @@ public void showMainTab() {
             loader.setLocation(getURL(CommonConstants.SETTING_PATH));
             AnchorPane settingView = (AnchorPane) loader.load();
             rootLayout.setCenter(settingView);
-            primaryStage.show();
-//
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/ui/src/main/java/controller/Controller.java b/ui/src/main/java/controller/Controller.java
@@ -36,9 +36,6 @@ public class Controller implements Initializable {
     @FXML
     private TableView tview;
 
-    @FXML
-    private Button indexBtn;
-
     @FXML
     private ComboBox comboType;
 
@@ -51,13 +48,15 @@ public class Controller implements Initializable {
     @FXML
     private TableColumn<SearchedResult, String> contextCol;
 
+    private String searchField = LuceneConstants.CONTENT;
+
     String searchText = "";
 
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         comboType.getItems().addAll(
                     "content",
-                    "filename"
+                    "path"
             );
     }
 
@@ -88,14 +87,21 @@ private void executeIndex() {
         ConfigController.writeConfigToYaml(configSetting);
     }
 
+    // add listener to the searchType change
+    public void getSearchTypeChange(ActionEvent e) {
+        if (!comboType.getValue().equals(searchField)) {
+            searchField = comboType.getValue().toString();
+        }
+    }
+
     public void getSearchTextChanged(InputMethodEvent event) {
         Platform.isSupported(ConditionalFeature.INPUT_METHOD);
         if (!event.getCommitted().isEmpty()) {
             searchText += event.getCommitted();
             searchTextId.setText(searchText);
             searchTextId.end();
             System.out.println(searchText);
-            List<SearchedResult> searchedResults = getSearchResult(searchText);
+            List<SearchedResult> searchedResults = getSearchResult(searchText, searchField);
             showTableData(searchedResults);
         }
     }
@@ -112,15 +118,15 @@ public void getKeyTyped(KeyEvent keyEvent) {
 //        searchTextId.setText(searchText);
 //        searchTextId.end();
         if (!searchText.isEmpty()) {
-            List<SearchedResult> searchedResults = getSearchResult(searchText);
+            List<SearchedResult> searchedResults = getSearchResult(searchText, searchField);
             showTableData(searchedResults);
         } else {
             tview.setItems(null);
         }
     }
 
-    private List<SearchedResult> getSearchResult(String searchText) {
-        List<SearchedResult> searchedResults = SearchUtil.executeSearch(searchText, LuceneConstants.CONTENT);
+    private List<SearchedResult> getSearchResult(String searchText, String searchField) {
+        List<SearchedResult> searchedResults = SearchUtil.executeSearch(searchText, searchField);
         return searchedResults;
 
     }
@@ -130,11 +136,8 @@ private void showTableData(List<SearchedResult> searchedResults) {
         if (searchedResults != null && searchedResults.size() != 0) {
             for (SearchedResult searchedResult: searchedResults) {
                 SearchedResult result = new SearchedResult();
-                Hyperlink hyperlink = new Hyperlink(result.getFilepath());
                 result.setContext(searchedResult.getContext());
                 result.setFilepath(searchedResult.getFilepath());
-                result.setHyperlink(new Hyperlink(result.getFilepath()));
-                searchedResult.setHyperlink(hyperlink);
                 filepathCol.setCellFactory(new Callback<TableColumn<SearchedResult, String>, TableCell<SearchedResult, String>>() {
                     @Override
                     public TableCell<SearchedResult, String> call(TableColumn<SearchedResult, String> col) {

diff --git a/view/Setting.fxml b/view/Setting.fxml
@@ -26,7 +26,7 @@
                         </TableView>
                         <Button fx:id="indexBtn" layoutX="934.0" layoutY="50.0" mnemonicParsing="false" onAction="#runIndex" prefHeight="30.0" prefWidth="120.0" text="Index" />
                         <Label fx:id="indexLabel" layoutX="1174.0" layoutY="62.0" />
-                        <ComboBox fx:id="comboType" layoutX="76.0" layoutY="50.0" prefWidth="150.0" promptText="content" />
+                        <ComboBox fx:id="comboType" layoutX="76.0" layoutY="50.0" onAction="#getSearchTypeChange" prefWidth="150.0" promptText="content" />
                      </children>
                   </AnchorPane>
             </content>