Changeset 83976e in git

Timestamp:

Feb 10, 2012, 2:20:06 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

26acab557e4ad73e2c8ba02fa1ad998773365fff

Parents:

66e25f2bbb3969a1769c9710fee12d7ca6262dd7

git-author:

Martin Lee <martinlee84@web.de>2012-02-10 14:20:06+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-02-17 15:45:14+01:00

Message:

chg: enable setting of gftables location by program

courtesy of "Grayson, Daniel R." <dan@math.uiuc.edu>

File:

• factory/gfops.cc (modified) (2 diffs)

factory/gfops.cc

@@ -64 +64 @@
 }
 
+static char *gftable_dir;
+extern "C" {
+  void set_gftable_dir(char *d){
+    gftable_dir = d;
+  }
+}
+
 static void gf_get_table ( int p, int n )
 {
@@ -94 +101 @@
 
     // try to open file
+    char *gffilename;
+    FILE * inputfile;
+    if (gftable_dir)
+    {
+      sprintf( buffer, "/gftable.%d.%d", p, n );
+      gffilename = (char *)malloc(strlen(gftable_dir) + strlen(buffer) + 1);
+      STICKYASSERT(gffilename,"out of memory");
+      strcpy(gffilename,gftable_dir);
+      strcat(gffilename,buffer);
+      inputfile = fopen( gffilename, "r" );
+    }
+    else
+    {
 #ifndef SINGULAR
-    sprintf( buffer, GFTABLEDIR "/%d", q);
-    FILE * inputfile = fopen( buffer, "r" );
+      sprintf( buffer, GFTABLEDIR "/gftable.%d.%d", p, n );
+      gffilename = buffer;
+      inputfile = fopen( buffer, "r" );
 #else
-    int check= sprintf( buffer, "gftables/%d", q );
-    FILE * inputfile = feFopen( buffer, "r" );
+      sprintf( buffer, "gftables/%d", q );
+      gffilename = buffer;
+      inputfile = feFopen( buffer, "r" );
 #endif
-    STICKYASSERT( inputfile, "can not open GF(q) table" );
+    }
+    if (!inputfile)
+    {
+      fprintf(stderr,"can not open GF(q) addition table: %s\n",gffilename);
+      STICKYASSERT(inputfile, "can not open GF(q) table");
+    }
 
     // read ID