Changeset 25766 for branches/eam_branches/20090820/DataStoreServer/scripts/dsprodtool

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsprodtool (modified) (11 diffs)

branches/eam_branches/20090820/DataStoreServer/scripts/dsprodtool

@@ -12 +12 @@
 use PS::IPP::Metadata::Config;
 use File::Copy;
+
+use Term::ReadKey;
 
 use PS::IPP::Config qw($PS_EXIT_SUCCESS
@@ -36 +38 @@
 my $dsroot;
 my $dbname;
+my $dbpass;
 
 my $add;
@@ -78 +81 @@
 } else {
     $product = $del;
+    if (! -t STDIN) {
+        die "cannot delete product from script\n";
+    }
+    print "*** Delete the Data Store Product $product? ***\n";
+    print "*** to delete $product answer YES, and give password ***\n";
+    print "*** WARNING this action is permanant *** \n";
+    print "Delete? (YES/[n]): ";
+
+    my $line = ReadLine(0);
+    chomp $line;
+    exit 1 if !$line or ($line ne "YES");
+
+    print "password: ";
+    ReadMode('noecho');
+    $line = ReadLine(0);
+    ReadMode('normal');
+    print "\n";
+    chomp $line;
+    $dbpass = $line;
 }
 
@@ -93 +115 @@
 }
 
-my $root_index_script = "$dsroot/index.txt";
+my $root_index_script = "$dsroot/index.txt.template";
 if (!stat($root_index_script)) {
     $err .= "Data Store not found at '$dsroot'.\n"
@@ -106 +128 @@
     unless defined $dbname;
 my $dbuser   = metadataLookupStr($siteConfig, 'DS_DBUSER');
-my $dbpass   = metadataLookupStr($siteConfig, 'DS_DBPASSWORD');
+$dbpass   = metadataLookupStr($siteConfig, 'DS_DBPASSWORD') if !$dbpass;
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;
 
 my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
-
-my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
-
 
 my $product_dir = "$dsroot/$product";
@@ -118 +137 @@
 
 if ($del) {
+    my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
     #
     # delete product
@@ -129 +149 @@
     }
     my $prod_id = $prod_row->{prod_id};
-
-    # if requested, remove the product directory
-    if ($remove) {
-        if (system "rm -r $product_dir") {
-            die("failed to remove $product_dir");
-        }
-    } else  {
-        # otherwise just zap the index script
-        unlink("$index_script_name");
-    }
 
 
@@ -152 +162 @@
     $dbh->do("DELETE from dsProduct where prod_id = $prod_id");
 
+    print "Product $product deleted.\n";
+
+    # if requested, remove the product directory
+    if ($remove) {
+        print "Removing files from $product.\n";
+        if (system "rm -r $product_dir") {
+            die("failed to remove $product_dir");
+        }
+    } else  {
+        # otherwise just zap the index script
+        unlink("$index_script_name");
+    }
+
     exit 0;
 
@@ -158 +181 @@
     # add a new product
     #
+    my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
+
     my $stmt = $dbh->prepare("SELECT prod_id FROM dsProduct WHERE prod_name = \'$product\'");
     $stmt->execute();
@@ -167 +192 @@
 
     # set up the product directory
+    # if there is an old index file delete it
+    if (-e $index_script_name ) {
+        if (!unlink($index_script_name)) {
+            die("failed trying to remove old $index_script_name");
+        }
+    }
     if (! -e $product_dir) {
         $we_created_dir = 1;
@@ -172 +203 @@
             die("failed trying to make product directory $product_dir");
         }
-    }
-    if (-e $index_script_name ) {
-        if (!unlink($index_script_name)) {
-            die("failed trying to remove old $index_script_name");
-        }
-    }
+    } else {
+        # directory alrady exists make sure that it's empty
+        my @dirlist = glob("$product_dir/*");
+        die ("existing product directory $product_dir is not empty") if scalar @dirlist;
+    }
+
     if (!copy($root_index_script, $index_script_name)) {
         print STDERR "failed trying to copy($root_index_script, $index_script_name)";