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

Timestamp:

2002-02-27T11:50:16+13:00 (22 years ago)

Author:

jrm21

Message:

Replaced old code to get file descriptors from ofstreams for locking with
c-style open() functions instead. Now works with gcc3.

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -37 +37 @@
 #include <assert.h>
 #include <time.h>
-#include <stdio.h>
+#include <stdio.h> // for open()
+#include <fcntl.h> // for open() flags
 // following 2 are for printing Last-Modified http header.
 #include <sys/stat.h>
@@ -695 +696 @@
   char *lfile = filename.getcstr();
 
-  ofstream log (lfile, ios::app);
-  
-  if (!log) {
+  int fd = open(lfile,O_APPEND);
+  
+  if (fd == -1) {
     logout << "Error: Couldn't open file " << lfile << "\n";
     delete lfile;
@@ -703 +704 @@
   }
 
-  int fd = GSDL_GET_FILEDESC(log);
+  //int fd = GSDL_GET_FILEDESC(log);
 
   // lock_val is set to 0 if file is locked successfully
@@ -709 +710 @@
   GSDL_LOCK_FILE (fd);
   if (lock_val == 0) {
-    log << text_t2utf8 << logstr;
+    text_t2utf8 << logstr;
+    char *buffer=new char[logstr.size()];
+    size_t num_chars;
+    convertclass::status_t status;
+    text_t2utf8.convert(buffer, logstr.size(), num_chars, status);
+    // ignore status - assume it is "finished" as buffer is big enough
+    write(fd, buffer, num_chars);
     GSDL_UNLOCK_FILE (fd);
+    delete buffer;
   } else {
     logout << "Error: Couldn't lock file " << lfile << "\n";
-    log.close();
+    close(fd);
     delete lfile;
     return false;
   }
 
-  log.close();
+  close(fd);
         
   delete lfile;
@@ -797 +805 @@
     contentout << "Last-Modified: " << asctime(utc_latest);
       }
-    }
+    } // end of collection != ""
 
     /*