Changeset 3477

Timestamp:

09/07/10 15:23:41 (17 months ago)

Author:

rwagner

Message:

 

Location:

molgenis_projects/col7a1/handwritten/java/plugin/ui/search

Files:

• SearchPlugin.java (modified) (4 diffs)
• SimpleSearchForm.java (added)
• searchForm.ftl (modified) (1 diff)

molgenis_projects/col7a1/handwritten/java/plugin/ui/search/SearchPlugin.java

@@ -66 +66 @@
         private PatientSummaryVO patientSummaryVO;
         
-        //private SimpleSearch simpleSearch;
+        private SimpleSearchForm simpleSearchForm = new SimpleSearchForm();
         
         public SearchPlugin(String name, ScreenModel parent)
@@ -100 +100 @@
 
                         this.action      = request.getAction();
-
-//                      if (StringUtils.isEmpty(this.action) || this.action.equals("simpleSearch"))
-//                              this.populateSimpleSearch();
 
                         this.queryParametersVO.init();
@@ -261 +258 @@
                                 }
                         }
+                        
+                        if (StringUtils.isEmpty(this.action) || this.action.equals("simpleSearch"))
+                                this.populateSimpleSearchForm();
                 }
                 catch(Exception e)
@@ -299 +299 @@
         }
         
-//      private void populateSimpleSearch()
-//      {
-//              this.simpleSearch = new SimpleSearch();
-//              
-//              simpleSearch.setAction(new HiddenInput("__action", "findMutationsByTerm"));
-//              simpleSearch.setTarget(new HiddenInput("__target", this.getName()));
-//              
-//              StringInput term = new StringInput("term");
-//              term.setSize(10);
-//              simpleSearch.setTerm(term);
-//      }
-//
-//      public SimpleSearch getSimpleSearch()
-//      {
-//              return this.simpleSearch;
-//      }
+        private void populateSimpleSearchForm()
+        {
+                this.simpleSearchForm.get("term").setValue(this.mutationSearchCriteriaVO.getSearchTerm());
+        }
+
+        public SimpleSearchForm getSimpleSearchForm()
+        {
+                return this.simpleSearchForm;
+        }
 
         public String getAction()

molgenis_projects/col7a1/handwritten/java/plugin/ui/search/searchForm.ftl

@@ -1 +1 @@
 <table cellpadding="4" cellspacing="4">
 <#if !queryParametersVO.expertSearch>
+<#assign form = screen.simpleSearchForm>
 <tr>
-        <td>Search term: <form method="post" enctype="multipart/form-data"><input type="hidden" name="__target" value="${screen.name}" /><input type="hidden" name="__action" value="findMutationsByTerm"/><input type="text" name="term" size="10"></form></td>
+        <td>Search term: <form method="post" enctype="multipart/form-data"><input type="hidden" name="__target" value="${screen.name}" />${form.__action}${form.term}</form></td>
         <td><a href="molgenis.do?__target=${screen.name}&__action=init&expertSearch=1">Expert search</a></td>
 </tr>