antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

- re-added forceCreate argument to createIndex() that was accidentally

Browse source 
removed
- changed addIndexes(): it now accepts a js-array containing
(ram/fs)directories, the conversion into a java array is done by the
method itself
- minor documentation and indentation fixes
This commit is contained in:
grob 2006-06-15 07:38:19 +00:00
parent c82daee623
commit c41fed49cc
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
helma/Search.js
View file

@ -17,9 +17,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// //
// //
// $Revision: 1.7 $ // $Revision: 1.2 $
// $Author: czv $ // $Author: czv $
// $Date: 2006/04/18 13:06:58 $ // $Date: 2006/04/24 07:02:17 $
// //
@ -42,7 +42,7 @@ helma.Search = function() {
try { try {
var c = java.lang.Class.forName("org.apache.lucene.analysis.Analyzer", var c = java.lang.Class.forName("org.apache.lucene.analysis.Analyzer",
true, app.__app__.typemgr.getClassLoader()); true, app.getClassLoader());
} catch (e) { } catch (e) {
throw("helma.Search needs lucene.jar \ throw("helma.Search needs lucene.jar \
in lib/ext or application directory \ in lib/ext or application directory \
@ -155,12 +155,13 @@ helma.Search.prototype.getRAMDirectory = function(dir) {
/** /**
* returns a new index Object * returns a new index Object
* @param String name of the index * @param Object directory containing the index (an instance of either
* @param Object Analyzer to use (instance of analysis.Analyzer) * org.apache.lucene.store.FSDirectory or org.apache.lucene.store.RAMDirectory)
* @param Object base directory of the index (File object) * @param Object (optional) Analyzer to use (instance of org.apache.lucene.analysis.Analyzer)
* @param Boolean (optional) Flag to force index creation
* @return Object Index object * @return Object Index object
*/ */
helma.Search.prototype.createIndex = function(dir, analyzer) { helma.Search.prototype.createIndex = function(dir, analyzer, forceCreate) {
if (arguments.length == 0) { if (arguments.length == 0) {
throw("helma.Search.createIndex(): insufficient arguments."); throw("helma.Search.createIndex(): insufficient arguments.");
} else if (arguments.length == 1) { } else if (arguments.length == 1) {
@ -175,7 +176,7 @@ helma.Search.prototype.createIndex = function(dir, analyzer) {
} }
} }
var index = new helma.Search.Index(dir, analyzer); var index = new helma.Search.Index(dir, analyzer);
if (!helma.Search.PKG.index.IndexReader.indexExists(dir)) { if (!helma.Search.PKG.index.IndexReader.indexExists(dir) || forceCreate == true) {
index.create(); index.create();
} }
return index; return index;
@ -349,9 +350,14 @@ helma.Search.Index.prototype.checkWriteLock = function() {
* merge indexes into this one * merge indexes into this one
*/ */
helma.Search.Index.prototype.addIndexes = function(dirs) { helma.Search.Index.prototype.addIndexes = function(dirs) {
var arr = java.lang.reflect.Array.newInstance(helma.Search.PKG.store.Directory,
dirs.length);
for (var i=0;i<dirs.length;i++) {
arr[i] = dirs[i];
}
try { try {
var writer = this.getWriter(); var writer = this.getWriter();
writer.addIndexes(dirs); writer.addIndexes(arr);
} finally { } finally {
writer.close(); writer.close();
} }
@ -869,10 +875,10 @@ helma.Search.Document.prototype.addField = function(name, value, param) {
if (value instanceof Date) if (value instanceof Date)
value = helma.Search.PKG.document.DateField.timeToString(value.getTime()); value = helma.Search.PKG.document.DateField.timeToString(value.getTime());
var f = new helma.Search.PKG.document.Field(String(name), var f = new helma.Search.PKG.document.Field(String(name),
String(value), String(value),
param.store, param.store,
param.index, param.index,
param.tokenize); param.tokenize);
this.getDocument().add(f); this.getDocument().add(f);
return; return;
}; };