Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.h

Timestamp:

2012-02-28T13:59:00+13:00 (12 years ago)

Author:

kjdon

Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.h (modified) (3 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.h

@@ -107 +107 @@
 
 
-#define NO_TERM_RANGE_START (LONG_MIN/2)
-#define NO_TERM_RANGE_END   (LONG_MAX/2)
+#define NO_TERM_RANGE_START (INT_MIN/2)
+#define NO_TERM_RANGE_END   (INT_MAX/2)
 
 /* NOTE: range stuff - the range values are for the previous term relative
@@ -123 +123 @@
 public:
   UCArray term;
-  unsigned long termWeight;
-  unsigned long stemMethod;
-  signed long startRange; // range relative to last term
-  signed long endRange;
+  mg_u_long termWeight;
+  mg_u_long stemMethod;
+  mg_s_long startRange; // range relative to last term
+  mg_s_long endRange;
   
   void Clear ();
@@ -161 +161 @@
  public:
   UCArray term;
-  signed long startPosition;
-  unsigned long numTerms;
+  mg_s_long startPosition;
+  mg_u_long numTerms;
 
   void Clear();