Changeset 34460 for trunk

Timestamp:

Sep 25, 2012, 6:15:53 AM (14 years ago)

Author:

eugene

Message:

add function to parse char blocks in lines (for read_vectors)

Location:

trunk/Ohana/src/libohana

Files:

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

trunk/Ohana/src/libohana/include/ohana.h

@@ -256 +256 @@
 int     iparse                 PROTO((int *X, int NX, char *line));
 int     iparse_csv             PROTO((int *X, int NX, char *line));
+int     charparse_csv          PROTO((char *X, int NX, char *line));
+int     charparse              PROTO((char *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));

trunk/Ohana/src/libohana/src/string.c

@@ -267 +267 @@
 }
 
+int charparse (char *X, int NX, char *line) {
+
+  int i;
+  char *word;
+
+  word = line;
+  for (i = 0; i < NX - 1; i++)
+    word = _parse_nextword (word);
+
+  *X = word[0];
+  return (1);
+}
+
+int charparse_csv (char *X, int NX, char *line) {
+
+  int i;
+  char *word;
+
+  word = line;
+  for (i = 0; i < NX - 1; i++)
+    word = _parse_nextword_csv (word);
+  
+  if (word[0] == '"') word[0] = word[1];
+  if (word[0] == ',') {
+      *X = 0;
+      return 1;
+  }
+
+  *X = word[0];
+  return (1);
+}
+
 int tparse (time_t *X, int NX, char *line) {