Changeset 29409 for main/trunk/greenstone2
- Timestamp:
- 2014-11-03T12:26:30+13:00 (9 years ago)
- Location:
- main/trunk/greenstone2/common-src/indexers/mgpp
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/MGPPSearchWrapper.java
r16583 r29409 84 84 public native boolean unloadIndexData(); 85 85 86 /** reset all the params back to their defaults */ 87 public native void reset(); 86 88 // query param methods 87 89 -
main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.cpp
r26660 r29409 67 67 } 68 68 69 resetDefaults(); 70 } 71 72 MGPPSearchData::~MGPPSearchData() { 73 if (indexData !=NULL) { 74 delete indexData; 75 } 76 if (queryInfo !=NULL) { 77 delete queryInfo; 78 } 79 } 80 81 void MGPPSearchData::resetDefaults() { 69 82 // set all the default params 70 83 SetCStr(queryInfo->docLevel, "Document"); // the level to search at … … 80 93 defaultBoolCombine=0; 81 94 maxNumeric = 4; 82 } 83 84 MGPPSearchData::~MGPPSearchData() { 85 if (indexData !=NULL) { 86 delete indexData; 87 } 88 if (queryInfo !=NULL) { 89 delete queryInfo; 90 } 95 91 96 } 92 97 … … 270 275 } 271 276 277 /* reset the stored settings 278 */ 279 JNIEXPORT void JNICALL 280 Java_org_greenstone_mgpp_MGPPSearchWrapper_reset (JNIEnv *j_env, jobject j_obj) { 281 282 jlong data_ptr = j_env->GetLongField(j_obj, FID_mgpp_data); 283 MGPPSearchData * data = (MGPPSearchData *)data_ptr; 284 data->resetDefaults(); 285 286 287 } 272 288 /* do the actual query - the results are written to query_result held on the 273 289 java side */ -
main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.h
r16583 r29409 33 33 ~MGPPSearchData(); 34 34 35 void resetDefaults(); // reset the defaults 35 36 }; -
main/trunk/greenstone2/common-src/indexers/mgpp/jni/org_greenstone_mgpp_MGPPSearchWrapper.h
r16583 r29409 38 38 */ 39 39 JNIEXPORT jboolean JNICALL Java_org_greenstone_mgpp_MGPPSearchWrapper_unloadIndexData 40 (JNIEnv *, jobject); 41 42 /* 43 * Class: org_greenstone_mgpp_MGPPSearchWrapper 44 * Method: reset 45 * Signature: ()V 46 */ 47 JNIEXPORT void JNICALL Java_org_greenstone_mgpp_MGPPSearchWrapper_reset 40 48 (JNIEnv *, jobject); 41 49
Note:
See TracChangeset
for help on using the changeset viewer.