Merge pull request #345 from olebole/tbtables

NOIRLAB: Clean up tbtables package
iraf-community · Jan 28, 2024 · 81fde24 · 81fde24
2 parents 7f50182 + c0f6337
commit 81fde24
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 815 deletions.
diff --git a/pkg/tbtables/mkpkg b/pkg/tbtables/mkpkg
@@ -25,7 +25,6 @@
 #	Phil Hodge, 31-July-2001, move @cfitsio.
 
 
-
 update:
         $checkout libtbtables.a lib$
         $update   libtbtables.a
@@ -236,15 +235,7 @@ libtbtables.a:
 	tbnparse.x	<ctype.h> <ctotok.h> <tbset.h>
 	@selector
 
-#	$ifdef (SPPFITSIO)
-	    $echo "NOTE:  SPP FITSIO will be used for FITS tables."
-	    tbfhp_f.x	<tbset.h> tbtables.h tblfits.h
-	    @fitsio
-#	$else
-#	    $echo "NOTE:  CFITSIO will be used for FITS tables."
-#	    $echo "NOTE:  CFITSIO does not support IRAF networking."
-#	    tbfhp.x	<tbset.h> tbtables.h tblfits.h
-#	    tbfxff.c	"cfitsio/fitsio.h" fitsio_spp.h underscore.h
-#	    @cfitsio
-#	$endif
+	$echo "NOTE:  SPP FITSIO will be used for FITS tables."
+	tbfhp_f.x	<tbset.h> tbtables.h tblfits.h
+	@fitsio
 	;
diff --git a/pkg/tbtables/selector/trsopen.x b/pkg/tbtables/selector/trsopen.x
@@ -358,7 +358,7 @@ int	nc, ic, index, delta, size
 
 pointer	sp, token, ptr, valbuf
 
-string	notnum   "not a number"
+#string	notnum   "not a number"
 string	noroom   "expression too complex"
 string	nostop   "trailing quote not found"
 

diff --git a/pkg/tbtables/tbcrcd.x b/pkg/tbtables/tbcrcd.x
@@ -169,6 +169,8 @@ int	clen		# length in char of entire entry
 int	value		# this will be returned
 int	tbeszt()	# size in char of one element of type text
 
+int     sz
+
 begin
 	clen = COL_LEN(cptr)
 
@@ -204,7 +206,11 @@ begin
 		value = 1
 
 	default:
-	    value = clen / tbeszt (cptr)	# char string
+            sz = tbeszt (cptr)			# char string
+            if (sz > 0)
+	        value = clen / sz
+	    else
+	        value = 0
 	}
 
 	return (value)

diff --git a/pkg/tbtables/tbfnew.x b/pkg/tbtables/tbfnew.x
@@ -79,7 +79,7 @@ bool	simple, extend
 int	status		# zero is OK
 int	hdu		# HDU number (zero is primary header)
 int	fd[2]		# unit number for FITS file; cfitsio pointer
-double	dfd		# to force alignment of fd
+#double	dfd		# to force alignment of fd
 #equivalence (fd, dfd)	# to force alignment of fd
 int	hdutype		# type of current HDU
 int	extver		# value of EXTVER from existing header, or -1

diff --git a/pkg/tbtables/tbfopn.x b/pkg/tbtables/tbfopn.x
@@ -53,7 +53,7 @@ int	hdu		# HDU number
 int	extver		# extension version number
 int	hdutype		# type of HDU
 int	fd[2]		# unit number for FITS file; cfitsio pointer
-double	dfd		# to force alignment of fd
+#double	dfd		# to force alignment of fd
 #equivalence (fd, dfd)	# to force alignment of fd
 int	tbffnd()
 bool	strne()