Changeset 3036

Timestamp:

2002-03-04T11:40:39+13:00 (22 years ago)

Author:

jrm21

Message:

text strings weren't being properly converted for file output via the
convertclass. Input is now properly set so that we don't get garbage output.

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (1 diff)
• receptionist.cpp (modified) (1 diff)
• statusaction.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -655 +655 @@
       
       outconvertclass text_t2ascii;
-      text_t2ascii << args["cfgfile"];
+      text_t2ascii.setinput(&args["cfgfile"]);
       size_t buffersize=args["cfgfile"].size();
       char *buffer=new char[buffersize];
+      buffer[0]='\n'; // just in case something goes wrong...
       size_t num_chars;
       convertclass::status_t status;

trunk/gsdl/src/recpt/receptionist.cpp

@@ -710 +710 @@
   GSDL_LOCK_FILE (fd);
   if (lock_val == 0) {
-    text_t2utf8 << logstr;
+    text_t tmp_log_str(logstr); // so we don't pass a const to setinput...
+    text_t2utf8.setinput(&tmp_log_str);
     char *buffer=new char[logstr.size()];
     size_t num_chars;

trunk/gsdl/src/recpt/statusaction.cpp

@@ -903 +903 @@
     } else {
       outconvertclass text_t2ascii;
-      text_t2ascii << args["cfgfile"];
+      text_t2ascii.setinput(&args["cfgfile"]);
       size_t buffersize=args["cfgfile"].size();
       char *buffer=new char[buffersize];