From 6aa5226e58816e668a29e5bc30673d24bea4d17e Mon Sep 17 00:00:00 2001
From: Nigel Banks <nigel.g.banks@gmail.com>
Date: Fri, 8 Mar 2013 15:25:20 +0100
Subject: [PATCH] Removed default ingest menu, ingest configuration can now
 take a object.

Was not in use and excepting any parameters for the ingest process via GET
was not very safe.

Also the ingest configuration can now take an NewFedoraObject rather than
building one from the configuration options. The old way is still supported
for now though.
---
 includes/ingest.form.inc | 21 +++++++++--------
 includes/ingest.menu.inc | 49 ----------------------------------------
 2 files changed, 12 insertions(+), 58 deletions(-)
 delete mode 100644 includes/ingest.menu.inc

diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc
index 9434e9e4..ca6af592 100644
--- a/includes/ingest.form.inc
+++ b/includes/ingest.form.inc
@@ -96,15 +96,18 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
  */
 function islandora_ingest_form_prepare_new_object(array $configuration) {
   module_load_include('inc', 'islandora', 'includes/utilities');
-  // ID is more specific than namespace so it will take precedence.
-  $id = isset($configuration['namespace']) ? $configuration['namespace'] : 'islandora';
-  $id = isset($configuration['id']) ? $configuration['id'] : $id;
-  $label = isset($configuration['label']) ? $configuration['label'] : 'New Object';
-  $relationship_map = function($o) {
-    return array('relationship' => 'isMemberOfCollection', 'pid' => $o);
-  };
-  $relationships = empty($configuration['collections']) ? array() : array_map($relationship_map, $configuration['collections']);
-  return islandora_prepare_new_object($id, $label, array(), array(), $relationships);
+  if (empty($configuration['object'])) {
+    // ID is more specific than namespace so it will take precedence.
+    $id = isset($configuration['namespace']) ? $configuration['namespace'] : 'islandora';
+    $id = isset($configuration['id']) ? $configuration['id'] : $id;
+    $label = isset($configuration['label']) ? $configuration['label'] : 'New Object';
+    $relationship_map = function($o) {
+      return array('relationship' => 'isMemberOfCollection', 'pid' => $o);
+    };
+    $relationships = empty($configuration['collections']) ? array() : array_map($relationship_map, $configuration['collections']);
+    return islandora_prepare_new_object($id, $label, array(), array(), $relationships);
+  }
+  return $configuration['object'];
 }
 
 /**
diff --git a/includes/ingest.menu.inc b/includes/ingest.menu.inc
deleted file mode 100644
index a6f79891..00000000
--- a/includes/ingest.menu.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file
- * Ingest Menu callback hooks.
- */
-
-/**
- * Menu callback, Renders the multi-page ingest form if possible.
- *
- * @return string
- *   HTML representing the mult-page ingest form.
- */
-function islandora_ingest_callback() {
-  module_load_include('inc', 'islandora', 'includes/ingest.form');
-  try {
-    $configuration = islandora_ingest_get_configuration();
-    return drupal_get_form('islandora_ingest_form', $configuration);
-  }
-  catch(Exception $e) {
-    $redirect = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '<front>';
-    // Redirect back to referer or top level collection.
-    drupal_goto($redirect);
-  }
-}
-
-/**
- * Fetches the ingest configuration from the $_GET parameters.
- *
- * Generic parameters as accepted by all ingest processes, other modules may
- * add to this list.
- *   id -> The pid of the object to create. optional.
- *   models -> Comma delimited list of all the content models the created object
- *             should have.
- *   collections -> Comma delimited list of all the collections the created
- *                  object should belong to.
- *
- * @return array
- *   The configuration options used to build the multi-paged ingest process.
- */
-function islandora_ingest_get_configuration() {
-  $configuration = $_GET;
-  unset($configuration['q']);
-  $convert_to_array_keys = array_intersect(array('models', 'collections'), array_keys($configuration));
-  foreach ($convert_to_array_keys as $key) {
-    $configuration[$key] = explode(',', $configuration[$key]);
-  }
-  return $configuration;
-}