diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/Action.cpp.html ./doc/ProgrammingSteelBlue/Action.cpp.html *** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/Action.cpp.html Tue Jan 4 23:22:06 2000 --- ./doc/ProgrammingSteelBlue/Action.cpp.html Wed Sep 13 23:49:20 2000 *************** *** 1,4 **** --- 1,9 ---- 
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  #include "Action.h"
  #include "DBError.h"
  #include "DBHandler.h"
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/BaseSBModule.cpp.html ./doc/ProgrammingSteelBlue/BaseSBModule.cpp.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/BaseSBModule.cpp.html	Thu Jan 13 15:14:43 2000
--- ./doc/ProgrammingSteelBlue/BaseSBModule.cpp.html	Sun Sep 24 23:07:56 2000
***************
*** 1,4 ****
--- 1,9 ----
  
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  /* BaseSBFunction
  
  The idea here is to put the functions that are common to Action,
***************
*** 1305,1310 ****
--- 1310,1316 ----
  @usage <EMAIL MESSAGE="message"
  @usage    [FROM="from"]
  @usage    [SUBJECT="subject"]
+ @usage    [CONTENTTYPE="contenttype"]
  @usage    (ARRAY="array"                               |
  @usage     SQL="SQL statement" [DB="connection_name"]  |
  @usage     VALUE="string or list" [SPLIT="delimiter"])>
***************
*** 1312,1317 ****
--- 1318,1324 ----
  @IFLAG MESSAGE Message to be sent
  @IFLAG FROM E-mail from whom the mail is sent
  @IFLAG SUBJECT Subject of the e-mail
+ @IFLAG CONTENTTYPE Specify a different content-type for the e-mail
  @FLAG ARRAY Array name of e-mail recipients
  @IFLAG SQL Select statement for e-mail recipients
  @IFLAG DB  DB connection name
***************
*** 1332,1348 ****
  
  */
  void BaseSBModule::processEMAIL (SGMLTag * t, Error & err) {
- #ifndef WIN32
    AssocArrayPtrDLList * data; // the stuff we are looping over
    AssocArray * aaptr;
    AssocArray * flags = &(t->flags());
    string from, to, subject, message;
    FILE* outfile;
    int i, length;
  
    from = interpretString ((*flags)["FROM"]);
    subject = interpretString ((*flags)["SUBJECT"]);
    message = interpretString ((*flags)["MESSAGE"]);
  
    if (! hasDataSource ( (SGMLTag *) t)) {
      err.addWarning ("EMAIL tag has no data source!");
--- 1339,1356 ----
  
  */
  void BaseSBModule::processEMAIL (SGMLTag * t, Error & err) {
    AssocArrayPtrDLList * data; // the stuff we are looping over
    AssocArray * aaptr;
    AssocArray * flags = &(t->flags());
    string from, to, subject, message;
+   string contenttype;
    FILE* outfile;
    int i, length;
  
    from = interpretString ((*flags)["FROM"]);
    subject = interpretString ((*flags)["SUBJECT"]);
    message = interpretString ((*flags)["MESSAGE"]);
+   contenttype = interpretString ((*flags)["CONTENTTYPE"]);
  
    if (! hasDataSource ( (SGMLTag *) t)) {
      err.addWarning ("EMAIL tag has no data source!");
***************
*** 1385,1400 ****
  
      // now dump it all to sendmail
      string command = (*config)["mailprog"] + " -oi -t >/dev/null";
      outfile = popen(command.c_str(),"w");
      if (outfile == NULL){
        err.addWarning ("unable to open sendmail");
        return;
      }
      fprintf(outfile,"From: %s\nSubject: %s\nTo: %s\n\n%s\n",
  	    from.c_str(),subject.c_str(),to.c_str(),message.c_str());
      pclose(outfile);
-   }
  #endif
  }
  
  /*
--- 1393,1418 ----
  
      // now dump it all to sendmail
      string command = (*config)["mailprog"] + " -oi -t >/dev/null";
+ #ifdef WIN32
+     outfile = _popen(command.c_str(),"w");
+ #else
      outfile = popen(command.c_str(),"w");
+ #endif
      if (outfile == NULL){
        err.addWarning ("unable to open sendmail");
        return;
      }
+     if (contenttype != ""){
+       fprintf(outfile,"Content-type: %s\n",contenttype.c_str());
+     }
      fprintf(outfile,"From: %s\nSubject: %s\nTo: %s\n\n%s\n",
  	    from.c_str(),subject.c_str(),to.c_str(),message.c_str());
+ #ifdef WIN32
+     _pclose(outfile);
+ #else
      pclose(outfile);
  #endif
+   }
  }
  
  /*
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/Check.cpp.html ./doc/ProgrammingSteelBlue/Check.cpp.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/Check.cpp.html	Tue Jan  4 23:22:07 2000
--- ./doc/ProgrammingSteelBlue/Check.cpp.html	Wed Sep 13 23:49:20 2000
***************
*** 1,4 ****
--- 1,9 ----
  
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  #include "Check.h"
  #include "string_util.h"
  #include "time_util.h"
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/DynamicFuncEvaluator.cpp.html ./doc/ProgrammingSteelBlue/DynamicFuncEvaluator.cpp.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/DynamicFuncEvaluator.cpp.html	Mon Jan 17 22:53:54 2000
--- ./doc/ProgrammingSteelBlue/DynamicFuncEvaluator.cpp.html	Wed Sep 13 23:49:20 2000
***************
*** 1,4 ****
--- 1,9 ----
  
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  #include "DynamicFuncEvaluator.h"
  
  #include "EnvObject.h"
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/EvalFunctions.cpp.html ./doc/ProgrammingSteelBlue/EvalFunctions.cpp.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/EvalFunctions.cpp.html	Fri Jun  9 15:39:32 2000
--- ./doc/ProgrammingSteelBlue/EvalFunctions.cpp.html	Sun Sep 24 23:07:56 2000
***************
*** 1,4 ****
--- 1,9 ----
  
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  #include "EnvObject.h"
  #include "Configuration.h"
  #include "Security.h"
***************
*** 33,38 ****
--- 38,49 ----
  extern fcgicout fcgi_cout;
  #endif
  
+ // Redefine popen and pclose for WIN32
+ #ifdef WIN32
+ #define popen(a,b) _popen(a,b)
+ #define pclose(a) _pclose(a)
+ #endif
+ 
  /**************************************************
  *  Date and Time Functions
  *
***************
*** 1528,1536 ****
  @arg $tags Tags/value pairs in the form "tag1 value1 tag2 value2"
  @arg $output_file Full path to output results of SteelBlue execution
  @arg $sbexecutable Full path to the SteelBlue executable
! @index Executes a command-line SteelBlue page (UNIX only)
  
! Executes a command-line SteelBlue page (UNIX only).  If the configuration
  option "SB-Executable" is not set, the fourth argument $sbexecutable
  is required to specify the full path the steelblue executable.  Tags and values
  passed into the second argument are set in the $this namespace of the
--- 1539,1547 ----
  @arg $tags Tags/value pairs in the form "tag1 value1 tag2 value2"
  @arg $output_file Full path to output results of SteelBlue execution
  @arg $sbexecutable Full path to the SteelBlue executable
! @index Executes a command-line SteelBlue page
  
! Executes a command-line SteelBlue page.  If the configuration
  option "SB-Executable" is not set, the fourth argument $sbexecutable
  is required to specify the full path the steelblue executable.  Tags and values
  passed into the second argument are set in the $this namespace of the
***************
*** 1544,1550 ****
  */
  void EVLF_ExecSteelBlue(string & ret_val, string argv[], string argn[], int argc,
                   Error & err_obj){
- #ifndef WIN32
    BETWEEN(ExecSteelBlue,3,4);
    string sb,cmd;
    char buf[1024];
--- 1555,1560 ----
***************
*** 1586,1592 ****
    }
    pclose(INFILE);
    fclose(OUTFILE);
- #endif
  }
  
  /*
--- 1596,1601 ----
***************
*** 1595,1603 ****
  @usage $return = execCmd($cmd)
  @arg $cmd Shell command to execute
  @arg $return STDOUT of the executed command
! @index Executes a shell command and captures STDOUT (UNIX only)
  
! Executes a shell command and captures STDOUT (UNIX only).
  @ex print(execCmd('date'));
  @ex 
  @ex \\ Prints the date returned by the shell command 'date'
--- 1604,1612 ----
  @usage $return = execCmd($cmd)
  @arg $cmd Shell command to execute
  @arg $return STDOUT of the executed command
! @index Executes a shell command and captures STDOUT
  
! Executes a shell command and captures STDOUT.
  @ex print(execCmd('date'));
  @ex 
  @ex \\ Prints the date returned by the shell command 'date'
***************
*** 1605,1611 ****
  
  void EVLF_ExecCmd(string & ret_val, string argv[], string argn[], int argc,
                   Error & err_obj){
- #ifndef WIN32
    EXACTLY(ExecCmd,1);
  
    char buf[1024];
--- 1614,1619 ----
***************
*** 1622,1628 ****
      ret_val += buf;      // Append to return value
    }
    pclose(INFILE);
- #endif
  }
  
  /*
--- 1630,1635 ----
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/MimeSender.cpp.html ./doc/ProgrammingSteelBlue/MimeSender.cpp.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/MimeSender.cpp.html	Tue Jan  4 23:22:07 2000
--- ./doc/ProgrammingSteelBlue/MimeSender.cpp.html	Wed Sep 13 23:49:20 2000
***************
*** 1,4 ****
--- 1,9 ----
  
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  #include "MimeSender.h"
  
  /* since the mime type may not be text based, don't send the 
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/Sender.cpp.html ./doc/ProgrammingSteelBlue/Sender.cpp.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/Sender.cpp.html	Wed Jun 14 22:18:16 2000
--- ./doc/ProgrammingSteelBlue/Sender.cpp.html	Wed Sep 13 23:49:20 2000
***************
*** 1,4 ****
--- 1,9 ----
  
+ /* -----------------------------------------------------------
+    Copyright (C) 2000 by Turner Consulting Group, Inc.
+    This is Open Source software.  See LICENSE.TXT for details.
+    ----------------------------------------------------------- */
+ 
  #include "Sender.h"
  
  #ifndef USE_FCGI
***************
*** 1578,1592 ****
  
    // now cout any vars we want set here  
    if (flags->contains("CLICK")) {
!     cout <<"+"<< http->toHTML("click") << "+" 
!          << http->toHTML((char *)(*flags)["CLICK"].c_str());
    }
    if (flags->contains("SET")) {
!     //    string tag = ((*flags)["SET"]).before ("=");
!     string tag = ((*flags)["SET"]).substr (0, ((*flags)["SET"]).find ("="));
!     //    string value =((*flags)["SET"]).after ("=");
!     string value = ((*flags)["SET"]).substr (((*flags)["SET"]).find("=") +1);
!     cout << "+" << http->toHTML( (char *) tag.c_str()) << "+" << http->toHTML( (char *) value.c_str());
    }
  
    //finally close the quote for the href
--- 1583,1606 ----
  
    // now cout any vars we want set here  
    if (flags->contains("CLICK")) {
!     cout <<"+"<< http->toHTML("click") << "+" << http->toHTML( (interpretString((*flags)["CLICK"]).c_str()) );
    }
+ 
+ 
    if (flags->contains("SET")) {
!     string set;
!     set = (*flags)["SET"];
!     while ( set.length() > 0 ) { 
!       string next_pair = set.substr(0, set.find(";"));
!       string tag = next_pair.substr (0, (next_pair.find ("=")));
!       string value = next_pair.substr (next_pair.find("=") +1);
!       cout << "+" << http->toHTML(tag.c_str()) << "+" << http->toHTML(interpretString (value).c_str());
!       if (set.find(";") != string::npos) {
! 	set = set.substr(set.find(";")+1);
!       } else {
! 	set = "";
!       }
!     }
    }
  
    //finally close the quote for the href
diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/funcindex.html ./doc/ProgrammingSteelBlue/funcindex.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/funcindex.html	Wed Jan 12 00:01:12 2000
--- ./doc/ProgrammingSteelBlue/funcindex.html	Sun Sep 24 23:07:57 2000
***************
*** 49,57 ****
  eval

  Executes a dynamic Eval command 
  execCmd

! Executes a shell command and captures STDOUT (UNIX only) 
  execSteelBlue

! Executes a command-line SteelBlue page (UNIX only) 
  fileExists

  Checks for existence and readability of a file 
  find

--- 49,57 ----
  eval

  Executes a dynamic Eval command 
  execCmd

! Executes a shell command and captures STDOUT 
  execSteelBlue

! Executes a command-line SteelBlue page 
  fileExists

  Checks for existence and readability of a file 
  find

diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/functions.html ./doc/ProgrammingSteelBlue/functions.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/functions.html	Fri Jun  9 15:39:33 2000
--- ./doc/ProgrammingSteelBlue/functions.html	Sun Sep 24 23:07:57 2000
***************
*** 508,514 ****
  \\ Stores the string "test" in "/foo.txt"
  
See Also: loadFile
Function name: execSteelBluebuilt in
Description:

  
! Executes a command-line SteelBlue page (UNIX only).  If the configuration
  option "SB-Executable" is not set, the fourth argument $sbexecutable
  is required to specify the full path the steelblue executable.  Tags and values
  passed into the second argument are set in the $this namespace of the
--- 508,514 ----
  \\ Stores the string "test" in "/foo.txt"
  
See Also: loadFile
Function name: execSteelBluebuilt in
Description:

  
! Executes a command-line SteelBlue page.  If the configuration
  option "SB-Executable" is not set, the fourth argument $sbexecutable
  is required to specify the full path the steelblue executable.  Tags and values
  passed into the second argument are set in the $this namespace of the
***************
*** 529,535 ****
  
  
Function name: execCmdbuilt in
Description:

  
! Executes a shell command and captures STDOUT (UNIX only).
  
  
Usage:
$return = execCmd($cmd)
  

--- 529,535 ----
  

  
Function name: execCmdbuilt in
Description:

  
! Executes a shell command and captures STDOUT.
  
  
Usage:
$return = execCmd($cmd)
  

diff -r -N --context ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/tags.html ./doc/ProgrammingSteelBlue/tags.html
*** ../SteelBlue-2.0b3/doc/ProgrammingSteelBlue/tags.html	Wed Jun 14 22:18:16 2000
--- ./doc/ProgrammingSteelBlue/tags.html	Wed Sep 13 23:49:20 2000
***************
*** 387,396 ****
  
Usage:
<EMAIL MESSAGE="message"
     [FROM="from"]
     [SUBJECT="subject"]
     (ARRAY="array"                               |
      SQL="SQL statement" [DB="connection_name"]  |
      VALUE="string or list" [SPLIT="delimiter"])>
! 
MESSAGE-Message to be sent
FROM-E-mail from whom the mail is sent
SUBJECT-Subject of the e-mail
ARRAY-Array name of e-mail recipients
SQL-Select statement for e-mail recipients
DB- DB connection name
VALUE-Single value or list of e-mail recipients
SPLIT-String used to separate elements in the value list
Example:
<EMAIL VALUE="user@localhost.com"
         SUBJECT="Welcome to SteelBlue"
         MESSAGE="Hi!">
  
See Also: Data sources 
DBCONNECTALL
 
Description:

--- 387,397 ----
  
Usage:
<EMAIL MESSAGE="message"
     [FROM="from"]
     [SUBJECT="subject"]
+    [CONTENTTYPE="contenttype"]
     (ARRAY="array"                               |
      SQL="SQL statement" [DB="connection_name"]  |
      VALUE="string or list" [SPLIT="delimiter"])>
! 
MESSAGE-Message to be sent
FROM-E-mail from whom the mail is sent
SUBJECT-Subject of the e-mail
CONTENTTYPE-Specify a different content-type for the e-mail
ARRAY-Array name of e-mail recipients
SQL-Select statement for e-mail recipients
DB- DB connection name
VALUE-Single value or list of e-mail recipients
SPLIT-String used to separate elements in the value list
Example:
<EMAIL VALUE="user@localhost.com"
         SUBJECT="Welcome to SteelBlue"
         MESSAGE="Hi!">
  
See Also: Data sources 
DBCONNECTALL
 
Description:

diff -r -N --context ../SteelBlue-2.0b3/src/BaseSBModule.cpp ./src/BaseSBModule.cpp
*** ../SteelBlue-2.0b3/src/BaseSBModule.cpp	Thu Jun 22 00:33:20 2000
--- ./src/BaseSBModule.cpp	Sun Sep 24 23:07:42 2000
***************
*** 1309,1314 ****
--- 1309,1315 ----
  @usage 
***************
*** 1316,1321 ****
--- 1317,1323 ----
  @IFLAG MESSAGE Message to be sent
  @IFLAG FROM E-mail from whom the mail is sent
  @IFLAG SUBJECT Subject of the e-mail
+ @IFLAG CONTENTTYPE Specify a different content-type for the e-mail
  @FLAG ARRAY Array name of e-mail recipients
  @IFLAG SQL Select statement for e-mail recipients
  @IFLAG DB  DB connection name
***************
*** 1336,1352 ****
  
  */
  void BaseSBModule::processEMAIL (SGMLTag * t, Error & err) {
- #ifndef WIN32
    AssocArrayPtrDLList * data; // the stuff we are looping over
    AssocArray * aaptr;
    AssocArray * flags = &(t->flags());
    string from, to, subject, message;
    FILE* outfile;
    int i, length;
  
    from = interpretString ((*flags)["FROM"]);
    subject = interpretString ((*flags)["SUBJECT"]);
    message = interpretString ((*flags)["MESSAGE"]);
  
    if (! hasDataSource ( (SGMLTag *) t)) {
      err.addWarning ("EMAIL tag has no data source!");
--- 1338,1355 ----
  
  */
  void BaseSBModule::processEMAIL (SGMLTag * t, Error & err) {
    AssocArrayPtrDLList * data; // the stuff we are looping over
    AssocArray * aaptr;
    AssocArray * flags = &(t->flags());
    string from, to, subject, message;
+   string contenttype;
    FILE* outfile;
    int i, length;
  
    from = interpretString ((*flags)["FROM"]);
    subject = interpretString ((*flags)["SUBJECT"]);
    message = interpretString ((*flags)["MESSAGE"]);
+   contenttype = interpretString ((*flags)["CONTENTTYPE"]);
  
    if (! hasDataSource ( (SGMLTag *) t)) {
      err.addWarning ("EMAIL tag has no data source!");
***************
*** 1389,1404 ****
  
      // now dump it all to sendmail
      string command = (*config)["mailprog"] + " -oi -t >/dev/null";
      outfile = popen(command.c_str(),"w");
      if (outfile == NULL){
        err.addWarning ("unable to open sendmail");
        return;
      }
      fprintf(outfile,"From: %s\nSubject: %s\nTo: %s\n\n%s\n",
  	    from.c_str(),subject.c_str(),to.c_str(),message.c_str());
      pclose(outfile);
-   }
  #endif
  }
  
  /*
--- 1392,1417 ----
  
      // now dump it all to sendmail
      string command = (*config)["mailprog"] + " -oi -t >/dev/null";
+ #ifdef WIN32
+     outfile = _popen(command.c_str(),"w");
+ #else
      outfile = popen(command.c_str(),"w");
+ #endif
      if (outfile == NULL){
        err.addWarning ("unable to open sendmail");
        return;
      }
+     if (contenttype != ""){
+       fprintf(outfile,"Content-type: %s\n",contenttype.c_str());
+     }
      fprintf(outfile,"From: %s\nSubject: %s\nTo: %s\n\n%s\n",
  	    from.c_str(),subject.c_str(),to.c_str(),message.c_str());
+ #ifdef WIN32
+     _pclose(outfile);
+ #else
      pclose(outfile);
  #endif
+   }
  }
  
  /*
diff -r -N --context ../SteelBlue-2.0b3/src/DBHandler.cpp ./src/DBHandler.cpp
*** ../SteelBlue-2.0b3/src/DBHandler.cpp	Thu Jun 22 00:33:24 2000
--- ./src/DBHandler.cpp	Sun Sep 24 23:07:42 2000
***************
*** 43,63 ****
  int handle (DBError & dbe, Error & e) {
    string installedHandler = userdata->getVar ("$installed{handler}");
  
- #ifndef WIN32
    // check to see if we should send an email
    if ( ((*config)["errorsto"]).length() != 0) {
      FILE* outfile;
      // now dump it all to sendmail
      string command = (*config)["mailprog"] + " -oi -t ";
      outfile = popen(command.c_str(),"w");
      if (outfile != NULL){
        fprintf(outfile,"From: SteelBlue\nSubject: Error Encountered\nTo: %s\n\n",
  	      ((*config)["errorsto"]).c_str());
        fprintf(outfile, "Error reported as: %s\n", (dbe.toString()).c_str());
        pclose(outfile);
      }
    }
- #endif
  
    // now lets log the error
    logObject->add ("sqlerrorlog", dbe.toString() + "\n--------------------\n");
--- 43,69 ----
  int handle (DBError & dbe, Error & e) {
    string installedHandler = userdata->getVar ("$installed{handler}");
  
    // check to see if we should send an email
    if ( ((*config)["errorsto"]).length() != 0) {
      FILE* outfile;
      // now dump it all to sendmail
      string command = (*config)["mailprog"] + " -oi -t ";
+ #ifdef WIN32
+     outfile = _popen(command.c_str(),"w");
+ #else
      outfile = popen(command.c_str(),"w");
+ #endif
      if (outfile != NULL){
        fprintf(outfile,"From: SteelBlue\nSubject: Error Encountered\nTo: %s\n\n",
  	      ((*config)["errorsto"]).c_str());
        fprintf(outfile, "Error reported as: %s\n", (dbe.toString()).c_str());
+ #ifdef WIN32
+       _pclose(outfile);
+ #else
        pclose(outfile);
+ #endif
      }
    }
  
    // now lets log the error
    logObject->add ("sqlerrorlog", dbe.toString() + "\n--------------------\n");
diff -r -N --context ../SteelBlue-2.0b3/src/EvalFunctions.cpp ./src/EvalFunctions.cpp
*** ../SteelBlue-2.0b3/src/EvalFunctions.cpp	Thu Jun 22 00:33:25 2000
--- ./src/EvalFunctions.cpp	Sun Sep 24 23:07:42 2000
***************
*** 37,42 ****
--- 37,48 ----
  extern fcgicout fcgi_cout;
  #endif
  
+ // Redefine popen and pclose for WIN32
+ #ifdef WIN32
+ #define popen(a,b) _popen(a,b)
+ #define pclose(a) _pclose(a)
+ #endif
+ 
  /**************************************************
  *  Date and Time Functions
  *
***************
*** 1532,1540 ****
  @arg $tags Tags/value pairs in the form "tag1 value1 tag2 value2"
  @arg $output_file Full path to output results of SteelBlue execution
  @arg $sbexecutable Full path to the SteelBlue executable
! @index Executes a command-line SteelBlue page (UNIX only)
  
! Executes a command-line SteelBlue page (UNIX only).  If the configuration
  option "SB-Executable" is not set, the fourth argument $sbexecutable
  is required to specify the full path the steelblue executable.  Tags and values
  passed into the second argument are set in the $this namespace of the
--- 1538,1546 ----
  @arg $tags Tags/value pairs in the form "tag1 value1 tag2 value2"
  @arg $output_file Full path to output results of SteelBlue execution
  @arg $sbexecutable Full path to the SteelBlue executable
! @index Executes a command-line SteelBlue page
  
! Executes a command-line SteelBlue page.  If the configuration
  option "SB-Executable" is not set, the fourth argument $sbexecutable
  is required to specify the full path the steelblue executable.  Tags and values
  passed into the second argument are set in the $this namespace of the
***************
*** 1548,1554 ****
  */
  void EVLF_ExecSteelBlue(string & ret_val, string argv[], string argn[], int argc,
                   Error & err_obj){
- #ifndef WIN32
    BETWEEN(ExecSteelBlue,3,4);
    string sb,cmd;
    char buf[1024];
--- 1554,1559 ----
***************
*** 1590,1596 ****
    }
    pclose(INFILE);
    fclose(OUTFILE);
- #endif
  }
  
  /*
--- 1595,1600 ----
***************
*** 1599,1607 ****
  @usage $return = execCmd($cmd)
  @arg $cmd Shell command to execute
  @arg $return STDOUT of the executed command
! @index Executes a shell command and captures STDOUT (UNIX only)
  
! Executes a shell command and captures STDOUT (UNIX only).
  @ex print(execCmd('date'));
  @ex 
  @ex \\ Prints the date returned by the shell command 'date'
--- 1603,1611 ----
  @usage $return = execCmd($cmd)
  @arg $cmd Shell command to execute
  @arg $return STDOUT of the executed command
! @index Executes a shell command and captures STDOUT
  
! Executes a shell command and captures STDOUT.
  @ex print(execCmd('date'));
  @ex 
  @ex \\ Prints the date returned by the shell command 'date'
***************
*** 1609,1615 ****
  
  void EVLF_ExecCmd(string & ret_val, string argv[], string argn[], int argc,
                   Error & err_obj){
- #ifndef WIN32
    EXACTLY(ExecCmd,1);
  
    char buf[1024];
--- 1613,1618 ----
***************
*** 1626,1632 ****
      ret_val += buf;      // Append to return value
    }
    pclose(INFILE);
- #endif
  }
  
  /*
--- 1629,1634 ----
diff -r -N --context ../SteelBlue-2.0b3/src/PublicLogin.cpp ./src/PublicLogin.cpp
*** ../SteelBlue-2.0b3/src/PublicLogin.cpp	Thu Jun 22 00:33:32 2000
--- ./src/PublicLogin.cpp	Wed Sep 13 23:04:51 2000
***************
*** 13,19 ****
    string pwdAttempt;
    char uname[255];
    int name_found = 0;
-   time_t t;
    int r;
  
    valid = 0;
--- 13,18 ----
***************
*** 23,30 ****
    while(name_found == 0){
      Result * res;
      AssocArray * row;
-     t = time (&t);  
-     srand(t);
      r = rand();
      sprintf (uname, "Guest_%d", r);
      (http->data)["username"] = uname;
--- 22,27 ----
diff -r -N --context ../SteelBlue-2.0b3/src/install/SteelBlue_mysql.spec ./src/install/SteelBlue_mysql.spec
*** ../SteelBlue-2.0b3/src/install/SteelBlue_mysql.spec	Sat Aug 12 22:23:44 2000
--- ./src/install/SteelBlue_mysql.spec	Sun Sep 24 22:26:40 2000
***************
*** 1,6 ****
  Summary: The SteelBlue appserver install for MySQL
  Name: SteelBlue
! Version: 2.0b3
  Release: mysql_1
  Vendor: Turner Consulting Group
  Copyright: commercial
--- 1,6 ----
  Summary: The SteelBlue appserver install for MySQL
  Name: SteelBlue
! Version: 2.0.0
  Release: mysql_1
  Vendor: Turner Consulting Group
  Copyright: commercial
***************
*** 9,15 ****
  URL: http://www.steelblue.com/
  Packager: Robert Buccigrossi 
  Prefix: /opt
! Source: SteelBlue_2.0b3.tar.gz
  patch0: SteelBlue_mysql.patch
  %description
  A Web application server designed to integrate relational database
--- 9,15 ----
  URL: http://www.steelblue.com/
  Packager: Robert Buccigrossi 
  Prefix: /opt
! Source: SteelBlue_2.0.0.tar.gz
  patch0: SteelBlue_mysql.patch
  %description
  A Web application server designed to integrate relational database
diff -r -N --context ../SteelBlue-2.0b3/src/install/SteelBlue_mysql_auto.spec ./src/install/SteelBlue_mysql_auto.spec
*** ../SteelBlue-2.0b3/src/install/SteelBlue_mysql_auto.spec	Sat Aug 12 22:23:44 2000
--- ./src/install/SteelBlue_mysql_auto.spec	Sun Sep 24 22:26:40 2000
***************
*** 1,6 ****
  Summary: The SteelBlue appserver install for MySQL
  Name: SteelBlue
! Version: 2.0b3
  Release: mysql_auto_1
  Vendor: Turner Consulting Group
  Copyright: commercial
--- 1,6 ----
  Summary: The SteelBlue appserver install for MySQL
  Name: SteelBlue
! Version: 2.0.0
  Release: mysql_auto_1
  Vendor: Turner Consulting Group
  Copyright: commercial
***************
*** 9,15 ****
  URL: http://www.steelblue.com/
  Packager: Robert Buccigrossi 
  Prefix: /opt
! Source: SteelBlue_2.0b3.tar.gz
  patch0: SteelBlue_mysql_auto.patch
  %description
  A Web application server designed to integrate relational database
--- 9,15 ----
  URL: http://www.steelblue.com/
  Packager: Robert Buccigrossi 
  Prefix: /opt
! Source: SteelBlue_2.0.0.tar.gz
  patch0: SteelBlue_mysql_auto.patch
  %description
  A Web application server designed to integrate relational database
***************
*** 63,69 ****
  install -v --mode=444 --group=$GROUP --owner=$OWNER /opt/steelblue/CheckUtils.js $HTDOCS_DIR/scripts
  
  mysqladmin create STEELBLUE
! /usr/bin/mysql -u root STEELBLUE < /usr/doc/SteelBlue-2.0b3/schema/mySQL.schema.sql
  
  %postun
  PATH=${PATH}:/usr/bin:/usr/local/bin
--- 63,69 ----
  install -v --mode=444 --group=$GROUP --owner=$OWNER /opt/steelblue/CheckUtils.js $HTDOCS_DIR/scripts
  
  mysqladmin create STEELBLUE
! /usr/bin/mysql -u root STEELBLUE < /usr/doc/SteelBlue-2.0.0/schema/mySQL.schema.sql
  
  %postun
  PATH=${PATH}:/usr/bin:/usr/local/bin
diff -r -N --context ../SteelBlue-2.0b3/src/install/SteelBlue_psql.spec ./src/install/SteelBlue_psql.spec
*** ../SteelBlue-2.0b3/src/install/SteelBlue_psql.spec	Sat Aug 12 22:23:44 2000
--- ./src/install/SteelBlue_psql.spec	Sun Sep 24 22:26:40 2000
***************
*** 1,6 ****
  Summary: The SteelBlue appserver install for Postgres
  Name: SteelBlue
! Version: 2.0b3
  Release: psql_1
  Vendor: Turner Consulting Group
  Copyright: commercial
--- 1,6 ----
  Summary: The SteelBlue appserver install for Postgres
  Name: SteelBlue
! Version: 2.0.0
  Release: psql_1
  Vendor: Turner Consulting Group
  Copyright: commercial
***************
*** 9,15 ****
  URL: http://www.steelblue.com/
  Packager: Robert Buccigrossi 
  Prefix: /opt
! Source: SteelBlue_2.0b3.tar.gz
  patch0: SteelBlue_psql.patch
  %description
  A Web application server designed to integrate relational database
--- 9,15 ----
  URL: http://www.steelblue.com/
  Packager: Robert Buccigrossi 
  Prefix: /opt
! Source: SteelBlue_2.0.0.tar.gz
  patch0: SteelBlue_psql.patch
  %description
  A Web application server designed to integrate relational database