===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- OpenXM/src/kan96xx/Kan/kanExport0.c	2002/02/24 10:27:18	1.8
+++ OpenXM/src/kan96xx/Kan/kanExport0.c	2003/06/26 08:14:46	1.11
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.7 2001/05/04 01:06:23 takayama Exp $  */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.10 2002/11/04 10:53:55 takayama Exp $  */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -1537,6 +1537,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5)
   newRingp->schreyer = 0;
   newRingp->gbListTower = NULL;
   newRingp->outputOrder = outputVars;
+  newRingp->weightedHomogenization = 0;
+  newRingp->degreeShiftSize = 0;
 
   if (ob5.tag != Sarray || (getoaSize(ob5) % 2) != 0) {
     errorKan1("%s\n","[(keyword) value (keyword) value ....] should be given.");
@@ -1583,6 +1585,31 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5)
           errorKan1("%s\n","A name should be given. (ringName)");
         }
         ringName = KopString(getoa(ob5,i+1));
+      } else if (strcmp(KopString(getoa(ob5,i)),"weightedHomogenization") == 0) {
+        if (getoa(ob5,i+1).tag != Sinteger) {
+          errorKan1("%s\n","A integer should be given. (weightedHomogenization)");
+        }
+        newRingp->weightedHomogenization = KopInteger(getoa(ob5,i+1));
+      } else if (strcmp(KopString(getoa(ob5,i)),"degreeShift") == 0) {
+        if (getoa(ob5,i+1).tag != Sarray) {
+          errorKan1("%s\n","An array should be given. (degreeShift)");
+        }
+        {
+          struct object ods;
+          int dssize,k;
+          ods=getoa(ob5,i+1);
+          dssize = getoaSize(ods);
+          newRingp->degreeShiftSize = dssize;
+          newRingp->degreeShift = (int *) sGC_malloc(sizeof(int)*(dssize+1));
+          if (newRingp->degreeShift == NULL) errorKan1("%s\n","No more memory.");
+          for (k=0; k<dssize; k++) {
+            if (getoa(ods,k).tag == SuniversalNumber) {
+              (newRingp->degreeShift)[k] = coeffToInt(getoa(ods,k).lc.universalNumber);
+            }else{
+              (newRingp->degreeShift)[k] = KopInteger(getoa(ods,k));
+            }
+          }
+        }
       } else {
         errorKan1("%s\n","Unknown keyword to set_up_ring@");
       }
@@ -2675,6 +2702,7 @@ errorKan1(str,message)
   extern int GotoP;
   extern int ErrorMessageMode;
   char tmpc[1024];
+  cancelAlarm();
   if (ErrorMessageMode == 1 || ErrorMessageMode == 2) {
     sprintf(tmpc,"\nERROR(kanExport[0|1].c): ");
     if (strlen(message) < 900) {