Changeset 37033

Timestamp:

Jul 17, 2014, 10:07:16 AM (12 years ago)

Author:

eugene

Message:

move INITTIME,MARKTIME to libohana; new parsing functions to deal with string-type FITS columns in ohana

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana.h (modified) (3 diffs)
• src/string.c (modified) (13 diffs)

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

@@ -71 +71 @@
 # endif
 
+# define MARKTIME(MSG,...) {                    \
+    gettimeofday (&stopTimer, (void *) NULL);   \
+    float dtime = DTIME (stopTimer, startTimer);        \
+    fprintf (stderr, MSG, __VA_ARGS__); }
+
+# define INITTIME \
+  struct timeval startTimer, stopTimer; \
+  gettimeofday (&startTimer, (void *) NULL);
+
 #ifdef __GNUC__
 #define OHANA_FORMAT(style, fmt, varargs) __attribute__((format(style, fmt, varargs)))
@@ -252 +261 @@
 int     scan_line              PROTO((FILE *f, char *line)); 
 int     scan_line_maxlen       PROTO((FILE *f, char *line, int maxlen)); 
+char   *parse_nextword         PROTO((char *string));
+char   *parse_nextword_csv     PROTO((char *string));
 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     charparse_csv          PROTO((char *X, int NX, char *line));
+char   *ptrparse               PROTO((int NX, char *line));
+char   *ptrparse_csv           PROTO((int NX, char *line));
 int     charparse_csv          PROTO((char *X, int NX, char *line));
 int     charparse              PROTO((char *X, int NX, char *line));
@@ -266 +280 @@
 char   *strip_version          PROTO((char *input));
 char   *strsubs                PROTO((char *string, char *match, char *with));
+
+char   *getword                PROTO((char *string));
+char   *skipword               PROTO((char *string));
 
 /* in findexec.c */

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

@@ -167 +167 @@
 }
 
-char *_parse_nextword (char *string) {
+char *parse_nextword (char *string) {
 
   if (string == (char *) NULL) return ((char *) NULL);
@@ -182 +182 @@
 // ,,, : go from , to , to , to 0
 
-char *_parse_nextword_csv (char *string) {
+char *parse_nextword_csv (char *string) {
 
   if (string == (char *) NULL) return ((char *) NULL);
@@ -199 +199 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword (word);
+    word = parse_nextword (word);
 
   *X = strtod (word, &ptr);
@@ -215 +215 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword_csv (word);
+    word = parse_nextword_csv (word);
   
   if (word[0] == '"') word[0] = ' ';
@@ -237 +237 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword (word);
+    word = parse_nextword (word);
 
   *X = strtol (word, &ptr, 0);
@@ -253 +253 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword_csv (word);
+    word = parse_nextword_csv (word);
   
   if (word[0] == '"') word[0] = ' ';
@@ -274 +274 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword (word);
+    word = parse_nextword (word);
 
   *X = word[0];
@@ -287 +287 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword_csv (word);
+    word = parse_nextword_csv (word);
   
   if (word[0] == '"') word[0] = word[1];
@@ -299 +299 @@
 }
 
+// return a pointer to the start of the desired field
+char *ptrparse (int NX, char *line) {
+
+  int i;
+  char *word;
+
+  word = line;
+  for (i = 0; i < NX - 1; i++) {
+    word = parse_nextword (word);
+  }
+  return word;
+}
+
+char *ptrparse_csv (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 ++;
+  if (word[0] == ',') return NULL;
+  return word;
+}
+
 int tparse (time_t *X, int NX, char *line) {
 
@@ -306 +333 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword (word);
+    word = parse_nextword (word);
 
   status = ohana_str_to_time (word, X);
@@ -320 +347 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword_csv (word);
+    word = parse_nextword_csv (word);
   
   if (word[0] == '"') word[0] = ' ';
@@ -341 +368 @@
   word = line;
   for (i = 0; i < NX - 1; i++)
-    word = _parse_nextword (word);
+    word = parse_nextword (word);
 
   *X = strtod (word, &ptr);
@@ -402 +429 @@
   return (q);
 }
+
+// return a newly allocated string containing the first complete set of non-whitespace
+char *getword (char *string) {
+
+  int i, j;
+  char *word;
+
+  if (!string) return (NULL);
+
+  // find the end of the whitespace (is there any non-whitespace?)
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
+  if (!string[i]) return (NULL);
+
+  for (j = i; string[j] && !OHANA_WHITESPACE(string[j]); j++);
+  word = strncreate (&string[i], j - i);
+  return (word);
+}
+
+// returns a pointer to the next word, or NULL if there is not a next word
+char *skipword (char *string) {
+
+  int i;
+
+  if (!string) return (NULL);
+
+  // find the end of the whitespace (is there any non-whitespace?)
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
+  if (!string[i]) return (NULL);
+
+  // find the end of the non-whitespace (this word)
+  while (string[i] && !OHANA_WHITESPACE(string[i])) i++;
+
+  // find the end of the following whitespace
+  while (string[i] &&  OHANA_WHITESPACE(string[i])) i++;
+  if (!string[i]) return (NULL);
+
+  return (&string[i]);
+}
+