can now install as well as reinstall

yorkulibraries · Feb 11, 2014 · b1ad3833cd1c8c3033a5fd6279323edd29cda235 · b1ad383
1 parent a9443ac
commit b1ad3833cd1c8c3033a5fd6279323edd29cda235
Unified Split

Showing with 15 additions and 14 deletions.

+15 −14 islandora.drush.inc
diff --git a/islandora.drush.inc b/islandora.drush.inc
@@ -176,24 +176,25 @@ function drush_islandora_solution_pack_install_content_models() {
    $info = islandora_solution_packs_get_required_objects($module);
    $objects_to_add = array();
    foreach ($info['objects'] as $key => $candidate) {
-  
-      $object = islandora_object_load($candidate);
-  
-      if (in_array('fedora-system:ContentModel-3.0', $object->models)) {
+  
+      if (in_array('fedora-system:ContentModel-3.0', $candidate->models)) {
        $objects_to_add[] = $candidate;
      }
    }
-  
-    foreach ($objects_to_add as $object_to_add) {
-  
-      $old_object = islandora_object_load($object_to_add->id);
-  
-      if ($old_object) {
-  
-        $deleted = islandora_delete_object($old_object);
-  
-        if (!$deleted) {
-  
-          drush_log(dt('@object did not delete.', array('@object' => $old_object->id), 'error'));
-  
-          continue;
+  
+    if (count($objects_to_add) > 0) {
+  
+      foreach ($objects_to_add as $object_to_add) {
+  
+        $old_object = islandora_object_load($object_to_add->id);
+  
+        if ($old_object) {
+  
+          $deleted = islandora_delete_object($old_object);
+  
+          if (!$deleted) {
+  
+            drush_log(dt('@object did not delete.', array('@object' => $old_object->id), 'error'));
+  
+            continue;
+  
+          }
+  
+        }
+  
+        $new_object = islandora_add_object($object_to_add);
+  
+        $verb = $deleted ? dt("Replaced") : dt("Added");
+  
+        if ($new_object) {
+  
+          drush_print("$verb " . $object_to_add->id . " - " . $object_to_add->label);
        }
-  
-      }
-  
-      $new_object = islandora_add_object($object_to_add);
-  
-      $verb = $deleted ? dt("Replaced") : dt("Added");
-  
-      if ($new_object) {
-  
-        drush_log("$verb " . $object_to_add->id . " - " . $object_to_add->label);
      }
    }
  }