===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/primdec_mod,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM_contrib2/asir2000/lib/primdec_mod	2003/04/20 07:50:45	1.3
+++ OpenXM_contrib2/asir2000/lib/primdec_mod	2003/04/21 01:44:31	1.5
@@ -4,11 +4,11 @@ extern T_GRF,T_INT,T_PD,T_MP$
 extern BuchbergerMinipoly,PartialDecompByLex,ParallelMinipoly$
 extern B_Win,D_Win$
 extern COMMONCHECK_SF,CID_SF$
-extern FFF_LOADED_BY_PRIMDEC_MOD$
-extern GR_LOADED_BY_PRIMDEC_MOD$
+extern LIBRARY_GR_LOADED$
+extern LIBRARY_FFF_LOADED$
 
-if(!FFF_LOADED_BY_PRIMDEC_MOD) load("fff"); else ; FFF_LOADED_BY_PRIMDEC_MOD = 1$
-if(!GR_LOADED_BY_PRIMDEC_MOD) load("gr"); else ; GR_LOADED_BY_PRIMDEC_MOD = 1$
+if(!LIBRARY_FFF_LOADED) load("fff"); else ; LIBRARY_FFF_LOADED = 1$
+if(!LIBRARY_GR_LOADED) load("gr"); else ; LIBRARY_GR_LOADED = 1$
 
 /*==============================================*/
 /*  prime decomposition of ideals over 		*/
@@ -342,7 +342,7 @@ def coefficientfrobeniuskernel_main(Poly)
 	Vars=vars(Poly);
 	QP=dp_ptod(Poly,Vars);
 	ANS=0;
-	FOrd=deg(setmod_ff()[1],x);
+	FOrd=deg(setmod_ff()[1],var(setmod_ff()[1]));
 	Char=setmod_ff()[0];
 	Pow=Char^(FOrd-1);
 
@@ -2083,13 +2083,13 @@ def convertsmallfield(PP,VSet,Ord)
 	dp_ord(Ord);
 	NVSet=length(VSet);
 	Char=setmod_ff()[0];
-	ExtDeg=deg(setmod_ff()[1],x);
+	ExtDeg=deg(setmod_ff()[1],var(setmod_ff()[1]));
 
-	NewV=pg;	
+	NewV=pgpgpgpgpgpgpg;	
 	MPP=map(monic_hc,PP,VSet);
 	MPP=map(sfptopsfp,MPP,NewV);
 
-	MinPoly=subst(setmod_ff()[1],x,NewV);
+	MinPoly=subst(setmod_ff()[1],var(setmod_ff()[1]),NewV);
 	XSet=cons(NewV,VSet);
 
 	Ord1=[[0,1],[Ord,NVSet]];
@@ -2109,7 +2109,7 @@ def checkgaloisorbit(PP,VSet,Ord,Flag)
 	{
 	NPP=length(PP);
 	TmpPP=PP;
-	ExtDeg=deg(setmod_ff()[1],x);
+	ExtDeg=deg(setmod_ff()[1],var(setmod_ff()[1]));
 	
 	ANS=[];
 	BNS=[];