Changeset 18535

Timestamp:

Jul 15, 2008, 9:57:05 AM (18 years ago)

Author:

bills

Message:

Changes to dsreg. Remove --fileset argument get the value from the --add
or --del option. (I kept getting it wrong this way so I changed it).

Added --force like (rm -f) the only effect of which is to not return an
error if an attempt is made to delete a non-existent fileset.

Change the file list format to allow the values for file size and md5sum
to be provided. If they are left blank, we calcluate them as before.

File:

• trunk/DataStoreServer/scripts/dsreg (modified) (10 diffs)

trunk/DataStoreServer/scripts/dsreg

@@ -46 +46 @@
 my $del;
 my $remove;
+my $force;          # on --del don't return error if fileset doesn't exist
 
 my $verbose = 0;
@@ -55 +56 @@
 
 GetOptions(
-        'add'           =>      \$add,
-        'del'           =>      \$del,
+        'add=s'         =>      \$add,
+        'del=s'         =>      \$del,
         'product=s'     =>      \$product,
-        'fileset=s'     =>      \$fileset,
         'list=s'        =>      \$filelist,
         'type=s'        =>      \$fstype,
@@ -66 +66 @@
         'copy'          =>      \$copyfiles,
         'rm'            =>      \$remove,
+        'force'         =>      \$force,
         'ps0=s'         =>      \$ps0,          # product specific columns 0 - 7
         'ps1=s'         =>      \$ps1,
@@ -82 +83 @@
 
 $err .= "--product is required\n" unless defined $product;
-$err .= "--fileset is required\n" unless defined $fileset;
-
 
 # will exit if neither --add and --del is specified or if they both are specified
@@ -90 +89 @@
 
 if ($add) {
+    $fileset = $add;
     $err .= "--type is required\n" unless defined $fstype;
     $err .= "--list is required\n" unless defined $filelist;
@@ -101 +101 @@
         $err .= "datapath must begin with / when using --link\n";
     }
+} else {
+    $fileset = $del;
 }
 
@@ -169 +171 @@
     if (!$fs_row) {
         print STDERR "Fileset '$fileset' not found under $product.\n";
-        exit 1;
+        if ($force) {
+            exit 0;
+        } else {
+            exit 1;
+        }
     }
     $stmt->finish();
@@ -259 +265 @@
 
         my $filename;
+        my $bytes;
+        my $md5sum;
         my $filetype;
 
         my @fields = split /\|/;
-        if (@fields < 2) {
+        if (@fields < 4) {
             die "malformed input line at $filelist line $lineno: $_\n";
         }
         $filename = shift @fields;
+        $bytes    = shift @fields;  # if this is null it will be calculated below
+        $md5sum   = shift @fields;  # if this is null it will be calculated below
         $filetype = shift @fields;
 
@@ -276 +286 @@
         my $hashref = {
             'file'      => $filename,
+            'bytes'     => $bytes,
+            'md5sum'    => $md5sum,
             'type'      => $filetype,
             'ts_cols'   => $ts_cols,
@@ -321 +333 @@
     }
 
-    # now calculate the md5sum and file size
+    # now calculate the md5sum and file size if they weren't provided
     foreach my $file (@files) {
         my $filename = fileparse($file->{file}, ());
         my $path = "$fileset_dir/$filename";
-        my @finfo = stat("$path");
-
-        unless (@finfo) {
-            die ("Line $lineno: referenced file "
-                ."($path does not exist.\n");
-        }
-        $file->{bytes}  = $finfo[7];
-
-        # Get MD5 sum
-        $file->{md5sum} = file_md5_hex($path);
+        if (! -e $path ) {
+            die "file $path not found";
+        }
+        if (!$file->{bytes}) {
+            my @finfo = stat($path);
+            unless (@finfo) {
+                die ("can't stat $path");
+            }
+            $file->{bytes}  = $finfo[7];
+        }
+        if (!$file->{md5sum}) {
+            # Get MD5 sum
+            $file->{md5sum} = file_md5_hex($path);
+        }
     }