Changeset 26170

Timestamp:

Nov 17, 2009, 11:53:08 AM (17 years ago)

Author:

bills

Message:

put data_group into fileset listing instead of dist_group for more specificity

Location:

trunk

Files:

• ippScripts/scripts/dist_make_fileset.pl (modified) (5 diffs)
• ippTasks/rcserver.pro (modified) (2 diffs)
• ippTools/share/disttool_pendingfileset.sql (modified) (1 diff)

trunk/ippScripts/scripts/dist_make_fileset.pl

@@ -40 +40 @@
 # Parse the command-line arguments
 my ($dist_id, $dist_dir, $target_id, $stage, $stage_id, $dest_id, $product_name, $ds_dbhost, $ds_dbname);
-my ($label, $dist_group, $filter);
+my ($label, $data_group, $filter);
 my ($dbname, $save_temps, $verbose, $no_update, $logfile);
 
@@ -52 +52 @@
            'product_name=s' => \$product_name,  # location of the data store directory for this product
            'label=s'        => \$label,
-           'dist_group=s'   => \$dist_group,
+           'data_group=s'   => \$data_group,
            'filter=s'       => \$filter,
            'ds_dbhost=s'    => \$ds_dbhost,  # database host for the datastore database
@@ -64 +64 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --dist_id --dist_dir --target_id --stage --stage_id --dist_group --filter --dest_id --ds_dbhost --ds_dbname",
+pod2usage( -msg => "Required options: --dist_id --dist_dir --target_id --stage --stage_id --data_group --filter --dest_id --ds_dbhost --ds_dbname",
            -exitval => 3) unless
     defined $dist_id and
@@ -71 +71 @@
     defined $stage and
     defined $stage_id and
-    defined $dist_group and
+    defined $data_group and
     defined $filter and
     defined $dest_id and
@@ -164 +164 @@
 
     $command .= " --ps0 $target_id --ps1 $stage --ps2 $stage_id --ps3 $prod_col_3";
-    $command .= " --ps4 $dist_group --ps5 $filter";
+    $command .= " --ps4 $data_group --ps5 $filter";
 
     $command .= " --dbname $ds_dbname --dbhost $ds_dbhost";

trunk/ippTasks/rcserver.pro

@@ -130 +130 @@
     book getword rcPendingFS $pageName stage -var STAGE
     book getword rcPendingFS $pageName stage_id -var STAGE_ID
-    book getword rcPendingFS $pageName dist_group -var DIST_GROUP
+    book getword rcPendingFS $pageName data_group -var DATA_GROUP
     book getword rcPendingFS $pageName filter -var FILTER
     book getword rcPendingFS $pageName dist_dir -var DIST_DIR
-#    book getword rcPendingFS $pageName clean -var CLEAN
     book getword rcPendingFS $pageName dest_id -var DEST_ID
     book getword rcPendingFS $pageName product_name -var PRODUCT_NAME
@@ -148 +147 @@
     book setword rcPendingFS $pageName pantaskState RUN
 
-    $run = dist_make_fileset.pl --dist_id $DIST_ID --target_id $TARGET_ID --stage $STAGE --stage_id $STAGE_ID --dist_group $DIST_GROUP --filter $FILTER --dest_id $DEST_ID --product_name $PRODUCT_NAME  --ds_dbhost $DS_DBHOST --ds_dbname $DS_DBNAME --dist_dir $DIST_DIR
+    $run = dist_make_fileset.pl --dist_id $DIST_ID --target_id $TARGET_ID --stage $STAGE --stage_id $STAGE_ID --data_group $DATA_GROUP --filter $FILTER --dest_id $DEST_ID --product_name $PRODUCT_NAME  --ds_dbhost $DS_DBHOST --ds_dbname $DS_DBNAME --dist_dir $DIST_DIR
 
     add_standard_args run

trunk/ippTools/share/disttool_pendingfileset.sql

@@ -5 +5 @@
     distRun.outdir as dist_dir,
     stage_id,
-    distTarget.dist_group,
+    -- we need to get data_group here but we don't have
+    -- the right tables joined. Perhaps we need to add that column to distRun
+    distRun.label as data_group,
     distTarget.filter,
     rcDestination.name AS product_name,