Changeset 23898

Timestamp:

Apr 17, 2009, 10:12:18 AM (17 years ago)

Author:

Paul Price

Message:

Some fixes required for pantasks operation: needed '-limit' for the list mode, need to check if a fileset exists before inserting it.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/receivetool_addfileset.sql (added)
• src/receivetool.c (modified) (5 diffs)
• src/receivetoolConfig.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -171 +171 @@
      pztool_revertcopied.sql \
      receivetool_list.sql \
+     receivetool_addfileset.sql \
      receivetool_pendingfileset.sql \
      receivetool_pendingfile.sql \

trunk/ippTools/src/receivetool.c

@@ -122 +122 @@
     PXOPT_COPY_S64(config->args, where, "-comment", "receiveSource.comment", "LIKE");
 
+    // optional
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+
     psString query = pxDataGet("receivetool_list.sql");
     if (!query) {
@@ -136 +140 @@
     psFree(where);
 
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
     if (!p_psDBRunQueryF(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
@@ -153 +163 @@
         return true;
     }
-    if (!ippdbPrintMetadatas(stdout, output, "receiveSource", true)) {
+    if (!ippdbPrintMetadatas(stdout, output, "receiveSource", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "Failed to print array");
         psFree(output);
@@ -175 +185 @@
     }
 
+    psString query = pxDataGet("receivetool_addfileset.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
+        return false;
+    }
+
     if (!psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
     }
+
+    psString source_id_str = NULL;      // source_id as a string
+    psStringAppend(&source_id_str, "%" PRId64, source_id);
 
     psListIterator *iter = psListIteratorAlloc(filesets->data.list, PS_LIST_HEAD, false); // Iterator
@@ -184 +203 @@
     while ((item = psListGetAndIncrement(iter))) {
         psAssert(item && item->data.V && item->type == PS_DATA_STRING, "Argument is bad");
-
-        if (!receiveFilesetInsert(config->dbh, 0, source_id, item->data.str)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to add fileset");
+        const char *fileset = item->data.str; // Fileset name
+
+        if (!p_psDBRunQueryF(config->dbh, query, source_id_str, fileset)) {
+            psError(PS_ERR_UNKNOWN, false, "Database error");
+            psFree(source_id_str);
+            psFree(query);
+            psFree(iter);
             if (!psDBTransaction(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "Database error");
-                return false;
             }
+            return false;
+        }
+
+        psArray *output = p_psDBFetchResult(config->dbh); // Output of query
+        if (!output) {
+            psError(PS_ERR_UNKNOWN, false, "Database error");
+            psFree(source_id_str);
+            psFree(query);
             psFree(iter);
             return false;
         }
+        if (psArrayLength(output) > 0) {
+            psTrace("receivetool", PS_LOG_INFO, "Fileset %s is already present", fileset);
+            psFree(output);
+            continue;
+        }
+        psFree(output);
+
+        if (!receiveFilesetInsert(config->dbh, 0, source_id, fileset)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to add fileset");
+            psFree(source_id_str);
+            psFree(query);
+            psFree(iter);
+            if (!psDBTransaction(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "Database error");
+            }
+            return false;
+        }
     }
     psFree(iter);
+    psFree(query);
+    psFree(source_id_str);
 
     if (!psDBCommit(config->dbh)) {

trunk/ippTools/src/receivetoolConfig.c

@@ -56 +56 @@
     psMetadataAddStr(listArgs, PS_LIST_TAIL, "-product", 0, "search on product", NULL);
     psMetadataAddStr(listArgs, PS_LIST_TAIL, "-comment", 0, "search on comment (LIKE)", NULL);
+    psMetadataAddU64(listArgs, PS_LIST_TAIL, "-limit",  0, "limit result set", 0);
+    psMetadataAddBool(listArgs, PS_LIST_TAIL, "-simple",  0, "use simple output format?", false);
 
     // -addfileset