Changeset 313

Timestamp:

06/11/2007 10:46:05 PM

Author:

toby

Message:

patch from David Finnie to fix edge case error with project order; see: <http://www.mail-archive.com/vss2svn-users@lists.pumacode.org/msg01037.html>

Files:

• trunk/script/vss2svn.pl (modified) (5 diffs)

trunk/script/vss2svn.pl

@@ -527 +527 @@
-    my($sth, $rows, $row);
-    $sth = $gCfg{dbh}->prepare('SELECT * FROM PhysicalAction '
-= 1
+> 0
-    $sth->execute();
-
@@ -533 +533 @@
-    $rows = $sth->fetchall_arrayref( {} );
-
-
+, $depth
-    my @delchild = ();
-
@@ -544 +544 @@
-        }
-
+        $depth = &GetPathDepth($row);
+
-        foreach $child (@$childrecs) {
-            &UpdateParentRec($row, $child);
@@ -557 +559 @@
-
-}  #  End MergeParentData
+
+###############################################################################
+#  GetPathDepth
+###############################################################################
+sub GetPathDepth {
+    my($row) = @_;
+
+    # If we've already worked out the depth of this row, return it immediately
+    if ($row->{parentdata} > 1) {
+        return $row->{parentdata};
+    }
+
+    my($maxParentDepth, $depth, $parents, $parent);
+
+    # Get the row(s) corresponding to the parent(s) of this row, and work out
+    # the maximum depth
+    
+    my $sql = <<"EOSQL";
+SELECT
+    *
+FROM
+    PhysicalAction
+WHERE
+    parentdata > 0
+    AND physname = ?
+    AND actiontype = ?
+EOSQL
+
+    my $sth = $gCfg{dbh}->prepare($sql);
+    $sth->execute( @{ $row }{qw(parentphys actiontype)} );
+
+    $parents =  $sth->fetchall_arrayref( {} );
+    $maxParentDepth = 0;
+    foreach $parent (@$parents) {
+        $depth = &GetPathDepth($parent);
+        $maxParentDepth = ($depth > $maxParentDepth) ? $depth : $maxParentDepth;
+    }
+
+    # Depth of this path becomes one more than the maximum parent depth
+    $depth = $maxParentDepth + 1;
+
+    # Update the row for this record
+    &UpdateDepth($row, $depth);
+
+    return $depth;
+}  #  End GetPathDepth
+
+###############################################################################
+#  UpdateDepth
+###############################################################################
+sub UpdateDepth {
+    my($row, $depth) = @_;
+
+    my $sql = <<"EOSQL";
+UPDATE
+    PhysicalAction
+SET
+    parentdata = ?
+WHERE
+    action_id = ?
+EOSQL
+
+    my $sth = $gCfg{dbh}->prepare($sql);
+    $sth->execute( $depth, $row->{action_id} );
+
+}  #  End UpdateParentRec
-
-###############################################################################
@@ -740 +808 @@
-
-    my $sql = 'SELECT * FROM PhysicalAction ORDER BY timestamp ASC, '
-
+parentdata ASC, 
-
-    $sth = $gCfg{dbh}->prepare($sql);