Changeset 33116

Timestamp:

Jan 18, 2012, 8:32:21 AM (15 years ago)

Author:

eugene

Message:

support for reading int and time types in opihi

Location:

branches/eam_branches/ipp-20111122/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/string.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/libohana/include/ohana.h

@@ -238 +238 @@
 int     dparse                 PROTO((double *X, int NX, char *line));
 int     dparse_csv             PROTO((double *X, int NX, char *line));
+int     iparse                 PROTO((int *X, int NX, char *line));
 int     iparse_csv             PROTO((int *X, int NX, char *line));
+int     tparse                 PROTO((time_t *X, int NX, char *line));
+int     tparse_csv             PROTO((time_t *X, int NX, char *line));
 int     fparse                 PROTO((float *X, int NX, char *line));
 int     get_argument           PROTO((int argc, char **argv, char *arg));

branches/eam_branches/ipp-20111122/Ohana/src/libohana/src/string.c

@@ -205 +205 @@
 }
 
+int iparse (int *X, int NX, char *line) {
+
+  int i;
+  char *word;
+  char *ptr;
+
+  word = line;
+  for (i = 0; i < NX - 1; i++)
+    word = _parse_nextword (word);
+
+  *X = strtol (word, &ptr, 0);
+  if (ptr == word) return (FALSE);
+  if (word[0] == '-') return (-1);
+  return (1);
+}
+
 int iparse_csv (int *X, int NX, char *line) {
 
@@ -225 +241 @@
   if (word[0] == '-') return (-1);
   return (1);
+}
+
+int tparse (time_t *X, int NX, char *line) {
+
+  int i, status;
+  char *word;
+
+  word = line;
+  for (i = 0; i < NX - 1; i++)
+    word = _parse_nextword (word);
+
+  status = ohana_str_to_time (word, X);
+  if (!status) return (FALSE);
+  return (TRUE);
+}
+
+int tparse_csv (time_t *X, int NX, char *line) {
+
+  int i, status;
+  char *word;
+
+  word = line;
+  for (i = 0; i < NX - 1; i++)
+    word = _parse_nextword_csv (word);
+  
+  if (word[0] == '"') word[0] = ' ';
+  if (word[0] == ',') {
+      *X = 0;
+      return 1;
+  }
+
+  status = ohana_str_to_time (word, X);
+  if (!status) return (FALSE);
+  return (TRUE);
 }