Commit fa73ecf9a20147e0239c8a0a0903cf7c44d7fa49

Authored by Conrad Vermeulen
1 parent 0b757efb

KTS-673

"The search algorithm needs some work"
Updated. Fixed references to Lucene

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7500 c91229c3-7414-0410-bfa2-8a42b809f60b
templates/ktcore/search2/adv_query_builder.smarty
@@ -766,7 +766,12 @@ function butSearchClick() @@ -766,7 +766,12 @@ function butSearchClick()
766 <fieldset> 766 <fieldset>
767 <legend>{i18n}Advanced Search{/i18n}</legend> 767 <legend>{i18n}Advanced Search{/i18n}</legend>
768 768
  769 +{capture assign=options}
  770 +<a href="{$rootUrl}/search2.php?action=queryBuilder">Search Criteria Editor</a>
  771 +{/capture}
769 772
  773 +{i18n arg_options=$options}The #options# may also be used to create more complex search criteria expressions.{/i18n}
  774 +<br><br>
770 {capture assign=options} 775 {capture assign=options}
771 <select id="allop"> 776 <select id="allop">
772 <option value="AND">{i18n}all{/i18n} 777 <option value="AND">{i18n}all{/i18n}
templates/ktcore/search2/adv_query_search.smarty
1 -<h2>{i18n}Query Editor{/i18n}</h2> 1 +<h2>{i18n}Search Criteria Editor{/i18n}</h2>
2 2
3 <p class="descriptiveText"> 3 <p class="descriptiveText">
4 -{i18n}The query editor allows you to utilise the full power of the KnowledgeTree search engine by entering comprehensive expressions.{/i18n} 4 +{i18n}The search criteria editor allows you to utilise the full power of the KnowledgeTree search engine by allowing you to perform more complicated searches by using the free text criteria format.{/i18n}
  5 +
  6 +{capture assign=options}
  7 +<a href="{$rootUrl}/search2.php?action=guiBuilder">Advanced Search</a>
  8 +{/capture}
  9 +<p>
  10 +{i18n arg_options=$options}The #options# may also be used to perform searches.{/i18n}
  11 +
5 <P> 12 <P>
6 <div> 13 <div>
7 <table> 14 <table>
@@ -111,6 +118,8 @@ function txtQueryChange(el) @@ -111,6 +118,8 @@ function txtQueryChange(el)
111 </script> 118 </script>
112 {/literal} 119 {/literal}
113 <legend>{i18n}Advanced Query{/i18n}</legend> 120 <legend>{i18n}Advanced Query{/i18n}</legend>
  121 +
  122 +
