Changeset 297 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

1999-06-28T09:49:03+12:00 (25 years ago)

Author:

sjboddie

Message:

fixed a couple of version conflicts - tidied up some small things

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.16  1999/06/27 21:49:03  sjboddie
+   fixed a couple of version conflicts - tidied up some small things
+
    Revision 1.15  1999/06/26 01:14:32  rjmcnab
    Made a couple of changes to handle different encodings.
@@ -94 +97 @@
     else if (key == "collection") configinfo.collection = cfgline[0];
     else if (key == "collectdir") configinfo.collectdir = cfgline[0];
+    else if (key == "httpprefix") configinfo.httpprefix = cfgline[0];
     else if (key == "httpimg") configinfo.httpimg = cfgline[0];
     else if (key == "gwcgi") configinfo.gwcgi = cfgline[0];
@@ -634 +638 @@
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
+  disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
   disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, outconvert, logout));