===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v
retrieving revision 1.17
retrieving revision 1.24
diff -u -p -r1.17 -r1.24
--- OpenXM/src/kan96xx/plugin/oxmisc2.c	2002/11/08 14:18:02	1.17
+++ OpenXM/src/kan96xx/plugin/oxmisc2.c	2004/09/17 08:46:10	1.24
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.16 2002/11/08 02:54:12 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.23 2004/09/17 07:27:28 takayama Exp $ */
 #include <stdio.h>
 #include "ox_kan.h"
 #include "oxmisc2.h"   /* This file requires sm1 object description. */
@@ -226,6 +226,14 @@ int oxReq(oxclientp client,int func,struct object ob)
     oxReqExecuteFunction(client->datafp2,KopString(ob));
     client->dstate = DSTATE_ANY;
     break;
+  case SM_executeFunctionWithOptionalArgument:
+    if (ob.tag != Sdollar) {
+      errorOxmisc2("SM_executeFunctionWithOptionalArgument : the argument must be a string.");
+      return(-1);
+    }
+    oxReqExecuteFunctionWithOptionalArgument(client->datafp2,KopString(ob));
+    client->dstate = DSTATE_ANY;
+    break;
   case SM_popString:
     oxReqPopString(client->datafp2);
     client->dstate = DSTATE_ANY;
@@ -254,6 +262,10 @@ int oxReq(oxclientp client,int func,struct object ob)
     oxReqSingleOperand(client->datafp2,SM_dupErrors);
     client->dstate = DSTATE_ANY;
     break;
+  case SM_pushCMOtag:
+    oxReqSingleOperand(client->datafp2,SM_pushCMOtag);
+    client->dstate = DSTATE_ANY;
+    break;
   default:
     fprintf(MyErrorOut,"func=%d ",func);
     errorOxmisc2("This function is not implemented.");
