Changeset 25244
- Timestamp:
- 2012-03-21T20:05:50+13:00 (12 years ago)
- Location:
- main/trunk/greenstone2/common-src/indexers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c
r25147 r25244 180 180 181 181 /* Save the object on the Java side */ 182 (*j_env)->Set IntField(j_env, j_obj, FID_mg_data, (mg_s_long) data);182 (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data); 183 183 184 184 /* Initialise MG environment variables */ … … 213 213 jstring j_index) 214 214 { 215 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);215 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 216 216 217 217 /* Get the index name as a C string */ … … 243 243 jlong j_docnum) 244 244 { 245 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);245 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 246 246 247 247 char* index_path; -
main/trunk/greenstone2/common-src/indexers/mg/jni/MGSearchWrapperImpl.c
r25147 r25244 142 142 143 143 /* Save the object on the Java side */ 144 (*j_env)->Set IntField(j_env, j_obj, FID_mg_data, (long) data);144 (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data); 145 145 146 146 /* Initialise MG environment variables */ … … 252 252 jstring j_query) 253 253 { 254 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);254 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 255 255 256 256 char* index_path; … … 517 517 jboolean j_on) 518 518 { 519 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);519 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 520 520 521 521 if (j_on) { … … 532 532 jboolean j_on) 533 533 { 534 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);534 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 535 535 536 536 if (j_on) { … … 547 547 jint j_max) 548 548 { 549 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);549 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 550 550 data->queryInfo->maxDocs = j_max; 551 551 } … … 570 570 jboolean j_on) 571 571 { 572 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);572 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 573 573 data->queryInfo->needTermFreqs = j_on; 574 574 } … … 580 580 jstring j_index) 581 581 { 582 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);582 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 583 583 584 584 /* Get the index name as a C string */ … … 606 606 jint j_mode) 607 607 { 608 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);608 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 609 609 data->defaultBoolCombine = j_mode; 610 610 } … … 615 615 Java_org_greenstone_mg_MGSearchWrapper_getQueryParams(JNIEnv *j_env, jobject j_obj) 616 616 { 617 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);617 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 618 618 char result[512]; /* Assume this is big enough */ 619 619 -
main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c
r25147 r25244 168 168 169 169 /* Save the object on the Java side */ 170 (*j_env)->Set IntField(j_env, j_obj, FID_mg_data, (mg_s_long) data);170 (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data); 171 171 172 172 /* Initialise MG environment variables */ … … 278 278 jlong j_docnum) 279 279 { 280 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);280 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 281 281 282 282 char* index_path; … … 363 363 jstring j_query) 364 364 { 365 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);365 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 366 366 367 367 char* index_path; … … 628 628 jboolean j_on) 629 629 { 630 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);630 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 631 631 632 632 if (j_on) { … … 643 643 jboolean j_on) 644 644 { 645 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);645 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 646 646 647 647 if (j_on) { … … 658 658 jint j_max) 659 659 { 660 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);660 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 661 661 data->queryInfo->maxDocs = j_max; 662 662 } … … 681 681 jboolean j_on) 682 682 { 683 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);683 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 684 684 data->queryInfo->needTermFreqs = j_on; 685 685 } … … 691 691 jstring j_index) 692 692 { 693 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);693 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 694 694 695 695 /* Get the index name as a C string */ … … 717 717 jint j_mode) 718 718 { 719 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);719 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 720 720 data->defaultBoolCombine = j_mode; 721 721 } … … 726 726 Java_org_greenstone_mg_MGWrapper_getQueryParams(JNIEnv *j_env, jobject j_obj) 727 727 { 728 MGWrapperData* data = (MGWrapperData*) (*j_env)->Get IntField(j_env, j_obj, FID_mg_data);728 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 729 729 char result[512]; /* Assume this is big enough */ 730 730 -
main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.cpp
r16583 r25244 163 163 164 164 MGPPSearchData * data = new MGPPSearchData(); 165 j_env->Set IntField(j_obj, FID_mgpp_data, (long)data);165 j_env->SetLongField(j_obj, FID_mgpp_data, (long)data); 166 166 167 167 return true; … … 178 178 Java_org_greenstone_mgpp_MGPPSearchWrapper_loadIndexData (JNIEnv *j_env, jobject j_obj, jstring j_index_name) { 179 179 180 j int data_ptr = j_env->GetIntField(j_obj, FID_mgpp_data);180 jlong data_ptr = j_env->GetLongField(j_obj, FID_mgpp_data); 181 181 MGPPSearchData * data = (MGPPSearchData *)data_ptr; 182 182 … … 210 210 Java_org_greenstone_mgpp_MGPPSearchWrapper_unloadIndexData (JNIEnv *j_env, jobject j_obj) { 211 211 212 j int data_ptr = j_env->GetIntField(j_obj, FID_mgpp_data);212 jlong data_ptr = j_env->GetLongField(j_obj, FID_mgpp_data); 213 213 MGPPSearchData * data = (MGPPSearchData *)data_ptr; 214 214 … … 234 234 235 235 // the query data 236 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);236 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 237 237 238 238 // the result to write to … … 335 335 jobject j_obj, 336 336 jboolean j_on) { 337 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);337 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 338 338 if (j_on) { 339 339 data->defaultStemMethod |= 2; … … 348 348 jobject j_obj, 349 349 jboolean j_on) { 350 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);350 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 351 351 if (j_on) { 352 352 data->defaultStemMethod |= 4; … … 361 361 jobject j_obj, 362 362 jboolean j_on) { 363 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);363 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 364 364 365 365 if (j_on) { … … 374 374 jobject j_obj, 375 375 jint j_max) { 376 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);376 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 377 377 data->queryInfo->maxDocs=j_max; 378 378 } … … 382 382 jobject j_obj, 383 383 jint j_max) { 384 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);384 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 385 385 data->maxNumeric=j_max; 386 386 } … … 390 390 jobject j_obj, 391 391 jboolean j_on) { 392 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);392 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 393 393 394 394 data->queryInfo->sortByRank=j_on; … … 399 399 jobject j_obj, 400 400 jboolean j_on) { 401 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);401 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 402 402 data->queryInfo->needTermFreqs = j_on; 403 403 … … 409 409 jstring j_level){ 410 410 411 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);411 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 412 412 413 413 const char * level = j_env->GetStringUTFChars(j_level, NULL); … … 429 429 jstring j_level){ 430 430 431 MGPPSearchData * data = (MGPPSearchData *)j_env->GetIntField(j_obj, FID_mgpp_data); 431 jlong data_ptr = j_env->GetLongField(j_obj, FID_mgpp_data); 432 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 433 432 434 433 435 const char * level = j_env->GetStringUTFChars(j_level, NULL); … … 441 443 // release the java stuff 442 444 j_env->ReleaseStringUTFChars(j_level, level); 443 444 445 445 446 } … … 450 451 jint j_mode){ 451 452 452 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);453 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 453 454 data->defaultBoolCombine=j_mode; 454 455 … … 459 460 jobject j_obj){ 460 461 461 MGPPSearchData * data = (MGPPSearchData *)j_env->Get IntField(j_obj, FID_mgpp_data);462 MGPPSearchData * data = (MGPPSearchData *)j_env->GetLongField(j_obj, FID_mgpp_data); 462 463 463 464 // print the data to a stringstream, then convert to char*, then to
Note:
See TracChangeset
for help on using the changeset viewer.