Changeset 23508 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

Timestamp:

2010-12-17T14:04:10+13:00 (13 years ago)

Author:

sjm84

Message:

Committing 64 bit changes into the branch

File:

• main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c (modified) (4 diffs)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

@@ -168 +168 @@
 
   /* Save the object on the Java side */
-  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (long) data);
+  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data);
 
   /* Initialise MG environment variables */
@@ -285 +285 @@
   query_data* qd;
 
-  u_long pos, len;
+  mg_u_long pos, len;
   u_char* c_buffer = NULL;
   u_char* uc_buffer = NULL;
@@ -322 +322 @@
 
   /* Get the document position and length in the text file */
-  printf("Fetching document number %ld...\n", (unsigned long) j_docnum);
-  FetchDocStart(qd, (unsigned long) j_docnum, &pos, &len);
-  printf("Fetched document start. Pos: %ld, Len: %ld\n", pos, len);
+  printf("Fetching document number %d...\n", (mg_u_long) j_docnum);
+  FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len);
+  printf("Fetched document start. Pos: %d, Len: %d\n", pos, len);
 
   /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */
@@ -730 +730 @@
 
   /* Print the data to a character array */
-  sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%ld\n",
+  sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n",
       (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index),
       (data->defaultStemMethod & 1),