Changeset 15234

Timestamp:

Oct 5, 2007, 5:38:27 PM (19 years ago)

Author:

jhoblitt

Message:

add pztool -datastore
add pztool -adddatastore

Location:

trunk/ippTools/src

Files:

• pxtables.c (modified) (2 diffs)
• pztool.c (modified) (3 diffs)
• pztool.h (modified) (1 diff)
• pztoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/pxtables.c

@@ -51 +51 @@
     }
 #endif
+    CREATE_TABLE(pzDataStoreCreateTable);
     CREATE_TABLE(summitExpCreateTable);
     CREATE_TABLE(summitImfileCreateTable);
@@ -137 +138 @@
 
 //    DROP_TABLE(expTagCounterDropTable);
+    DROP_TABLE(pzDataStoreDropTable);
     DROP_TABLE(summitExpDropTable);
     DROP_TABLE(summitImfileDropTable);

trunk/ippTools/src/pztool.c

@@ -31 +31 @@
 #include "pztool.h"
 
+static bool adddatastoreMode(pxConfig *config);
+static bool datastoreMode(pxConfig *config);
 static bool seenMode(pxConfig *config);
 static bool pendingExpMode(pxConfig *config);
@@ -59 +61 @@
 
     switch (config->mode) {
+        MODECASE(PZTOOL_MODE_ADDDATASTORE, adddatastoreMode);
+        MODECASE(PZTOOL_MODE_DATASTORE, datastoreMode);
         MODECASE(PZTOOL_MODE_SEEN, seenMode);
         MODECASE(PZTOOL_MODE_PENDINGEXP, pendingExpMode);
@@ -82 +86 @@
 
     exit(exit_status);
+}
+
+static bool adddatastoreMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psString camera = psMetadataLookupStr(&status, config->args, "-inst");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
+        return false;
+    }
+    if (!camera) {
+        psError(PS_ERR_UNKNOWN, true, "-inst is required");
+        return false;
+    }
+
+    psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
+        return false;
+    }
+    if (!telescope) {
+        psError(PS_ERR_UNKNOWN, true, "-telescope is required");
+        return false;
+    }
+
+    psString uri = psMetadataLookupStr(&status, config->args, "-uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
+        return false;
+    }
+    if (!uri) {
+        psError(PS_ERR_UNKNOWN, true, "-uri is required");
+        return false;
+    }
+
+    if (!pzDataStoreInsert(config->dbh,
+            camera,
+            telescope,
+            uri
+        )) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
+static bool datastoreMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    if (!p_psDBRunQuery(config->dbh, "SELECT * FROM pzDataStore")) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("pztool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            return false;
+        }
+    }
+
+    // negative simple so the default is true
+    if (!ippdbPrintMetadatas(stdout, output, "pzDataStore", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
+
+    return true;
 }
 

trunk/ippTools/src/pztool.h

@@ -25 +25 @@
 typedef enum {
     PZTOOL_MODE_NONE      = 0x0,
+    PZTOOL_MODE_ADDDATASTORE,
+    PZTOOL_MODE_DATASTORE,
     PZTOOL_MODE_SEEN,
     PZTOOL_MODE_PENDINGEXP,

trunk/ippTools/src/pztoolConfig.c

@@ -42 +42 @@
         return NULL;
     }
+
+    // -adddatastore
+    psMetadata *adddatastoreArgs = psMetadataAlloc();
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-inst", 0,
+            "define camera ID", NULL); 
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-telescope", 0,
+            "define telescope ID", NULL); 
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0,
+            "define storage uri", NULL);
+    
+    // -datastore
+    psMetadata *datastoreArgs = psMetadataAlloc();
+    psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0,
+            "use the simple output format", false);
 
     // -seen
@@ -123 +137 @@
     psMetadata *modes = psMetadataAlloc();
 
+    PXTOOL_ADD_MODE("-adddatastore",    "", PZTOOL_MODE_ADDDATASTORE, adddatastoreArgs);
+    PXTOOL_ADD_MODE("-datastore",       "", PZTOOL_MODE_DATASTORE,    datastoreArgs);
     PXTOOL_ADD_MODE("-seen",            "", PZTOOL_MODE_SEEN,         seenArgs);
     PXTOOL_ADD_MODE("-pendingexp",      "", PZTOOL_MODE_PENDINGEXP,   pendingexpArgs);