From 3b544ee4fbf15f839e70d42f2c952a3f19526524 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 17 Feb 2012 17:26:43 -0800
Subject: [PATCH] Fix a problem with fixing parents.  Better handling of
 potential problems in File assets with no storage location.

---
 sbin/findBrokenAssets.pl | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/sbin/findBrokenAssets.pl b/sbin/findBrokenAssets.pl
index 226b9b087..eda774bc0 100644
--- a/sbin/findBrokenAssets.pl
+++ b/sbin/findBrokenAssets.pl
@@ -112,13 +112,13 @@ while ( my %row = $sth->hash ) {
 
             my $asset   = WebGUI::Asset->newByDynamicClass( $session, $row{assetId} );
             # Make sure we have a valid parent
-            unless ( $asset && WebGUI::Asset->newByDynamicClass( $session, $row{parentId} ) ) {
-                $asset->setParent( WebGUI::Asset->getImportNode( $session ) );
-                print "\tNOTE: Invalid parent. Asset moved to Import Node\n";
-            }
             if (!$asset) {
                 print "\tWARNING.  Asset is still broken.\n";
             }
+            elsif (! WebGUI::Asset->newByDynamicClass( $session, $row{parentId} )) {
+                $asset->setParent( WebGUI::Asset->getImportNode( $session ) );
+                print "\tNOTE: Invalid parent. Asset moved to Import Node\n";
+            }
 
         } ## end if ($fix)
         elsif ($delete) {
@@ -260,20 +260,25 @@ if ($file_assets) {
         }
         else {
             my $storage = $file_asset->getStorageLocation;
-            my $file = $storage->getPath($file_asset->get('filename'));
-            if (! -e $file) {
-                printf "\r%-s", "-- Broken file asset: ".$file_asset->getId." file does not exist: $file";
-                if ($delete) {
-                    my $success = $file_asset->purge;
-                    if ($success) {
-                        print "Purged File Asset";
-                    }
-                    else {
-                        print "Could not purge File Asset";
+            if (! $storage) {
+                printf "\r%-s", "-- No storage location: ".$file_asset->getId." storageId: ".$file_asset->get('storageId');
+            }
+            else {
+                my $file = $storage->getPath($file_asset->get('filename'));
+                if (! -e $file) {
+                    printf "\r%-s", "-- Broken file asset: ".$file_asset->getId." file does not exist: $file";
+                    if ($delete) {
+                        my $success = $file_asset->purge;
+                        if ($success) {
+                            print "Purged File Asset";
+                        }
+                        else {
+                            print "Could not purge File Asset";
+                        }
                     }
                 }
-                print "\n";
             }
+            print "\n";
         }
         progress( $file_assets, $count++ ) unless $no_progress;
     }