ISLANDORA-260 Missing PID now shows 404 page

fedora_repository.module

@@ -552,7 +552,6 @@ function fedora_repository_replace_stream_form_submit($form, &$form_state) {
   $item->modify_datastream_by_reference($streamUrl, $dsid, $dsLabel, $dformat);
 
   $form_state['redirect'] = 'fedora/repository/' . $pid;
-
 }
 
 function fedora_repository_edit_qdc_page($pid = NULL, $dsId = NULL) {
@@ -721,16 +720,20 @@ function makeObject($pid, $dsID) {
 function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NULL, $page_number = NULL, $limit = NULL) {
   module_load_include('inc', 'fedora_repository', 'ObjectHelper');
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
+  module_load_include('inc', 'fedora_repository', 'api/fedora_item');
   global $user;
 
-
   if (!fedora_available()) {
     drupal_set_message('The Fedora repository server is currently unavailable. Please contact the site administrator.', 'warning', FALSE);
     return '';
   }
 
-  if ($pid &!validPid($pid)) {
+  $item = new fedora_item($pid);
+  if (!$item->exists()) {
+    drupal_not_found();
+  }
 
+  if ($pid & !validPid($pid)) {
     drupal_set_message(t("Invalid PID!"), 'error');
     return ' ';
   }
@@ -740,8 +743,6 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
     return ' ';
   }
   if (!fedora_repository_access(OBJECTHELPER::$OBJECT_HELPER_VIEW_FEDORA, $pid, $user)) {
-    //drupal_set_message(t("You do not have access to Fedora objects within the attempted namespace or access to Fedora denied"), 'error');
-
     if (user_access('access administration pages')) {
       drupal_set_message(t("PIDs may be added to allowed namespaces, or all namespace restrictions removed !here", array('!here' => l('here', 'admin/settings/fedora_repository'))), 'warning');
     }
@@ -769,13 +770,6 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
 
   module_load_include('inc', 'fedora_repository', 'CollectionClass');
   $collectionClass = new CollectionClass();
-  //if(!isset($pageNumber)){
-  //    $pageNumber=0;
-  //}
-  //if(!isset($limit)){
-  //    $limit=20;
-  //}
-
   module_load_include('inc', 'fedora_repository', 'ContentModel');
   module_load_include('inc', 'fedora_repository', 'plugins/fedoraObject');
   $breadcrumbs = array();
@@ -783,15 +777,12 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
   drupal_set_breadcrumb(array_reverse($breadcrumbs));
 
   $offset = $limit * $page_number;
-  //$results = $collectionClass->getRelatedObjects($pid, $limit, $offset, NULL); //updated so we can do paging in query not in xslt
-  //$results = $collectionClass->getRelatedItems($pid, NULL);
   $content_models = $objectHelper->get_content_models_list($pid);
   // Each content model may return either a tabset array or plain HTML. If it's HTML, stick it in a tab.
   $cmodels_tabs = array(
     '#type' => 'tabset',
   );
   foreach ($content_models as $content_model) {
-    //$content_model_fieldsets = $objectHelper->createExtraFieldsets($pid, $content_model, $pageNumber);
     $content_model_fieldset = $content_model->displayExtraFieldset($pid, $page_number);
     if (is_array($content_model_fieldset)) {
       $cmodels_tabs = array_merge($cmodels_tabs, $content_model_fieldset);
@@ -808,13 +799,6 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
   $obj = new FedoraObject($pid);
   $object_details = $obj->showFieldSets();
   $cmodels_tabs = array_merge($cmodels_tabs, $object_details);
-  
-  
-  //$content .= $objectHelper
-  //$content .= $objectHelper->parseContent($results, $pid, $dsId, $collection, $pageNumber);
-  //the below is for islandlives we should be able to do this in the xslt though
-  //$css=$path.'/stylesheets/container-large.css';
-  //drupal_add_css($css);
   return tabs_render($cmodels_tabs);
 }
 
@@ -1182,7 +1166,6 @@ function fedora_repository_theme() {
       'arguments' => array(
         'element' => NULL
       ),
-
       'fedora_repository_solution_packs_list' => array(
         'arguments' => array(
           'solution_packs' => NULL,
@@ -1456,7 +1439,6 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
   }
 }
 
-
 function fedora_repository_required_fedora_objects() {
   // array( 'path-to-foxml-file', 'pid', 'dsid', 'path-to-datastream-file', int dsversion, boolean required)
   $module_path = drupal_get_path('module', 'fedora_repository');
@@ -1966,7 +1948,6 @@ function fedora_repository_display_schema($file) {
   return;
 }
 
-
 function fedora_repository_batch_reingest_object($object, &$context) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
@@ -2039,7 +2020,8 @@ function fedora_repository_get_islandora_datastream_version($item = NULL, $dsid
   $return = NULL;
   if (isset($item)) {
     $doc = simplexml_load_string($item->get_datastream_dissemination($dsid));
-  } elseif (isset($datastream_file)) {
+  }
+  elseif (isset($datastream_file)) {
     $doc = simplexml_load_file($datastream_file);
   }