Changeset 1629

Timestamp:

2000-10-30T15:12:18+13:00 (24 years ago)

Author:

paynter

Message:

Changed handling of cgi arguments so that a "0" now means return no
expansions/documents instead of returning them all.

File:

• trunk/gsdl/src/phind/host/phindcgi.cpp (modified) (6 diffs)

trunk/gsdl/src/phind/host/phindcgi.cpp

@@ -3 +3 @@
  * phindcgi.cpp -- cgi program to serve phind phrase hierarchies
  *
- * Copyright 2000 Gordon Paynter
+ * Copyright 2000 Gordon W. Paynter
  * Copyright 2000 The New Zealand Digital Library Project
  *
@@ -175 +175 @@
      << "<phinddata id=\"" << phrase 
      << "\" text=\"" << word 
+     << "\" tf=\"" << tf 
      << "\" df=\"" << df 
      << "\" ef=\"" << ef 
@@ -188 +189 @@
   
   // Output the expansions
-  if (ef > 0) {
+  if ((ef > 0) && (first_e < last_e)) {
 
     // figure out the number of phrases to output
-    if (last_e < 1 || last_e > el.size()) {
+    if (last_e > el.size()) {
       last_e = el.size();
     }
@@ -229 +230 @@
          << "<br><a href='" << argv[0] 
          << "?c=" << collection << "&n=" << phrase 
-         << "&e=0&d=" << last_d 
+         << "&e=" << el.size() << "&d=" << last_d 
          << "&g=" << first_e << "&f=" << first_d 
          << "'>Get every phrase</a>" 
@@ -238 +239 @@
 
   // Output the document occurances
-  if (df > 0) {
+  if ((df > 0) && (first_d < last_d)) {
 
     // figure out the phrases to output
-    if (last_d < 1 || last_d > docNums.size()) {
+    if (last_d > docNums.size()) {
       last_d = docNums.size();
     }
@@ -280 +281 @@
          << "<br><a href='" << argv[0] 
          << "?c=" << collection << "&n=" << phrase 
+         << "&g=" << first_e 
          << "&e=" << last_e 
-         << "&g=" << first_e << "&f=" << first_d 
-         << "&d=0'>Get every document</a>" << endl;
+         << "&f=" << first_d 
+         << "&d=" << docNums.size()
+         << "'>Get every document</a>" << endl;
       }
     }