Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/colservr

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

Location:

branches/New_Config_Format-branch/gsdl/src/colservr

Files:

• browsefilter.cpp (modified) (3 diffs)
• collectserver.cpp (modified) (2 diffs)
• mgsearch.cpp (modified) (2 diffs)
• win32.mak (modified) (1 diff)

branches/New_Config_Format-branch/gsdl/src/colservr/browsefilter.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.10.4.1  2000/07/12 22:21:26  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.11  2000/06/29 22:02:23  sjboddie
+   Made BrowseFilters EndResults option take -1 (i.e. "all"). This is mostly
+   to be consistent with the QueryFilter
+
    Revision 1.10  2000/02/29 01:35:56  sjboddie
    tidied up endianness and fastcgi
@@ -85 +92 @@
   filtopt.type = FilterOption_t::integert;
   filtopt.repeatable = FilterOption_t::onePerQuery;
-  filtopt.defaultValue = "10000";
-  filtopt.validValues.push_back("1");
+  filtopt.defaultValue = "-1";
+  filtopt.validValues.push_back("-1");
   filtopt.validValues.push_back("10000");
   filterOptions["EndResults"] = filtopt;
@@ -298 +305 @@
 
       while (result_here != result_end) {
-    if (resultnum > endresults) break;
+    // if endresults is -1 get all results
+    if ((endresults != -1) && (resultnum > endresults)) break;
     if (resultnum >= startresults) {
       resultdoc.OID = (*result_here);

branches/New_Config_Format-branch/gsdl/src/colservr/collectserver.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.20.4.1  2000/07/12 22:21:26  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.21  2000/06/29 00:22:58  sjboddie
+   added new numsections field to collection info and made the statusaction
+   recognize it
+
    Revision 1.20  1999/12/13 02:56:22  davidb
    Support for cross-collection searching (CCS)
@@ -136 +143 @@
     else if (key == "languages") collectinfo.languages = cfgline;
     else if (key == "numdocs") collectinfo.numDocs = value.getint();
+    else if (key == "numsections") collectinfo.numSections = value.getint();
     else if (key == "numwords") collectinfo.numWords = value.getint();
     else if (key == "numbytes") collectinfo.numBytes = value.getint();

branches/New_Config_Format-branch/gsdl/src/colservr/mgsearch.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.22.4.1  2000/07/12 22:21:27  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.23  2000/07/03 21:58:41  nzdl
+   removed mg directive that was causing meaningless warning messages
+   in errout.txt
+
    Revision 1.22  1999/09/24 02:41:21  rjmcnab
    change to use has_unicode_letdig in text_t
@@ -424 +431 @@
   mgq_ask(".set maxparas 500000");
   mgq_ask(".set verbatim true");
-  mgq_ask(".unset skip_dump");
+  //  mgq_ask(".unset skip_dump");
   mgq_ask(".set mode docnums");
 

branches/New_Config_Format-branch/gsdl/src/colservr/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDLHOME = d:\home\dl\gsdl
-STLPATH = d:\home\dl\stl\stlport
+GSDLHOME = c:\gsdl
+STLPATH = c:\stlport
 
 AR = lib