@@ -265,10 +277,13 @@ int oxReq(oxclientp client,int func,struct object ob)
 
 struct object KoxCreateClient(struct object ip,
                               struct object portStream,
-                              struct object portControl)
+                              struct object portControl,struct object pass)
 {
   struct object rob;
   oxclientp client;
+  char *passControl; char *passData;
+  struct object tob;
+  passControl = NULL; passData = NULL;
   rob.tag = Snull;
   if (ip.tag != Sdollar) {
     errorOxmisc2("KoxCreateClient(): The first argument must be a hostname given by a string.");
@@ -294,7 +309,25 @@ struct object KoxCreateClient(struct object ip,
     errorOxmisc2("KoxCreateClient(): The third argument must be a port number given in an integer.");
     return(rob);
   }
-  client = oxCreateClient(KopString(ip),KopInteger(portStream),KopInteger(portControl));
+  if (pass.tag == Sarray) {
+    if (getoaSize(pass) < 2) {
+	  errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings.");
+	  return rob;
+	}
+    tob = getoa(pass,0);
+	if (tob.tag != Sdollar) {
+	  errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings.");
+	  return rob;
+	}
+    passControl = KopString(tob);
+    tob = getoa(pass,1);
+	if (tob.tag != Sdollar) {
+	  errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings.");
+	  return rob;
+	}
+    passData = KopString(tob);
+  }
+  client = oxCreateClient(KopString(ip),KopInteger(portStream),KopInteger(portControl),passControl,passData);
   if (client == NULL) {
     errorOxmisc2("KoxCreateClient(): Open error.");
     return(rob);
@@ -648,6 +681,63 @@ struct object KoxWatch(struct object client,struct obj
   return(KpoInteger(ans));
 }
 
+struct object KoxLog(struct object client,struct object in,struct object out)
+{
+  int ans,k;
+  static oxclientp cc1 = NULL;
+  struct object rob;
+  rob.tag = Snull;
+  if (cc1 == NULL) {
+    cc1 = (oxclientp) mymalloc(sizeof(oxclient));
+    if (cc1 == NULL) {
+      errorOxmisc2("KoxLog(): no more memory.");
+      return(rob);
+    }
+    oxInitClient(cc1);
+  }
+
+  if (oxObjectToClient(client,cc1) == -1) return(rob);
+  if (cc1 == NULL) {
+    errorOxmisc2("KoxLog(): the first argument must be a client object.");
+    return(rob);
+  }
+
+  if (in.tag != Sfile) {
+	errorOxmisc2("KoxLog(): the second argument is not a file object.");
+	return rob;
+  }
+  if (out.tag != Sfile) {
+	errorOxmisc2("KoxLog(): the third argument is not a file object.");
+	return rob;
+  }
+  k = fp2log(cc1->datafp2,in.rc.file,out.rc.file);
+  fputc(cc1->engineByteOrder,out.rc.file); /* Output engineByteOrder. */
+  /* synchronize cc1 and client. */
+  oxClientToObject(cc1,client);
+
+  return(KpoInteger(ans));
+}
+
+struct object KoxLogStop(struct object client) {
+  static oxclientp cc1 = NULL;
+  struct object rob;
+  rob.tag = Snull;
+  if (cc1 == NULL) {
+    cc1 = (oxclientp) mymalloc(sizeof(oxclient));
+    if (cc1 == NULL) {
+      errorOxmisc2("KoxLog(): no more memory.");
+      return(rob);
+    }
+    oxInitClient(cc1);
+  }
+
+  if (oxObjectToClient(client,cc1) == -1) return(rob);
+  if (cc1 == NULL) {
+    errorOxmisc2("KoxLog(): the first argument must be a client object.");
+    return(rob);
+  }
+  return(KpoInteger(fp2stopLog(cc1->datafp2)));  
+}
     
 struct object KoxCloseClient(struct object client) {
   oxclientp cc1 = NULL;
@@ -709,6 +799,7 @@ static int cmoCheck00(struct object obj,int cmo[], int
     /* typeTrans[Spoly] = CMO_DMS;  */
     typeTrans[Spoly] = CMO_DISTRIBUTED_POLYNOMIAL; 
     typeTrans[Sdouble] = CMO_64BIT_MACHINE_DOUBLE;
+	typeTrans[SrationalFunction] = CMO_RATIONAL;
     typeTrans[CLASSNAME_ERROR_PACKET]   = CMO_ERROR2;
     typeTrans[CLASSNAME_mathcap] = CMO_MATHCAP; 
     typeTrans[CLASSNAME_indeterminate] = CMO_INDETERMINATE; 
@@ -953,6 +1044,7 @@ struct object KoxCreateClient2(struct object peer,
   int fdStream, portStream, fdControl, portControl;
   int i;
   struct object ob1;
+  struct object opassControl, opassData;
   rob.tag = Snull;
   if (peer.tag != Sarray) {
     errorOxmisc2("KoxCreateClient2(): The first argument must be an array [fdStream, portStream, fdControl, portControl]");
@@ -976,12 +1068,22 @@ struct object KoxCreateClient2(struct object peer,
   if (ipmask.tag != Sinteger) {
     errorOxmisc2("KoxCreateClient2(): ipmask must be an integer.");
   }
-  if (pass.tag != Sdollar) {
-    errorOxmisc2("KoxCreateClient2(): pass must be a string.");
+  if (pass.tag == Sdollar) {
+    opassControl = pass; opassData = pass;
+  }else if (pass.tag == Sarray) {
+    if (getoaSize(pass) < 2) errorOxmisc2("KoxCreateClient2: #passArray < 2.");
+    opassControl = getoa(pass,0);
+    opassData = getoa(pass,1);
+  }else{
+    errorOxmisc2("KoxCreateClient2(): pass must be a string or an array.");
   }
+  if ((opassControl.tag != Sdollar) || (opassData.tag != Sdollar)) {
+    errorOxmisc2("KoxCreateClient2(): opassControl or opassData must be a string.");
+  }
 
   client = oxCreateClient2(fdStream, portStream, fdControl, portControl,
-                           KopInteger(ipmask), KopString(pass));
+                           KopInteger(ipmask),
+                           KopString(opassControl),KopString(opassData));
   if (client == NULL) {
     errorOxmisc2("KoxCreateClient2(): Open error.");
     return(rob);