Changeset 1170 for trunk/gsdl/src/recpt

Timestamp:

2000-05-12T15:09:27+12:00 (24 years ago)

Author:

sjboddie

Message:

minor modifications to get web library compiling under VC++ 6.0

Location:

trunk/gsdl/src/recpt

Files:

• buildaction.cpp (modified) (4 diffs)
• cgiwrapper.cpp (modified) (2 diffs)
• infodbclass.h (modified) (1 diff)
• receptionist.cpp (modified) (4 diffs)
• recptconfig.cpp (modified) (5 diffs)
• statusaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#if !defined(__WIN32__) || defined(__GNUC__)
-#include <unistd.h>
-#endif
-
 #include "OIDtools.h"
 #include "fileutil.h"
@@ -291 +287 @@
       text_t cfg_fname 
     = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
+
+#ifdef GSDL_USE_IOS_H
       ifstream cfg_ifs (cfg_fname.getcstr(), ios::in | ios::nocreate);
+#else
+      ifstream cfg_ifs (cfg_fname.getcstr(), ios::in);
+#endif
+
       if (cfg_ifs) 
     {  
@@ -326 +328 @@
       // read in collect.bld
       text_t bld_fname = filename_cat(gsdlhome, "log", dirname+ ".bld");
+
+#ifdef GSDL_USE_IOS_H
       ifstream bld_ifs (bld_fname.getcstr(), ios::in | ios::nocreate);
+#else
+      ifstream bld_ifs (bld_fname.getcstr(), ios::in);
+#endif
+
       if (bld_ifs) 
     {
@@ -447 +455 @@
   else
     {
-      text_t dirname = (args["bc1dirname"] == "") ? (text_t)"unknown" : args["bc1dirname"];
+      text_t dirname = (args["bc1dirname"] == "") ? 
+    "unknown" : args["bc1dirname"];
+
       text_t tmpname = dirname+"_XXXXXX";
       char *cstr_tmpname = tmpname.getcstr();
-      if (mktemp(cstr_tmpname)==NULL)
+
+      if (GSDL_MKTEMP (cstr_tmpname)==NULL)
     logout << "Failed to create temporary filename" << endl;
 

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.26  2000/05/12 03:09:26  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
    Revision 1.25  2000/04/14 04:45:19  sjboddie
    Modified the English of the debug output slightly
@@ -713 +716 @@
       ofstream errout (eout);
       delete eout;
-      cerr = errout;
+      cerr.tie(&errout);
     
       // parse the cgi arguments and produce the resulting page if there

trunk/gsdl/src/recpt/infodbclass.h

@@ -33 +33 @@
 #include "gsdlconf.h"
 #include "text_t.h"
+
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\iostream>
+#  include <ospace\std\fstream>
+#elif defined(GSDL_USE_IOS_H)
+#  include <iostream.h>
+#  include <fstream.h>
+#else
+#  include <iostream>
+#  include <fstream>
+#endif
 
 #ifdef __WIN32__

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.50  2000/05/12 03:09:25  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
    Revision 1.49  2000/05/04 05:18:46  sjboddie
    attempting to get end-user collection building to work under windows
@@ -239 +242 @@
 #include <time.h>
 #include <stdio.h>
+#if defined (GSDL_USE_IOS_H)
 #include <fstream.h>
+#else 
+#include <fstream>
+#endif
 
 #if defined (__WIN32_)
@@ -789 +796 @@
   utf8outconvertclass text_t2utf8;
   char *lfile = filename.getcstr();
+
   ofstream log (lfile, ios::app);
   
@@ -912 +920 @@
 bool receptionist::produce_content (cgiargsclass &args, ostream &contentout,
                     ostream &logout) {
-  
+
   // decide on the output conversion class
   text_t &arg_w = args["w"];

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.9  2000/05/12 03:09:24  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
    Revision 1.8  2000/04/14 03:10:35  sjboddie
    tidied up a few issues concerning the new debug info which showed
@@ -87 +90 @@
   text_tarray cfgline;
   text_t key;
+
+#ifdef GSDL_USE_IOS_H
   ifstream confin ("gsdlsite.cfg", ios::in | ios::nocreate);
+#else
+  ifstream confin ("gsdlsite.cfg", ios::in);
+#endif
 
   if (confin) {
@@ -122 +130 @@
   text_tarray cfgline;
   text_t key;
+
+#ifdef GSDL_USE_IOS_H
   ifstream confin ("gsdlsite.cfg", ios::in | ios::nocreate);
+#else
+  ifstream confin ("gsdlsite.cfg", ios::in);
+#endif
 
   if (confin) {
@@ -153 +166 @@
   if (file_exists (filename)) {
     char *cstr = filename.getcstr();
+    
+#ifdef GSDL_USE_IOS_H
     ifstream confin (cstr, ios::in | ios::nocreate);
+#else
+    ifstream confin (cstr, ios::in);
+#endif
+
     delete cstr;
   
@@ -186 +205 @@
     if (!filename.empty()) {
       char *cstr = filename.getcstr();
+
+#ifdef GSDL_USE_IOS_H
       ifstream confin (cstr, ios::in | ios::nocreate);
+#else
+      ifstream confin (cstr, ios::in);
+#endif
+      
       delete cstr;
       

trunk/gsdl/src/recpt/statusaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.27  2000/05/12 03:09:24  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
    Revision 1.26  2000/04/19 22:30:23  sjboddie
    tidied up status pages and end-user collection building
@@ -794 +797 @@
   textout << outconvert << "<h2>Init log</h2>\n";
 
+#ifdef GSDL_USE_IOS_H
   ifstream initin (cinitfilename, ios::in | ios::nocreate);
+#else
+  ifstream initin (cinitfilename, ios::in);
+#endif
+
   delete cinitfilename;
   if (initin) {
@@ -834 +842 @@
   logout << flush;
 
+#ifdef GSDL_USE_IOS_H
   ifstream errin (cerrfilename, ios::in | ios::nocreate);
+#else
+  ifstream errin (cerrfilename, ios::in);
+#endif
+
   delete cerrfilename;
   if (errin) {