Changeset 1661

Timestamp:

2000-11-09T15:06:08+13:00 (23 years ago)

Author:

nzdl

Message:

Fixed a couple of minor bugs in phrase searching code

Location:

trunk/gsdl/src

Files:

• colservr/phrasesearch.cpp (modified) (1 diff)
• recpt/queryaction.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/phrasesearch.cpp

@@ -148 +148 @@
   if (gran.empty()) return false;
   
-  if (gran == "text") {
+  // note that we're treating indexes with granularity of 'all' (i.e. text,Title,Creator)
+  // as if they were simply 'text' indexes
+  if (gran == "text" || gran == "all") {
     char *doc = NULL;
     int doclen = 0;

trunk/gsdl/src/recpt/queryaction.cpp

@@ -925 +925 @@
   int firstdoc = args.getintarg("r");
   int hitsperpage = args.getintarg("o");
-  if (numdocs > maxdocs) numdocs = maxdocs;
+  if (maxdocs == -1) maxdocs = numdocs;
+  else if (numdocs > maxdocs) numdocs = maxdocs;
   if (hitsperpage == -1) hitsperpage = numdocs;