114 <form id=frmQuery name=frmQuery method="POST" action="{addQS}action=process{/addQS}"> 123 <form id=frmQuery name=frmQuery method="POST" action="{addQS}action=process{/addQS}">
115 <textarea id="txtAdvQuery" name="txtQuery" cols=50 rows=10 onkeypress="txtQueryChange(this)">{$txtQuery}</textarea> 124 <textarea id="txtAdvQuery" name="txtQuery" cols=50 rows=10 onkeypress="txtQueryChange(this)">{$txtQuery}</textarea>
116 <br/> 125 <br/>
@@ -139,11 +148,11 @@ function txtQueryChange(el) @@ -139,11 +148,11 @@ function txtQueryChange(el)
139 <fieldset> 148 <fieldset>
140 149
141 <legend>{i18n}Grammar{/i18n}</legend> 150 <legend>{i18n}Grammar{/i18n}</legend>
142 -{i18n}Expressions may be built up using the following grammar:{/i18n}<br/> 151 +{i18n}Criteria may be built up using the following grammar:{/i18n}<br/>
143 expr ::= expr {literal}{{/literal} AND | OR {literal}}{/literal} expr<br/> 152 expr ::= expr {literal}{{/literal} AND | OR {literal}}{/literal} expr<br/>
144 expr ::= NOT expr<br/> 153 expr ::= NOT expr<br/>
145 expr ::= (expr)<br/> 154 expr ::= (expr)<br/>
146 -expr ::= expr {literal}{ < | <= | = | > | >= | CONTAINS |STARTS WITH | ENDS WITH }{/literal} value<br/> 155 +expr ::= field {literal}{ < | <= | = | > | >= | CONTAINS |STARTS WITH | ENDS WITH }{/literal} value<br/>
147 expr ::= field BETWEEN value AND value<br/> 156 expr ::= field BETWEEN value AND value<br/>
148 expr ::= field DOES [ NOT ] CONTAIN value<br/> 157 expr ::= field DOES [ NOT ] CONTAIN value<br/>
149 expr ::= field IS [ NOT ] LIKE value<br/> 158 expr ::= field IS [ NOT ] LIKE value<br/>
@@ -167,12 +176,11 @@ sq.value += word + &#39; &#39;; @@ -167,12 +176,11 @@ sq.value += word + &#39; &#39;;
167 176
168 <fieldset> 177 <fieldset>
169 <legend>{i18n}Fields{/i18n}</legend> 178 <legend>{i18n}Fields{/i18n}</legend>
170 -{i18n}The following fields may be used in expressions:{/i18n} 179 +{i18n}The following fields may be used in search criteria:{/i18n}
171 {assign var=i value=0} 180 {assign var=i value=0}
172 {foreach item=alias from=$aliases} 181 {foreach item=alias from=$aliases}
173 {if (substr($alias,0,2) != '["')} 182 {if (substr($alias,0,2) != '["')}
174 {if $i>0}, {/if} 183 {if $i>0}, {/if}
175 -  
176 {if (($i % 8) == 0)}<br>{/if} 184 {if (($i % 8) == 0)}<br>{/if}
177 <span onclick="wordclicked('{$alias|escape}')">{$alias}</span> 185 <span onclick="wordclicked('{$alias|escape}')">{$alias}</span>
178 {assign var=i value=$i+1} 186 {assign var=i value=$i+1}
templates/ktcore/search2/lucene_migration.smarty
1 <P> 1 <P>
2 -{i18n}Migration to using the new search requires text to be moved from the database full text indexes into the Lucene indexes. This may take some time depending 2 +{i18n}Migration to using the new search requires text to be moved from the database full text indexes into the Document Indexer Service. This may take some time depending
3 on the size of the repository. For this reason, the process is a background task.{/i18n} 3 on the size of the repository. For this reason, the process is a background task.{/i18n}
4 <P> 4 <P>
5 5
templates/ktcore/search2/lucene_statistics.smarty
1 <P> 1 <P>
2 -{i18n}This dashlet provides some basic statistics on the Lucene index.{/i18n} 2 +{i18n}This dashlet provides some basic statistics from the KnowledgeTree Document Indexer.{/i18n}
3 <P> 3 <P>
4 4
5 <table> 5 <table>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <tr><td valign=top>*<td>{i18n}Not all documents contain text. This will explain why the indexing coverage percentage my vary.{/i18n} 18 <tr><td valign=top>*<td>{i18n}Not all documents contain text. This will explain why the indexing coverage percentage my vary.{/i18n}
19 <tr><td valign=top>*<td>{i18n}The queue coverage indicates how many documents are in the queue in relation to the repository size.{/i18n} 19 <tr><td valign=top>*<td>{i18n}The queue coverage indicates how many documents are in the queue in relation to the repository size.{/i18n}
20 {if $stats.noOptimisation} 20 {if $stats.noOptimisation}
21 -<tr><td valign=top>*<td><i>{i18n}To get the best performance out of Lucene, the indexes must be optimised periodically. This is managed by a background task.{/i18n} 21 +<tr><td valign=top>*<td><i>{i18n}To get the best performance out of Document Indexer, the indexes must be optimised periodically. This is managed by a background task.{/i18n}
22 {/if} 22 {/if}
23 </table> 23 </table>
24 <table width="100%"> 24 <table width="100%">