fix bug in xdifile.c where last point was dropped from data table

have xdireader report bottom of data table
perl wrapper now passes all tests

Author: bruceravel

c/xdi_reader.c

@@ -66,9 +66,8 @@ int main(int argc, char **argv) {
     ret = XDI_get_array_name(xdifile,xdifile->array_labels[j], tdat);
     printf(" %ld %9s: ", j, xdifile->array_labels[j]);
     for (k=0; k < nout; k++) {  printf("%.8g, ", tdat[k]); }
-    printf("\n");
-    /* printf("..., %.8g, %.8g\n", tdat[xdifile->npts-2], tdat[xdifile->npts-1]);
-     */
+    /* printf("\n"); */
+    printf("..., %.8g, %.8g\n", tdat[xdifile->npts-2], tdat[xdifile->npts-1]);
   }
 
   if ((strlen(xdifile->outer_label) > 0)&& xdifile->nouter > 1) {

c/xdifile.c

@@ -353,7 +353,7 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
   /* loop through data table, inserting data into xdifile->array */
   ipt = 0;
   iouter = 1;
-  for (i = nheader-2; i < ilen; i++) {
+  for (i = nheader-2; i <= ilen; i++) {
     /* may find a header line interspersed in array data */
     COPY_STRING(line, textlines[i]);
     xdifile->error_lineno = i; 

perl/README.org

@@ -26,6 +26,11 @@ For documentation, once installed:
 
 :   perldoc Xray::XDI
 
+*Note:* The compilation of Xray::XDIFile currently generates a large
+number of warings about casting pointers to/from integers of different
+sizes.  This does not affect the preformance of the wrapper, but does
+need to be cleaned up eventually.
+
 ** DEPENDENCIES
 
 This module requires these modules, all available from cpan and as

perl/lib/Xray/XDI.pm

@@ -154,31 +154,33 @@ sub _build_object {
   my %data = ();
   foreach my $i (0 .. $self->narray_labels-1) {
     my @x = $obj->_data_array($i);
+    #print $array_labels[$i], $/;
+    #print join("|", @x), $/, $/;
     $data{$array_labels[$i]} = \@x;
   };
   $self->data(\%data);
 
   return $obj;
 };
 
-use Term::ANSIColor qw(:constants);
-sub trace {
-  my ($self) = @_;
-  my $max_depth = 30;
-  my $i = 0;
-  my ($green, $red, $yellow, $end) = (BOLD.GREEN, BOLD.RED, BOLD.YELLOW, RESET);
-  local $|=1;
-  print($/.BOLD."--- Begin stack trace ---$end\n");
-  while ( (my @call_details = (caller($i++))) && ($i<$max_depth) ) {
-    my $from = $call_details[1];
-    my $line  = $call_details[2];
-    my $color = RESET.YELLOW;
-    (my $func = $call_details[3]) =~ s{(?<=::)(\w+)\z}{$color$1};
-    print("$green$from$end line $red$line$end in function $yellow$func$end\n");
-  }
-  print(BOLD."--- End stack trace ---$end\n");
-  return $self;
-};
+# use Term::ANSIColor qw(:constants);
+# sub trace {
+#   my ($self) = @_;
+#   my $max_depth = 30;
+#   my $i = 0;
+#   my ($green, $red, $yellow, $end) = (BOLD.GREEN, BOLD.RED, BOLD.YELLOW, RESET);
+#   local $|=1;
+#   print($/.BOLD."--- Begin stack trace ---$end\n");
+#   while ( (my @call_details = (caller($i++))) && ($i<$max_depth) ) {
+#     my $from = $call_details[1];
+#     my $line  = $call_details[2];
+#     my $color = RESET.YELLOW;
+#     (my $func = $call_details[3]) =~ s{(?<=::)(\w+)\z}{$color$1};
+#     print("$green$from$end line $red$line$end in function $yellow$func$end\n");
+#   }
+#   print(BOLD."--- End stack trace ---$end\n");
+#   return $self;
+# };
 
 
 

perl/lib/Xray/XDIFile.pm

@@ -109,25 +109,25 @@ __C__
 #include "xdifile.h"
 
 SV* new(char* class, char* file, SV* errcode) {
-    XDIFile* xdifile;
-    long ret;
+  XDIFile* xdifile;
+  long ret;
 
-    SV*      obj_ref = newSViv(0);
-    SV*      obj = newSVrv(obj_ref, class);
+  SV*      obj_ref = newSViv(0);
+  SV*      obj = newSVrv(obj_ref, class);
 
-    New(42, xdifile, 1, XDIFile);
-    xdifile = malloc(sizeof(XDIFile));
+  Newx(xdifile, 1, XDIFile);
+  xdifile = malloc(sizeof(XDIFile));
 
-    ret = XDI_readfile(file, xdifile);
-    sv_setiv(errcode, ret);
+  ret = XDI_readfile(file, xdifile);
+  sv_setiv(errcode, ret);
 
-    sv_setiv(obj, (IV)xdifile);
-    SvREADONLY_on(obj);
-    return obj_ref;
+  sv_setiv(obj, (IV)xdifile);
+  SvREADONLY_on(obj);
+  return obj_ref;
 }
 
 char* _errorstring(SV* obj, int code) {
-      return XDI_errorstring(code);
+  return XDI_errorstring(code);
 }
 
 void _valid_edges(SV* obj) {

perl/t/00_base.t

@@ -63,7 +63,7 @@ ok($families[6] eq 'Mono',   'specific family');
 ok($keywords[6] eq 'name',   'specific keyword');
 ok($values[6]   eq 'Si 111', 'specific value');
 
-ok($xdifile->_npts    == 417, 'npts');
+ok($xdifile->_npts    == 418, 'npts');
 ok($xdifile->_narrays ==   3, 'narrays');
 ok($xdifile->_narrays ==  $xdifile->_narray_labels, 'narray_labels');
 

perl/t/01_moose_nonmoose.t

@@ -67,7 +67,7 @@ ok($count == $xdi->nmetadata,                                     'correct numbe
 ok($xdi->metadata->{Mono}->{name} eq 'Si 111',                     'fetching Mono.name');
 ok($xdi->metadata->{Facility}->{xray_source} eq 'APS undulator A', 'fetching Facility.xray_source');
 
-ok($xdi->npts    == 417, 'npts');
+ok($xdi->npts    == 418, 'npts');
 ok($xdi->narrays ==   3, 'narrays');
 ok($xdi->narrays == $xdi->narray_labels, 'narray_labels');
 

perl/t/writer/01_pp.t

@@ -57,6 +57,6 @@ $xdi->freeze('freeze.xdi');
 ok(-s 'foo.xdi' == -s 'write.xdi',  'write alias' );
 ok(-s 'foo.xdi' == -s 'freeze.xdi', 'freeze alias');
 
-#unlink 'foo.xdi';
-#unlink 'write.xdi';
-#unlink 'freeze.xdi';
+unlink 'foo.xdi';
+unlink 'write.xdi';
+unlink 'freeze.xdi';