almost working lucene

joeferner · joeferner · commit 93b6f3f8c8a3 · 2012-01-20T17:57:47.000-05:00
diff --git a/examples/lucene/example.js b/examples/lucene/example.js
@@ -8,6 +8,7 @@ var version = java.getStaticFieldValue("org.apache.lucene.util.Version", "LUCENE
 var analyzer = java.newInstanceSync("org.apache.lucene.analysis.standard.StandardAnalyzer", version);
 var writerConfig = java.newInstanceSync("org.apache.lucene.index.IndexWriterConfig", version, analyzer);
 var writer = java.newInstanceSync("org.apache.lucene.index.IndexWriter", idx, writerConfig);
+var queryParser = java.newInstanceSync("org.apache.lucene.queryParser.QueryParser", version, "content", analyzer);
 
 writer.addDocumentSync(createDocument("Theodore Roosevelt",
   "It behooves every man to remember that the work of the " +
@@ -47,10 +48,9 @@ function createDocument(title, content) {
 }
 
 function search(searcher, queryString) {
-  var query = java.callStaticMethodSync("org.apache.lucene.queryParser.QueryParser", "parse", queryString);
-  var topDocs = searcher.search(query, 10);
+  var query = queryParser.parseSync(queryString);
+  var topDocs = searcher.searchSync(query, 10);
 
-  console.log(topDocs);
   console.log("Found " + topDocs.totalHits + " hits for query " + queryString + ".")
   for(var i=0; i<topDocs.totalHits; i++) {
     var docId = topDocs.scoreDocs[i].doc;
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -149,6 +149,14 @@ void InstanceMethodCallBaton::execute(JNIEnv *env) {
 
   jclass returnType = (jclass)env->CallObjectMethod(m_method, method_getReturnType);
 
+  /*
+  printf("calling %s\n", javaObjectToString(env, m_method).c_str());
+  printf("arguments\n");
+  for(int i=0; i<env->GetArrayLength(m_args); i++) {
+    printf("  %s\n", javaObjectToString(env, env->GetObjectArrayElement((jobjectArray)m_args, i)).c_str());
+  }
+  */
+
   m_resultType = javaGetType(env, returnType);
   jobject result = env->CallObjectMethod(m_method, method_invoke, m_javaObject->getObject(), m_args);
   m_result = env->NewGlobalRef(result);
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -96,10 +96,12 @@ jobject javaFindBestMatchingMethod(
     return possibleMatches.front();
   } else {
     // TODO: argument match
+    /*
     printf("javaFindBestMatchingMethod: multiple matches (choosing the first)\n");
     for(std::list<jobject>::iterator it = possibleMatches.begin(); it != possibleMatches.end(); it++) {
       printf("  %s\n", javaObjectToString(env, *it).c_str());
     }
+    */
     return possibleMatches.front();
   }
 
@@ -129,10 +131,12 @@ jobject javaFindBestMatchingConstructor(
     return possibleMatches.front();
   } else {
     // TODO: argument match
+    /*
     printf("javaFindBestMatchingConstructor: multiple matches (choosing the first)\n");
     for(std::list<jobject>::iterator it = possibleMatches.begin(); it != possibleMatches.end(); it++) {
       printf("  %s\n", javaObjectToString(env, *it).c_str());
     }
+    */
     return possibleMatches.front();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,12 @@ jobject javaFindBestMatchingMethod(`
`96`	`96`	`return possibleMatches.front();`
`97`	`97`	`} else {`
`98`	`98`	`// TODO: argument match`
	`99`	`+ /*`
`99`	`100`	`printf("javaFindBestMatchingMethod: multiple matches (choosing the first)\n");`
`100`	`101`	`for(std::list<jobject>::iterator it = possibleMatches.begin(); it != possibleMatches.end(); it++) {`
`101`	`102`	`printf(" %s\n", javaObjectToString(env, *it).c_str());`
`102`	`103`	`}`
	`104`	`+ */`
`103`	`105`	`return possibleMatches.front();`
`104`	`106`	`}`
`105`	`107`
`@@ -129,10 +131,12 @@ jobject javaFindBestMatchingConstructor(`
`129`	`131`	`return possibleMatches.front();`
`130`	`132`	`} else {`
`131`	`133`	`// TODO: argument match`
	`134`	`+ /*`
`132`	`135`	`printf("javaFindBestMatchingConstructor: multiple matches (choosing the first)\n");`
`133`	`136`	`for(std::list<jobject>::iterator it = possibleMatches.begin(); it != possibleMatches.end(); it++) {`
`134`	`137`	`printf(" %s\n", javaObjectToString(env, *it).c_str());`
`135`	`138`	`}`
	`139`	`+ */`
`136`	`140`	`return possibleMatches.front();`
`137`	`141`	`}`
`138`	`142`