Changeset 12446

Timestamp:

2006-08-15T14:37:36+12:00 (18 years ago)

Author:

kjdon

Message:

deleted the code for ifl=1 when there are no matching docs. now output the content type for the page, and carry on as if ifl wasn't set

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1395 +1395 @@
     // location response (url may contain macros!!)
     textout << outconvert << disp << "Location: " << doc_url << "\n\n";
+    textout << flush;
+    return true;
       }
       // Ooops... there weren't any matching documents
       else {
-    // Surely there must be a better way to get the query URL without the ifl argument?
-    // This is not complete!
-    text_t query_url = "_gwcgi_";
-    query_url += "?e=" + args["e"];
-    query_url += "&amp;h=" + args["h"];
-    query_url += "&amp;q=" + args["q"];
-    query_url += "&amp;r=" + args["r"];
-    query_url += "&amp;t=" + args["t"];
-    query_url += "&amp;hs=" + args["hs"];
-
-    textout << outconvert << disp << "Location: " << query_url << "\n\n";
+    // We'll just carry on as if ifl wasn't set. The only catch is that 
+    // get_cgihead_info won't have done the right thing (because ifl was 
+    // set), so we need to make sure the output is html
+    textout << "Content-type: text/html\n\n";
       }
-
-      textout << flush;
-      return true;
-    }
-
-    //return false;
+    }
+
     if (err != noError) {
       disp.setmacro("resultline", "query", "_textnodocs_");