Merge branch '6.x' of git://github.com/Islandora/islandora into 6.x

.gitignore

@@ -0,0 +1 @@
+nbproject

CollectionClass.inc

@@ -34,12 +34,12 @@ class CollectionClass {
   }
   
   public static function getCollectionQuery($pid) {
-    if ($query = self::getCollectionQueryFromStream($pid)) {
+    $query = self::getCollectionQueryFromStream($pid);
-      return $query;
+    if (!$query) {
-    }
+      $query = self::getDefaultCollectionQuery($pid);
-    else {
-      return self::getDefaultCollectionQuery($pid);
     }
+    drupal_alter("islandora_collection_query", $query, $pid);
+    return $query;
   }
   
   protected static function getCollectionQueryFromStream($pid) {

ContentModel.inc

@@ -1475,19 +1475,30 @@ class ContentModel extends XMLDatastream {
                 self::$errors[] = 'Execute Form Handler: file \'' . $path . '\' does not exist.';
               }
               else {
-                require_once($path);
+
-                $className = $method->getAttribute('class');
+                $file_extension = pathinfo($method->getAttribute('file'), PATHINFO_EXTENSION);
-                $methodName = ($method->getAttribute('method'));
+                $file_path_without_extension = $method->getAttribute('file');
-                if (!class_exists($className)) {
+                /* Only in PHP. This is meant to avoid file path
-                  self::$errors[] = 'Execute Form Handler: class \'' . $className . '\' does not exist.';
+                 * concatenation issues.*/
-                }
+                $file_path_without_extension = substr($file_path_without_extension, 0, strlen($file_path_without_extension) - (strlen($file_extension) + 1));
-                else {
+                /* Only try to execute if the module is present, this is
-                  $class = new $className($pid);
+                 * necessarybecause we go outside of the expected
-                  if (!method_exists($class, $methodName)) {
+                 * 'Drupal Way' and have dynamic dependencies.*/
-                    self::$errors[] = 'Execute Form Handler: method \'' . $className . '->' . $methodName . '\' does not exist.';
+                if (module_exists(!empty($module) ? $module : 'fedora_repository')) {
+                  module_load_include($file_extension, !empty($module) ? $module : 'fedora_repository', $file_path_without_extension);
+                  $className = $method->getAttribute('class');
+                  $methodName = ($method->getAttribute('method'));
+                  if (!class_exists($className)) {
+                    self::$errors[] = 'Execute Form Handler: class \'' . $className . '\' does not exist.';
                   }
                   else {
-                    $output = $class->$methodName($page_number);
+                    $class = new $className($pid);
+                    if (!method_exists($class, $methodName)) {
+                      self::$errors[] = 'Execute Form Handler: method \'' . $className . '->' . $methodName . '\' does not exist.';
+                    }
+                    else {
+                      $output = $class->$methodName($page_number);
+                    }
                   }
                 }
               }

ObjectHelper.inc

@@ -19,9 +19,7 @@ class ObjectHelper {
   public static $INGEST_FEDORA_OBJECTS = 'ingest new fedora objects';
   public static $EDIT_TAGS_DATASTREAM = 'edit tags datastream';
   public static $VIEW_DETAILED_CONTENT_LIST = 'view detailed list of content';
-  public static $DISPLAY_ALWAYS = 0;
+
-  public static $DISPLAY_NEVER = 1;
-  public static $DISPLAY_NO_MODEL_OUTPUT = 2;
   // TODO: Make this into a static member constant
   public $availableDataStreamsText = 'Detailed list of content';
 
@@ -705,107 +703,6 @@ class ObjectHelper {
     return ($namespace_access && user_access($op, $as_user));
   }
 
-  /**
-   * internal function
-   * uses an xsl to parse the sparql xml returned from the ITQL query
-   * @deprecated
-   *   This is only used in the fedora/repository/collection path, 
-   *   which should probably be nuked.
-   * @param $content String
-   */
-  function parseContent($content, $pid, $dsId, $collection, $pageNumber = NULL) {
-    $path = drupal_get_path('module', 'fedora_repository');
-    global $base_url;
-    $collection_pid = $pid; //we will be changing the pid later maybe
-    $objectHelper = $this;
-    $parsedContent = NULL;
-    $contentModels = $this->get_content_models_list($pid);
-    $isCollection = FALSE;
-
-    $fedoraItem = NULL;
-    $datastreams = $this->get_formatted_datastream_list($pid, $contentModels, $fedoraItem);
-
-    if (!empty($contentModels)) {
-      foreach ($contentModels as $contentModel) {
-        if ($contentModel == variable_get('fedora_collection_model_pid', 'islandora:collectionCModel')) {
-          //if this is a collection object store the $pid in the session as it will come in handy
-          //after a purge or ingest to return to the correct collection.
-
-          $_SESSION['fedora_collection'] = $pid;
-          $isCollection = TRUE;
-        }
-      }
-    }
-
-    if ($fedoraItem !== NULL) {
-      $dslist = $fedoraItem->get_datastreams_list_as_array();
-      if (isset($dslist['COLLECTION_POLICY'])) {
-        $isCollection = TRUE;
-      }
-    }
-    //--------------------------------------------------------------------------------
-    //show the collections datastreams
-    if ($results->length > 0 || $isCollection == TRUE) {
-      //  if(strlen($objectList)>22||$contentModel=='Collection'||$contentModel=='Community')//length of empty dom still equals 22 because of <table/> etc
-      module_load_include('inc', 'fedora_repository', 'CollectionPolicy');
-      $collectionPolicyExists = $this->getMimeType($pid, CollectionPolicy::getDefaultDSID());
-      if (user_access(ObjectHelper::$INGEST_FEDORA_OBJECTS) && $collectionPolicyExists) {
-        if (!empty($collectionPolicyExists)) {
-          $allow = TRUE;
-          if (module_exists('fedora_fesl')) {
-            $allow = fedora_fesl_check_roles($pid, 'write');
-          }
-          if ($allow) {
-            // $ingestObject = '<a title="'. t('Ingest a New object into ') . $collectionName . ' '. $collection_pid . '" href="'. base_path() .
-            $ingest_text = t('Ingest a new object into @collection_name PID @collection_pid', array('@collection_name' => $collectionName, '@collection_pid' => $collection_pid));
-            $ingestObject = l(theme('image', "$path/images/ingest.png", $ingest_text), "fedora/ingestObject/$collection_pid/$collectionName", array('attributes' => array(
-              'class' => 'icon',
-              'title' => $ingest_text,
-            ))) . t('Add to this Collection');
-          }
-        }
-      }
-      else {
-        $ingestObject = '&nbsp;';
-      }
-    }
-
-    $datastreams .= $ingestObject;
-
-
-    $output .= $datastreams;
-
-    $showDesc = FALSE;
-    switch (variable_get('fedora_object_display_description', ObjectHelper :: $DISPLAY_NO_MODEL_OUTPUT)) {
-      case ObjectHelper :: $DISPLAY_NEVER: break;
-      case ObjectHelper :: $DISPLAY_NO_MODEL_OUTPUT:
-        if (trim($datastreams) == '') {
-          $showDesc = TRUE;
-        }
-        break;
-
-      case ObjectHelper :: $DISPLAY_ALWAYS:
-      default:
-        $showDesc = TRUE;
-        break;
-    }
-    if ($showDesc) {
-      //just show default dc or qdc as we could not find a content model
-      $metaDataText = t('Description');
-      $body = $this->getQDC($pid);
-      $fieldset = array(
-        '#title' => t("!metaDataText", array('!metaDataText' => $metaDataText)),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
-        '#value' => $body
-      );
-      $output .= theme('fieldset', $fieldset);
-    }
-
-
-    return $output;
-  }
-
   /**
    * Get the query to find parent objects.
    *

api/fedora_item.inc

@@ -347,7 +347,10 @@ RDF;
     $modified = FALSE;
     $rels = $relsextxml->getElementsByTagNameNS($namespaceURI, $relationship);
     if (!empty($rels)) {
-      foreach ($rels as $rel) {
+      // iterate backwards so if we delete something our pointer doesn't get out of sync
+      for ($i = $rels->length; $i>0; $i--) {
+        $rel = $rels->item($i-1);
+//      foreach ($rels as $rel) { // moving forward like this caused iteration errors when something was deleted
         if (  //If either no object is specified, or the object matches (in either the literal or URI case), remove this node from it's parent, and mark as changed.
           empty($object) || 
           (($literal_value == RELS_TYPE_URI) && $rel->getAttributeNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'resource') == $object) ||

fedora_repository.module

@@ -62,37 +62,6 @@ function fedora_repository_purge_object($pid = NULL, $name = NULL) {
   return $output;
 }
 
-/**
- * fedora repository collection view
- * @global type $user
- * @param type $pid
- * @param type $collection
- * @param type $pageNumber
- * @return type 
- */
-function fedora_repository_collection_view($pid = NULL, $collection = NULL, $pageNumber = NULL) {
-  module_load_include('inc', 'fedora_repository', 'ObjectHelper');
-  global $user;
-  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');
-    return ' ';
-  }
-
-  $objectHelper = new ObjectHelper();
-  if ($pid == NULL) {
-    $pid = variable_get('fedora_repository_pid', 'islandora:root');
-  }
-
-  $content = '';
-
-  module_load_include('inc', 'fedora_repository', 'CollectionClass');
-  $collectionClass = new CollectionClass();
-  $results = $collectionClass->getRelatedItems($pid, NULL);
-  $content .= $objectHelper->parseContent($results, $pid, $dsId, $collection, $pageNumber);
-
-  return $content;
-}
-
 /**
  * fedora repository ingest object
  * @param type $collection_pid
@@ -948,7 +917,7 @@ function makeObject($pid, $dsID) {
     drupal_set_message(t("No pid or dsid given to create an object with."));
     return ' ';
   }
-  global $user;
+  global $user, $conf;
   if (!fedora_repository_access(OBJECTHELPER :: $OBJECT_HELPER_VIEW_FEDORA, $pid, $user)) {
     drupal_access_denied();
     return;
@@ -956,6 +925,9 @@ function makeObject($pid, $dsID) {
     return ' ';
   }
 
+  //Disable the page cache, so entire datastreams do not get thrown into the page cache.
+  $conf['cache'] = CACHE_DISABLED;
+
   module_load_include('inc', 'fedora_repository', 'ObjectHelper');
   $objectHelper = new ObjectHelper();
   $objectHelper->makeObject($pid, $dsID);
@@ -1091,7 +1063,7 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
   }
   if (!fedora_repository_access(OBJECTHELPER::$OBJECT_HELPER_VIEW_FEDORA, $pid, $user)) {
     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');
+      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');
     }
     drupal_access_denied();
     exit;

formClass.inc

@@ -123,13 +123,6 @@ class formClass {
       'access arguments' => array('add fedora datastreams')
     );
     
-    $items['fedora/repository/collection'] = array(
-      'title' => t('Collection view'),
-      'page callback' => 'fedora_collection_view',
-      'type' => MENU_CALLBACK,
-      'access argruments' => array('view fedora collection'),
-    );
-    
     //new for mnpl******************************************
     $items['fedora/repository/mnpl_advanced_search'] = array(
       'title' => t('Repository advanced search'),
@@ -347,21 +340,6 @@ class formClass {
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
-    $form['advanced']['fedora_object_display_title'] = array(
-      '#type' => 'select',
-      '#title' => t('Display Object Title Behaviour'),
-      '#default_value' => variable_get('fedora_object_display_title', ObjectHelper::$DISPLAY_ALWAYS),
-      '#options' => array(ObjectHelper::$DISPLAY_ALWAYS => t('Always'), ObjectHelper::$DISPLAY_NEVER => t('Never'), ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT => t('Only if no Content Model display output.')),
-      '#description' => t('Determines when to display the object (or collection) title when viewing an object/collection page.'),
-    );
-
-    $form['advanced']['fedora_object_display_description'] = array(
-      '#type' => 'select',
-      '#title' => t('Display Object Description Behaviour'),
-      '#default_value' => variable_get('fedora_object_display_description', ObjectHelper::$DISPLAY_ALWAYS),
-      '#options' => array(ObjectHelper::$DISPLAY_ALWAYS => t('Always'), ObjectHelper::$DISPLAY_NEVER => t('Never'), ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT => t('Only if no Content Model display output.')),
-      '#description' => t('Determines when to display the default object (or collection) description fieldset when viewing an object/collection page.'),
-    );
 
     $form['advanced']['fedora_object_restrict_datastreams'] = array(
       '#type' => 'checkbox',
@@ -385,14 +363,6 @@ class formClass {
         )),
     );
     
-    $form['advanced']['fedora_collection_display_list'] = array(
-      '#type' => 'select',
-      '#title' => t('Display Collection List Behaviour'),
-      '#default_value' => variable_get('fedora_collection_display_list', ObjectHelper::$DISPLAY_ALWAYS),
-      '#options' => array(ObjectHelper::$DISPLAY_ALWAYS => t('Always'), ObjectHelper::$DISPLAY_NEVER => t('Never'), ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT => t('Only if no Content Model display output.')),
-      '#description' => t('Determines when to display the list of objects when viewing a collection page.'),
-    );
-    
     $form['advanced']['fedora_control_group_control_during_ingest'] = array(
       '#type' => 'checkbox',
       '#title' => t('Allow control groups select in datastream ingest'),