Changeset 4064
- Timestamp:
- 2003-03-31T16:49:21+12:00 (21 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/indexers/mgpp/jni/MGPPWrapperImpl.cpp
r3980 r4064 1 #ifdef __WIN32__ 2 #include <WIN32cfg.h> 3 #include <strstream> 4 #else 5 #include <iostream.h> 6 #include <strstream.h> 7 #endif 8 1 9 #include <jni.h> 2 10 #include "org_greenstone_mgpp_MGPPWrapper.h" … … 5 13 #include "GSDLQueryParser.h" 6 14 #include "MGQuery.h" 7 #include <iostream.h>8 #include <strstream.h>9 15 10 16 MGPPWrapperData::MGPPWrapperData() { … … 153 159 const char* base_dir = "/"; 154 160 #endif 155 156 /* const char * base_dir = j_env->GetStringUTFChars(j_base_dir, NULL); 157 if (base_dir==NULL) { 158 return NULL; // exception already thrown 159 } */ 161 162 cerr << "Doing getDocument..." << endl; 160 163 161 164 const char * text_name = j_env->GetStringUTFChars(j_text_name, NULL); 162 165 if (text_name==NULL) { 163 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);164 166 return NULL; 165 167 } … … 167 169 const char * level = j_env->GetStringUTFChars( j_level, NULL); 168 170 if (level==NULL) { 169 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);170 171 j_env->ReleaseStringUTFChars(j_text_name, text_name); 171 172 return NULL; … … 177 178 178 179 // cast to char* otherwise complains about const 180 cerr << "(MGPP JNI) Base dir: " << base_dir << " Text name: " << text_name << endl; 179 181 td.LoadData((char *)base_dir, (char *)text_name); 182 cerr << "Done loadData." << endl; 180 183 181 184 UCArray mg_level; … … 193 196 jstring result = j_env->NewStringUTF(doc); 194 197 // release any gets 195 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);196 198 j_env->ReleaseStringUTFChars(j_text_name, text_name); 197 199 j_env->ReleaseStringUTFChars(j_level, level); … … 222 224 #endif 223 225 224 /* const char * base_dir = j_env->GetStringUTFChars( j_base_dir, NULL);225 if (base_dir==NULL) {226 return false; // exception already thrown227 } */228 229 226 const char * index_name = j_env->GetStringUTFChars( j_index_name, NULL); 230 227 if (index_name==NULL) { 231 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);232 228 return false; 233 229 } … … 241 237 242 238 // release any gets 243 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);244 239 j_env->ReleaseStringUTFChars(j_index_name, index_name); 245 240 … … 489 484 <<"order by rank\t"<<data->queryInfo->sortByRank<<endl 490 485 <<"query type\t"<<(data->defaultBoolCombine==1?"all":"some")<<endl 491 486 <<"max docs\t"<<data->queryInfo->maxDocs<<endl<<ends; 492 487 493 488 char *result = output.str(); -
trunk/mgpp/jni/MGPPWrapperImpl.cpp
r3980 r4064 1 #ifdef __WIN32__ 2 #include <WIN32cfg.h> 3 #include <strstream> 4 #else 5 #include <iostream.h> 6 #include <strstream.h> 7 #endif 8 1 9 #include <jni.h> 2 10 #include "org_greenstone_mgpp_MGPPWrapper.h" … … 5 13 #include "GSDLQueryParser.h" 6 14 #include "MGQuery.h" 7 #include <iostream.h>8 #include <strstream.h>9 15 10 16 MGPPWrapperData::MGPPWrapperData() { … … 153 159 const char* base_dir = "/"; 154 160 #endif 155 156 /* const char * base_dir = j_env->GetStringUTFChars(j_base_dir, NULL); 157 if (base_dir==NULL) { 158 return NULL; // exception already thrown 159 } */ 161 162 cerr << "Doing getDocument..." << endl; 160 163 161 164 const char * text_name = j_env->GetStringUTFChars(j_text_name, NULL); 162 165 if (text_name==NULL) { 163 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);164 166 return NULL; 165 167 } … … 167 169 const char * level = j_env->GetStringUTFChars( j_level, NULL); 168 170 if (level==NULL) { 169 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);170 171 j_env->ReleaseStringUTFChars(j_text_name, text_name); 171 172 return NULL; … … 177 178 178 179 // cast to char* otherwise complains about const 180 cerr << "(MGPP JNI) Base dir: " << base_dir << " Text name: " << text_name << endl; 179 181 td.LoadData((char *)base_dir, (char *)text_name); 182 cerr << "Done loadData." << endl; 180 183 181 184 UCArray mg_level; … … 193 196 jstring result = j_env->NewStringUTF(doc); 194 197 // release any gets 195 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);196 198 j_env->ReleaseStringUTFChars(j_text_name, text_name); 197 199 j_env->ReleaseStringUTFChars(j_level, level); … … 222 224 #endif 223 225 224 /* const char * base_dir = j_env->GetStringUTFChars( j_base_dir, NULL);225 if (base_dir==NULL) {226 return false; // exception already thrown227 } */228 229 226 const char * index_name = j_env->GetStringUTFChars( j_index_name, NULL); 230 227 if (index_name==NULL) { 231 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);232 228 return false; 233 229 } … … 241 237 242 238 // release any gets 243 // j_env->ReleaseStringUTFChars(j_base_dir, base_dir);244 239 j_env->ReleaseStringUTFChars(j_index_name, index_name); 245 240 … … 489 484 <<"order by rank\t"<<data->queryInfo->sortByRank<<endl 490 485 <<"query type\t"<<(data->defaultBoolCombine==1?"all":"some")<<endl 491 486 <<"max docs\t"<<data->queryInfo->maxDocs<<endl<<ends; 492 487 493 488 char *result = output.str();
Note:
See TracChangeset
for help on using the changeset viewer.