Merge remote branch 'origin/ISLANDORA-250'

CollectionClass.inc

@@ -32,7 +32,6 @@ class CollectionClass {
       $this->collectionObject = new ObjectHelper($pid);
       $this->pid = $pid;
     }
-    
   }
 
   /* gets objects related to this object.  must include offset and limit
@@ -81,7 +80,6 @@ class CollectionClass {
                              minus $content <mulgara:is> <info:fedora/fedora-system:FedoraObject-3.0>
                              order by $title';
       }
-   
     }
     else {
       // Replace %parent_collection% with the actual collection PID
@@ -426,19 +424,18 @@ class CollectionClass {
     $objectHelper = new ObjectHelper();
     $item = new Fedora_Item($this->pid);
     $query = NULL;
-    if ($item->exists()) {
+    if ($item->exists() && array_key_exists('QUERY', $item->datastreams)) {
       $query = $item->get_datastream_dissemination('QUERY');
     }
     $results = $this->getRelatedItems($this->pid, $query);
 
-    $collection_items = $this->renderCollection($results, $this->pid, NULL, NULL, $page_number );
+    $collection_items = $this->renderCollection($results, $this->pid, NULL, NULL, $page_number);
     $collection_item = new Fedora_Item($this->pid);
     // Check the form post to see if we are in the middle of an ingest operation.
     $show_ingest_tab = (!empty($_POST['form_id']) && $_POST['form_id'] == 'fedora_repository_ingest_form');
     $add_to_collection = $this->getIngestInterface();
 
     $tabset['view_tab'] = array(
-//     $collection_fieldset = array (
       '#type' => 'tabpage',
       '#title' => 'View',
       '#content' => $collection_items
@@ -461,14 +458,12 @@ class CollectionClass {
     $collectionPolicyExists = $objectHelper->getMimeType($this->pid, CollectionPolicy::getDefaultDSID());
     if (user_access(ObjectHelper :: $INGEST_FEDORA_OBJECTS) && $collectionPolicyExists) {
       if (!empty($collectionPolicyExists)) {
-        $allow=TRUE;
+        $allow = TRUE;
         if (module_exists('fedora_fesl')) {
-          $allow= fedora_fesl_check_roles($this->pid,'write');
+          $allow = fedora_fesl_check_roles($this->pid, 'write');
         }
         if ($allow) {
-        // $ingestObject = '<a title="'. t('Ingest a New object into ') . $collectionName . ' '. $collection_pid . '" href="'. base_path() .
           $ingestObject = drupal_get_form('fedora_repository_ingest_form', $this->pid);
-          
         }
       }
     }
@@ -483,7 +478,6 @@ class CollectionClass {
     $path = drupal_get_path('module', 'fedora_repository');
     global $base_url;
     $collection_pid = $pid; //we will be changing the pid later maybe
-    //module_load_include('php', ''Fedora_Repository'', 'ObjectHelper');
     $objectHelper = new ObjectHelper();
     $parsedContent = NULL;
     $contentModels = $objectHelper->get_content_models_list($pid);
@@ -539,7 +533,8 @@ class CollectionClass {
           return '';
         }
       }
-    } else {
+    }
+    else {
       drupal_set_message(t("No Objects in this collection or bad query."));
     }
     return $objectList;

ObjectHelper.inc

@@ -510,7 +510,7 @@ class ObjectHelper {
     $pids = array();
     $query = 'select $object from <#ri>
             where <info:fedora/' . $pid . '> <fedora-model:hasModel> $object
-            and $object <fedora-model:state> <info:fedora/fedora-system:def/model#Active>';
+            and $object <fedora-model:state> <info:fedora/Fedora-system:def/model#Active>';
     $content_models = $collectionHelper->getRelatedItems($pid, $query);
 
     if (empty($content_models)) {