Changeset 24125 for trunk/ippTools/src/receivetool.c

Timestamp:

May 9, 2009, 2:19:48 PM (17 years ago)

Author:

bills

Message:

Pass information about the paths from the distribution server to the client.
Use these to edit the database dump

File:

• trunk/ippTools/src/receivetool.c (modified) (4 diffs)

trunk/ippTools/src/receivetool.c

@@ -238 +238 @@
         psFree(output);
 
-        if (!receiveFilesetInsert(config->dbh, 0, source_id, fileset, "reg", NULL, 0)) {
+        if (!receiveFilesetInsert(config->dbh, 0, source_id, fileset, "reg", NULL, NULL, 0)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to add fileset");
             psFree(source_id_str);
@@ -512 +512 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " WHERE %s", whereClause);
+        psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
     }
@@ -592 +592 @@
     // to chanage
     PXOPT_LOOKUP_S32(fault, config->args, "-fault", false, false);
-    PXOPT_LOOKUP_STR(dbinfo_uri, config->args, "-dbinfo_uri", false, false);
+    PXOPT_LOOKUP_STR(destdir, config->args, "-destdir", false, false);
+    PXOPT_LOOKUP_STR(dirinfo, config->args, "-dirinfo", false, false);
+    PXOPT_LOOKUP_STR(dbinfo, config->args, "-dbinfo", false, false);
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
 
-    if (!fault && !dbinfo_uri && !state) {
-        psError(PS_ERR_UNKNOWN, true, "one of -fault, -dbinfo_uri, -set_state are required");
+    if (!fault && !dirinfo &&!dbinfo && !state) {
+        psError(PS_ERR_UNKNOWN, true, "at least one of -fault, -dirinfo, -dbinfo, -set_state are required");
         return false;
     }
@@ -608 +610 @@
         sep = ",";
     }
-    if (dbinfo_uri) {
-        psStringAppend(&query, "%s dbinfo_uri = '%s'", sep, dbinfo_uri);
+    if (dirinfo) {
+        psStringAppend(&query, "%s dirinfo = '%s'", sep, dirinfo);
+        sep = ",";
+    }
+    if (dbinfo) {
+        psStringAppend(&query, "%s dbinfo = '%s'", sep, dbinfo);
         sep = ",";
     }