projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Did some more work on bug 12859 and then realized that a *good*
[pspp]
/
src
/
var-labs.c
diff --git
a/src/var-labs.c
b/src/var-labs.c
index 82d49d1e9741f889c6dd25b24ee7672a34d2aaf8..cbcf984529fe9ce3626a92f653558998e8bfe007 100644
(file)
--- a/
src/var-labs.c
+++ b/
src/var-labs.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <stdio.h>
@@
-29,10
+29,6
@@
#include "debug-print.h"
#include "debug-print.h"
-#if DEBUGGING
-static void debug_print (void);
-#endif
-
int
cmd_variable_labels (void)
{
int
cmd_variable_labels (void)
{
@@
-41,12
+37,10
@@
cmd_variable_labels (void)
int i;
int i;
- lex_match_id ("VARIABLE");
- lex_match_id ("LABELS");
- lex_match ('/');
do
{
do
{
- parse_variables (NULL, &v, &nv, PV_NONE);
+ if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+ return CMD_PART_SUCCESS_MAYBE;
if (token != T_STRING)
{
if (token != T_STRING)
{
@@
-54,16
+48,16
@@
cmd_variable_labels (void)
free (v);
return CMD_PART_SUCCESS_MAYBE;
}
free (v);
return CMD_PART_SUCCESS_MAYBE;
}
- if (ds_length (&tokstr) >
120
)
+ if (ds_length (&tokstr) >
255
)
{
{
- msg (SW, _("Truncating variable label to
120
characters."));
- ds_truncate (&tokstr,
120
);
+ msg (SW, _("Truncating variable label to
255
characters."));
+ ds_truncate (&tokstr,
255
);
}
for (i = 0; i < nv; i++)
{
if (v[i]->label)
free (v[i]->label);
}
for (i = 0; i < nv; i++)
{
if (v[i]->label)
free (v[i]->label);
- v[i]->label = xstrdup (ds_
value
(&tokstr));
+ v[i]->label = xstrdup (ds_
c_str
(&tokstr));
}
lex_get ();
}
lex_get ();
@@
-72,27
+66,16
@@
cmd_variable_labels (void)
free (v);
}
while (token != '.');
free (v);
}
while (token != '.');
-#if 0 && DEBUGGING
- debug_print ();
-#endif
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
-#if 0 && DEBUGGING
-static void
-debug_print (void)
+
+
+const char *
+var_to_string(const struct variable *var)
{
{
- int i;
+ if ( !var )
+ return 0;
- printf (_("Variable labels:\n"));
- for (i = 0; i < nvar; i++)
- {
- printf (" %8s: ", var[i]->name);
- if (var[i]->label)
- printf ("`%s'", var[i]->label);
- else
- printf (_("(no variable label)"));
- printf ("\n");
- }
+ return ( var->label ? var->label : var->name);
}
}
-#endif /* DEBUGGING */