Changeset 28984

Timestamp:

Aug 20, 2010, 10:53:53 AM (16 years ago)

Author:

eugene

Message:

changes from trunk

Location:

branches/eam_branches/ipp-20100621

Files:

• DataStoreServer/scripts/dsreg (modified) (1 diff)
• dbconfig/changes.txt (modified) (1 diff)

branches/eam_branches/ipp-20100621/DataStoreServer/scripts/dsreg

@@ -332 +332 @@
 
                     if ( !-e $src or !-r $src) {
-                        print STDERR "file $src does not exist or is not accessible\n";
+                        print STDERR "source file $src does not exist or is not accessible\n";
                         exit $PS_EXIT_SYS_ERROR;
                     }
+                    if ( -e $dest ) {
+                        print STDERR "destination $dest already exists removing\n";
+                        if (! unlink $dest ) {
+                            print STDERR "failed trying to unlink $dest\n";
+                            exit $PS_EXIT_SYS_ERROR;
+                        }
+                    }
+
                     if ($linkfiles) {
                         if (! symlink $src, $dest) {

branches/eam_branches/ipp-20100621/dbconfig/changes.txt

@@ -1939 +1939 @@
     FOREIGN KEY(sass_id) REFERENCES stackAssociation(sass_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Fixing summary tables;
+
+ALTER TABLE warpSummary DROP PRIMARY KEY, ADD PRIMARY KEY (warp_id, projection_cell);
+ALTER TABLE diffSummary DROP PRIMARY KEY, ADD PRIMARY KEY (diff_id, projection_cell);
+ALTER TABLE stackSummary DROP PRIMARY KEY, ADD PRIMARY KEY (sass_id, projection_cell);