Add yet another expression test and fix the bugs it found.

[pspp-builds.git] / src / value-labels.c

diff --git a/src/value-labels.c b/src/value-labels.c
index 404f7f6844721e0e6d45476714c2ae404f8b534f..16e649687cb577db05891b75f9ee913251d92f6e 100644 (file)
--- a/src/value-labels.c
+++ b/src/value-labels.c
@@ -21,9 +21,9 @@
 #include "value-labels.h"
 #include "error.h"
 #include <stdlib.h>
-#include <string.h>
 #include "alloc.h"
 #include "hash.h"
+#include "str.h"
 
 static hsh_compare_func compare_int_val_lab;
 static hsh_hash_func hash_int_val_lab;
@@ -488,3 +488,37 @@ free_atom (void *atom_, void *aux UNUSED)
   free (atom->string);
   free (atom);
 }
+
+
+/* Get a string representing the value.
+   That is, if it has a label, then return that label,
+   otherwise, if the value is alpha, then return the string for it,
+   else format it and return the formatted string
+*/
+const char *
+value_to_string(const union value *val, const struct variable *var)
+{
+  static char buf[100];
+  char *s;
+  const struct val_labs *val_labs ;
+  
+  if ( !val || ! var ) 
+    return 0;
+
+  val_labs = var->val_labs;
+
+  
+  s = val_labs_find (val_labs, *val);
+
+  if ( s ) 
+    return s;
+
+  if ( 0 == var->width ) 
+    snprintf(buf,100,"%g",val->f);
+  else
+    {
+      strncpy(buf,val->s,MAX_SHORT_STRING);
+      strcat(buf,"\0");
+    }
+  return buf;
+}