address issue of text after colon in user comments

Author: bruceravel

c/xdifile.c

@@ -95,7 +95,7 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
   char *header[MAX_LINES];
   char *words[MAX_WORDS], *cwords[2];
   char *col_labels[MAX_COLUMNS], *col_units[MAX_COLUMNS];
-  char *c, *line, *mkey,  *mval, *version_xdi, *version_extra;
+  char *c, *line, *fullline, *mkey,  *mval, *version_xdi, *version_extra;
   char *reword;
   char tlabel[32];
   char comments[1024] = "";
@@ -189,7 +189,9 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
 
     if (strncmp(textlines[i], TOK_COMM, 1) == 0)  {
       COPY_STRING(line, textlines[i]);
+      COPY_STRING(fullline, textlines[i]);
       line++;
+      fullline++;
       nwords = split_on(line, TOK_DELIM, words);
       if (nwords < 1) { continue; }
       COPY_STRING(mkey, words[0]);
@@ -270,10 +272,10 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
 	if ((strlen(comments) > 0) && strlen(comments) < sizeof(comments)) {
 	  strncat(comments, "\n", sizeof(comments)-strlen(comments) - 1);
 	}
-	if (strlen(line) + 1 > sizeof(comments) - strlen(comments)) {
+	if (strlen(fullline) + 1 > sizeof(comments) - strlen(comments)) {
 	  printf("Warning.... user comment may be truncated!\n");
 	}
-	strncat(comments, line, sizeof(comments) - strlen(comments) - 1);
+	strncat(comments, fullline, sizeof(comments) - strlen(comments) - 1);
       } else if (mode == 0) {
 	return ERR_META_FORMAT;
       }

perl/Makefile.PL

@@ -1,11 +1,29 @@
 
-use Inline::MakeMaker;
+BEGIN {
+  eval {
+    require Inline::MakeMaker;
+  };
+  if ($@) {
+    print "You need to install the 'Inline' perl module before building the XDI perl wrapper.
+See https://metacpan.org/release/Inline
+or install from a package for your system:
+   debian/ubuntu:     libinline-perl
+   redhat/mandriva:   perl-Inline
+   suse:              perl-Inline
+   gentoo:            dev-perl/Inline
+";
+    exit;
+  }
+}
+
+import Inline::MakeMaker;
 
 WriteMakefile(
 	      NAME              => 'Xray::XDI',
 	      VERSION_FROM      => 'lib/Xray/XDI.pm', # finds $VERSION
 	      PREREQ_PM         => {
 				    Inline             => 0.5,
+				    Inline::C          => 0.62,
 				    Moose              => 2.06,
 				    'MooseX::NonMoose' => 0.22,
 				    'MooseX::Aliases'  => 0.10,
@@ -31,4 +49,4 @@ WriteMakefile(
 # This work is published from: United States.
 #
 # Author: Bruce Ravel (bravel AT bnl DOT gov).
-# Last update: 8 September, 2012
+# Last update: 22 July, 2014

perl/README.org

@@ -5,6 +5,11 @@ to the XDI file format.
 
 ** INSTALLATION
 
+Before installation, you must somehow install perl's [[https://metacpan.org/release/Inline][Inline]] package.
+This can be installed from the ~cpan~ utility (=install Inline=) or
+using your system's package manager (~libinline-perl~ on debian & ubuntu,
+~perl-Inline~ on redhat, mandriva, & SUSE).
+
 To install this module type the following:
 
 :   perl Makefile.PL
@@ -27,9 +32,10 @@ This module requires these modules, all available from cpan and as
 packages for major linux distributions:
 
  1. Inline
- 2. Moose
- 3. MooseX::NonMoose
- 4. MooseX::Aliases
+ 2. Inline::C
+ 3. Moose
+ 4. MooseX::NonMoose
+ 5. MooseX::Aliases
 
 
 ** COPYRIGHT AND LICENCE
@@ -41,4 +47,5 @@ information about Authorship may be retained in some files for
 historical reasons, this work is hereby placed in the Public Domain.
 This work is published from: United States.
 
-
+Author: Bruce Ravel (bravel AT bnl DOT gov).
+Last update: 22 July, 2014

perl/lib/Xray/XDI.pm

@@ -536,6 +536,6 @@ historical reasons, this work is hereby placed in the Public Domain.
 This work is published from: United States.
 
 Author: Bruce Ravel (bravel AT bnl DOT gov).
-Last update: 8 September, 2012
+Last update: 22 July, 2014
 
 =cut

perl/lib/Xray/XDIFile.pm

@@ -100,7 +100,7 @@ historical reasons, this work is hereby placed in the Public Domain.
 This work is published from: United States.
 
 Author: Bruce Ravel (bravel AT bnl DOT gov).
-Last update: 8 September, 2012
+Last update: 22 July, 2014
 
 =cut
 

perl/t/writer/01_pp.t

@@ -31,18 +31,17 @@ ok(ucfirst($xdi->element) eq ucfirst($new->element),  'element');
 ok(ucfirst($xdi->edge)    eq ucfirst($new->edge),     'edge');
 ok(abs($xdi->dspacing - $new->dspacing) < $epsi,      'dspacing');
 
-use Term::ANSIColor qw(:constants);
-use String::Diff;
-local %String::Diff::DEFAULT_MARKS = (
-				      remove_open  => RED.REVERSE,
-				      remove_close => RESET,
-				      append_open  => GREEN.REVERSE,
-				      append_close => RESET,
-				     );
-my($x, $n) = String::Diff::diff($xdi->comments,  $new->comments);
-
-print $x, $/, $/;
-print $n, $/;
+# use Term::ANSIColor qw(:constants);
+# use String::Diff;
+# local %String::Diff::DEFAULT_MARKS = (
+# 				      remove_open  => RED.REVERSE,
+# 				      remove_close => RESET,
+# 				      append_open  => GREEN.REVERSE,
+# 				      append_close => RESET,
+# 				     );
+# my($x, $n) = String::Diff::diff($xdi->comments,  $new->comments);
+# print $x, $/, $/;
+# print $n, $/;
 
 ok($xdi->comments         eq $new->comments,	      'comments');
 ok($xdi->npts             == $new->npts,	      'npts');