===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/primdec,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM_contrib2/asir2000/lib/primdec	2000/08/22 05:04:22	1.3
+++ OpenXM_contrib2/asir2000/lib/primdec	2003/10/20 00:58:47	1.5
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/lib/primdec,v 1.2 2000/08/21 08:31:42 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/lib/primdec,v 1.4 2001/01/15 05:18:20 noro Exp $ 
 */
 /*   Primary decomposition & Radical decomposition program      */
 /*   written by T.Shimoyama, Fujitsu Lab. Date: 1995.10.12      */
@@ -64,8 +64,12 @@ COMMONCHECK	if 1 : redundancy check by intersection (i
 SELECTFLAG	selection strategy of separators (0 -- 3)
 */
 
-if (vtype(minipoly) != 3) load("gr")$$
+if (!module_definedp("gr")) load("gr")$$
+module primdec $  
+  /* Empty for now. It will be used in a future. */
+endmodule$
 
+
 #define GR(R,F,V,O) T2=newvect(4,time());R=dp_gr_main(F,V,0,0,O);GRTIME+=newvect(4,time())-T2;
 #define HGRM(R,F,V,O) T2=newvect(4,time());R=dp_gr_main(F,V,1,1,O);GRTIME+=newvect(4,time())-T2;
 #define NF(R,IN,F,G,O) T2=newvect(4,time());R=dp_nf(IN,F,G,O);NFTIME+=newvect(4,time())-T2;
@@ -297,9 +301,10 @@ def primadec_main(F,REMS,H,VL)
 def isolated(IP,F,GF,RA,H,SC,VL)
 {
 	T0 = newvect(4,time());
-	if ( RA[0] == "begin" )
+	if ( RA[0] == "begin" ) {
 		PD = primedec_main([RA[1]],VL);
-	else if ( RA[0] == "ext" || RA[0] == "sep" ) {
+		PD = map(dp_gr_main,PD,VL,0,1,PRIMEORD); /* XXX */
+	} else if ( RA[0] == "ext" || RA[0] == "sep" ) {
 		if ( RA[0] == "sep" )
 			T = prime_irred(idealsav(RA[1]),VL);
 		else