Changeset 25526 for main/trunk/greenstone2

Timestamp:

2012-05-04T17:43:56+12:00 (12 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the problem noticed by Diego and which was thought to be fixed earlier. It had to do with searching for (3 digit) numbers, however Diego particularly experienced the problem when trying the ifl=1 argument (I Feel Lucky) for searching.

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/text/GSDLQueryLex.cpp (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mgpp/text/GSDLQueryLex.cpp

@@ -94 +94 @@
   el.num = 0;
   el.lexType = IntegerE;
+
   /* stop integers at 4 digits */
-  while (c >= '0' && c <= '9'&& ++numeric<=MAXNUMERIC) {
-    el.num = el.num*10 + c - '0';
-    AddNChar (here, el.text, charLen);
-    length += charLen;
-    if(numeric < MAXNUMERIC) { // server crash bugfix: don't go past the end with the endMinus1 pointer
-        charLen = parse_utf8_char (&*here, endMinus1, &c);
-    }
-  }
+  while (here != end) {
+
+      charLen = parse_utf8_char (&*here, endMinus1, &c);
+      if (c < '0' || c > '9') {
+          // reached a non-digit character
+          break;
+      }
+      el.num = el.num*10 + c - '0';
+      AddNChar (here, el.text, charLen); // advances 'here' by 'charLen'
+      length += charLen;
+
+      numeric++;
+
+      if (numeric == MAXNUMERIC) {
+          // reached the max length of a number
+          break;
+      }
+
+  }
+
+
   // check the next character -if it is a letter, then have a term, not an integer
   if (!is_unicode_letter(c)) {