Changeset 24125 for trunk/ippTools

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

Location:

trunk/ippTools

Files:

• share/pxadmin_create_tables.sql (modified) (1 diff)
• share/receivetool_pendingfile.sql (modified) (2 diffs)
• share/receivetool_revert.sql (modified) (1 diff)
• share/receivetool_toadvance.sql (modified) (1 diff)
• src/disttool.c (modified) (1 diff)
• src/receivetool.c (modified) (4 diffs)
• src/receivetoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1330 +1330 @@
     fileset VARCHAR(128) NOT NULL, -- fileset to receive
     state VARCHAR(64), -- new or full
-    dbinfo_uri VARCHAR(255), -- uri for database dump for this fileset's run
+    dirinfo VARCHAR(255), -- uri for directory info file for this run
+    dbinfo VARCHAR(255), -- uri for database dump file for this run
     fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
     PRIMARY KEY(fileset_id),

trunk/ippTools/share/receivetool_pendingfile.sql

@@ -4 +4 @@
     product,
     workdir,
-    destdir,
+    dirinfo,
     fileset,
     fileset_id,
@@ -18 +18 @@
     ON receiveResult.file_id = receiveFile.file_id
 WHERE
-    ((receiveFileset.state = 'new') OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dbinfo'))
+    ((receiveFileset.state = 'new') OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dirinfo'))
     AND receiveFileset.fault = 0
     AND receiveResult.file_id IS NULL

trunk/ippTools/share/receivetool_revert.sql

@@ -4 +4 @@
     AND receiveFile.fileset_id = receiveFileset.fileset_id
     AND receiveFileset.source_id = receiveSource.source_id
-    AND fault != 0
+    AND receiveResult.fault != 0

trunk/ippTools/share/receivetool_toadvance.sql

@@ -2 +2 @@
     receiveFileset.fileset_id,
     receiveFileset.fileset,
-    receiveFileset.dbinfo_uri,
+    receiveFileset.dbinfo,
     receiveSource.status_product,
     receiveSource.ds_dbname,

trunk/ippTools/src/disttool.c

@@ -488 +488 @@
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
-    PXOPT_COPY_S16(config->args, where, "-fault", "distComponent.fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault", "fault", "==");
 
     // It might be useful to be able to query by the parameters of the underlying runs

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 = ",";
     }

trunk/ippTools/src/receivetoolConfig.c

@@ -85 +85 @@
     psMetadataAddS64(updatefilesetArgs, PS_LIST_TAIL, "-fileset_id", 0, "define fileset_id (required)", 0);
     psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL);
-    psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-dbinfo_uri", 0, "define dbinfo_uri", NULL);
+    psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-destdir", 0, "define destdir", NULL);
+    psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-dirinfo", 0, "define dirinfo", NULL);
+    psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-dbinfo", 0, "define dbinfo", NULL);
     psMetadataAddS32(updatefilesetArgs, PS_LIST_TAIL, "-fault", 0, "define fault code", 0);
 
@@ -107 +109 @@
     psMetadata *addresultArgs = psMetadataAlloc();
     psMetadataAddS64(addresultArgs, PS_LIST_TAIL, "-file_id", 0, "define receive_id (required)", 0);
+    psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-path_base", 0, "path_base for component", NULL);
     psMetadataAddF32(addresultArgs, PS_LIST_TAIL, "-dtime_copy", 0, "define time to copy", NAN);
     psMetadataAddF32(addresultArgs, PS_LIST_TAIL, "-dtime_extract", 0, "define time to extract", NAN);