sample family example

Author: bruceravel

c/README.md

@@ -27,7 +27,7 @@ contents of the XDI file along with a few particularly important items
 | meta\_values    | array of char*     | array of values found among the metadata, indexed to nmetadata |
 | narrays         | long               | number of arrays in data table |
 | npts            | long               | number of rows in data table  |
-| array           | of array of double | the data table |
+| array           | 2D array of double | the data table |
 | narray\_labels  | long               | number of array labels |
 | array\_labels   | array of char*     | array of labels for arrays in the data table |
 | array\_units    | array of char*     | array of units for arrays in the data table |
@@ -147,7 +147,7 @@ Validation tests do not exist for all items in the metadata dictionary
     }
 ```
 
-### Examine arrays from the data table
+### Extract named arrays from the data table
 
 ```C
 	double *enarray, *muarray;
@@ -218,18 +218,18 @@ The return code from `XDI_required_metadata` can be interpreted
 bitwise.  That is, a return code of 7 means that all three required
 metadata fields were missing.
 
-| code | message                             |
-| ---: | ----------------------------------- |
-|  1   | Element.symbol missing or not valid |
-|  2   | Element.edge missing or not valid   |
-|  4   | Mono.d\_spacing missing             |
-|  8   | Mono.d\_spacing not valid           |
+| code | message                                |
+| ---: | -------------------------------------- |
+|  1   | Element.symbol missing or not valid    |
+|  2   | Element.edge missing or not valid      |
+|  4   | Mono.d\_spacing missing                |
+|  8   | Non-numeric value for Mono.d\_spacing  |
 
 ### XDI_recommended_metadata return codes
 
 The return code from `XDI_recommended_metadata` can be interpreted
 bitwise.  That is, a return code of 7 means that the first three
-recommendation metadata fields were missing.
+recommended metadata fields were missing.
 
 | code | message                                             |
 | ---: | --------------------------------------------------- |

c/xdifile.c

@@ -656,7 +656,7 @@ XDI_required_metadata(XDIFile *xdifile) {
   if (ret & REQ_ELEM)             { strcat(xdifile->error_message, "Element.symbol missing or not valid\n"); }
   if (ret & REQ_EDGE)             { strcat(xdifile->error_message, "Element.edge missing or not valid\n"); }
   if (ret & REQ_NO_DSPACING)      { strcat(xdifile->error_message, "Mono.d_spacing missing\n"); }
-  if (ret & REQ_INVALID_DSPACING) { strcat(xdifile->error_message, "Mono.d_spacing not valid\n"); }
+  if (ret & REQ_INVALID_DSPACING) { strcat(xdifile->error_message, "Non-numerical value fo Mono.d_spacing\n"); }
 
   return ret;
 }
@@ -732,7 +732,7 @@ XDI_validate_item(XDIFile *xdifile, char *family, char *name, char *value) {
     err = 0;
 
   } else if (strcasecmp(family, "sample") == 0) {
-    err = 0;
+    err = XDI_validate_sample(xdifile, name, value);
 
   } else if (strcasecmp(family, "scan") == 0) {
     err = XDI_validate_scan(xdifile, name, value);
@@ -780,6 +780,26 @@ int XDI_validate_mono(XDIFile *xdifile, char *name, char *value) {
   return err;
 }
 
+int XDI_validate_sample(XDIFile *xdifile, char *name, char *value) {
+  int err;
+  int regex_status;
+  struct slre_cap caps[2];
+
+  err = 0;
+  strcpy(xdifile->error_message, "");
+
+  if (strcasecmp(name, "temperature") == 0) {
+    regex_status = slre_match("^\\d(\\.\\d)?\\s+[CcFfKk].*$", value, strlen(value), caps, 2, 0);
+    if (regex_status < 0) {
+      strcpy(xdifile->error_message, "Sample.temperature not interpretable as a temperature");
+      err = WRN_BAD_SAMPLE;
+    }
+  }
+
+  return err;
+}
+
+
 int xdi_is_datestring(char *inp) {
   /* tests if input string is a valid datetime timestamp.
      This uses regular expression to check format and validates
@@ -824,6 +844,7 @@ int xdi_is_datestring(char *inp) {
   return 0;
 }
 
+
 int XDI_validate_scan(XDIFile *xdifile, char *name, char *value) {
   int err;
 

c/xdifile.h

@@ -144,6 +144,7 @@ static char *ValidElems[] =
 #define WRN_DATE_FORMAT     512
 #define WRN_DATE_RANGE     1024
 #define WRN_BAD_DSPACING   2048
+#define WRN_BAD_SAMPLE     4096
 
 /* errors reading the XDI file */
 #define ERR_NOTXDI           -1	/* used */