Changeset 6837

Timestamp:

Apr 11, 2006, 5:30:00 PM (20 years ago)

Author:

jhoblitt

Message:

partial implimentation of pzgetexp
change pzgetexpConfig() to allocate a pxConfig if passed NULL for config

Location:

trunk/ippTools/src

Files:

• pzgetexp.c (modified) (3 diffs)
• pzgetexp.h (modified) (1 diff)
• pzgetexpConfig.c (modified) (2 diffs)

trunk/ippTools/src/pzgetexp.c

@@ -3 +3 @@
 
 #include "pxtools.h"
+#include "pzgetexp.h"
 
-//static psString slurp(FILE *stream);
-static bool parseInput();
+static bool parseInput(pxConfig *config);
 
 int main(int argc, char **argv)
 {
-//    pxConfig *config = pxConfigAlloc();
-
-//    pzsearchConfig(config, argc, argv);
+    pxConfig *config = pzgetexpConfig(config, argc, argv);
 
     /*
@@ -25 +23 @@
     */
 
-    parseInput();
+    parseInput(config);
 
     exit(EXIT_SUCCESS);
@@ -34 +32 @@
 }
 
-static bool parseInput() 
+static bool parseInput(pxConfig *config) 
 {
     psString input = slurp(stdin);
-    psList *tokens = psStringSplit(input, " ");
+    psList *lines = psStringSplit(input, "\n");
 
-}
+    psListIterator *lineCursor = psListIteratorAlloc(lines, 0, false);
 
-/*
-#define SLURP_SIZE 1024
-static psString slurp(FILE *stream) 
-{
-    psString str    = NULL;
-    size_t strSize  = 1; // bytes allocated -  make sure there is room for '\0'
-    size_t used     = 0; // bytes actually used
+    psArray *summitExps = psArrayAlloc(psListLength(lines));
+    psString    item;
+    while ((item = psListGetAndIncrement(lineCursor))) {
+        printf("-> %s\n", item);
 
-    for (;;) {
-        // increase the allocated string size
-        strSize += SLURP_SIZE;
-        str = psRealloc(str, strSize);
+        // split line into tokens
+        psList *tokens = psStringSplit(item, " ");
 
-        // read a block from the stream
-        size_t bytes = fread(str + used, 1, SLURP_SIZE, stream); 
-        used += bytes;
+        // check that we have the right number of tokens
+        // print "# uri fileset datetime type\n";
+        if (psListLength(tokens) != 4) {
+            // error
+            return false;
+        }
 
-        // is this the end of the file or an error?
-        if (bytes != SLURP_SIZE) {
-            if (feof(stream)) {
-                // eof
-                break;
-            }
-            // else - it's an error
-            psError(PS_ERR_UNKNOWN, true, "slurp failed");
-            return NULL;
+        psListIterator *tokenCursor = psListIteratorAlloc(tokens, 0, false);
+
+        char *uri       = psListGetAndIncrement(tokenCursor);
+        char *exp_id    = psListGetAndIncrement(tokenCursor); // fileset
+        char *time      = psListGetAndIncrement(tokenCursor); // datetime 
+        char *exp_type  = psListGetAndIncrement(tokenCursor); // type
+
+        psFree(tokenCursor);
+
+        summitExpRow *row = summitExpRowAlloc(
+            exp_id,
+            config->camera,
+            config->telescope,
+            exp_type,
+            uri
+        );
+        psArrayAdd(summitExps, 0, row);
+    }
+    
+    psFree(lineCursor);
+    psFree(lines);
+    psFree(input);
+
+    for (long i = 0; i < psArrayLength(summitExps); i++) {
+        if (!summitExpInsertObject(config->dbh, summitExps->data[i])) {
+            psError(PS_ERR_UNKNOWN, false, "dbh access failed");
+            return false;
         }
     }
 
-    // append '\0' to the end of the string
-    str[used + 1] = '\0';
-
-    return str;
+    psFree(summitExps);
 }
-*/

trunk/ippTools/src/pzgetexp.h

@@ -4 +4 @@
 #include "pxtools.h"
 
-bool pzgetexpConfig(pxConfig *config, int argc, char **argv);
+pxConfig *pzgetexpConfig(pxConfig *config, int argc, char **argv);
 
 #endif // PZGETEXP_H

trunk/ippTools/src/pzgetexpConfig.c

@@ -3 +3 @@
 #include "pxtools.h"
 
-bool pzgetexpConfig(pxConfig *config, int argc, char **argv) {
-    PS_ASSERT_PTR_NON_NULL(config, false);
+pxConfig *pzgetexpConfig(pxConfig *config, int argc, char **argv) {
+    if (!config) {
+        config = pxConfigAlloc();            
+    }
 
     if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
@@ -38 +40 @@
     config->dbh = pmConfigDB(config->site);
 
-    return true;
+    return config;
 }