Fixed pathing

api/ObjectHelper.inc

@@ -207,7 +207,7 @@ class ObjectHelper {
    * @return type 
    */
   function getCollectionInfo($pid, $query = NULL) {
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
     $collectionClass = new CollectionClass();
     $results = $collectionClass->getRelatedItems($pid, $query);
     return $results;
@@ -548,7 +548,7 @@ class ObjectHelper {
    * @return array 
    */
   function get_content_models_list($pid, $include_fedora_system_content_models = FALSE) {
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
     $collectionHelper = new CollectionClass();
     $pids = array();
     $query = 'select $object from <#ri>

api/fedora_collection.inc

@@ -4,7 +4,7 @@
  * @file
  * Operations that affect a Fedora repository at a collection level.
  */
-module_load_include('inc', 'fedora_repository', 'CollectionClass');
+module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
 module_load_include('inc', 'fedora_repository', 'api/fedora_item');
 module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
 module_load_include('module', 'fedora_repository');

core/BatchIngest.inc

@@ -220,7 +220,7 @@ function create_batch_objects($label, $content_model, $object_files, $collection
 function batch_create_dc_from_mods($mods_xml) {
   $path = drupal_get_path('module', 'fedora_repository');
   module_load_include('inc', 'fedora_repository', 'api/ObjectHelper');
-  module_load_include('inc', 'fedora_repository', 'CollectionClass');
+  module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
 
   if ($xmlstr == NULL || strlen($xmlstr) < 5) {
     return " ";

core/CollectionClass.inc

@@ -480,7 +480,7 @@ class CollectionClass {
    * @return type 
    */
   function getXslContent($pid, $path, $canUseDefault = TRUE) {
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
     $collectionClass = new CollectionClass();
     $xslContent = $collectionClass->getCollectionViewStream($pid);
     if (!$xslContent && $canUseDefault) { //no xslt so we will use the default sent with the module

core/ContentModel.inc

@@ -436,7 +436,7 @@ class ContentModel extends XMLDatastream {
    and $object <fedora-model:state> <info:fedora/fedora-system:def/model#Active>)
    order by $title';
 
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
 
     $collectionHelper = new CollectionClass();
     $xml = simplexml_load_string($collectionHelper->getRelatedItems($this->pid, $query));

fedora_repository.module

@@ -86,7 +86,7 @@ function fedora_repository_collection_view($pid = NULL, $collection = NULL, $pag
 
   $content = '';
 
-  module_load_include('inc', 'fedora_repository', 'CollectionClass');
+  module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
   $collectionClass = new CollectionClass();
   $results = $collectionClass->getRelatedItems($pid, NULL);
   $content .= $objectHelper->parseContent($results, $pid, $dsId, $collection, $pageNumber);
@@ -151,7 +151,7 @@ function fedora_repository_ingest_form_submit(array $form, array &$form_state) {
   }
   elseif ($form_state['clicked_button']['#id'] == 'edit-submit') {
     global $base_url;
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
     module_load_include('inc', 'fedora_repository', 'core/CollectionPolicy');
     module_load_include('inc', 'fedora_repository', 'core/ContentModel');
 
@@ -958,7 +958,7 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
 
   $content = '<div id="content-fedora">';
 
-  module_load_include('inc', 'fedora_repository', 'CollectionClass');
+  module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
   $collectionClass = new CollectionClass();
   module_load_include('inc', 'fedora_repository', 'core/ContentModel');
   module_load_include('inc', 'fedora_repository', 'plugins/FedoraObjectDetailedContent');

plugins/DarwinCore.inc

@@ -244,7 +244,7 @@ class DarwinCore {
   public function asHTML() {
     $path = drupal_get_path('module', 'Fedora_Repository');
     module_load_include('inc', 'fedora_repository', 'api/ObjectHelper');
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
 
     $xmlstr = $this->darwinCoreXML;
     html_entity_decode($xmlstr);

plugins/Refworks.inc

@@ -223,7 +223,7 @@ class Refworks {
    */
   function handleForm(&$form_values) {
     $errorMessage = NULL;
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
     module_load_include('inc', 'fedora_repository', 'core/ContentModel');
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     $contentModelPid = ContentModel::getPidFromIdentifier($form_values['models']);

plugins/ShowStreamsInFieldSets.inc

@@ -227,7 +227,7 @@ class ShowStreamsInFieldSets {
    */
   function showRomeo($collapsed = FALSE) {
     $path = drupal_get_path('module', 'Fedora_Repository');
-    module_load_include('inc', 'fedora_repository', 'CollectionClass');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionClass');
     $collectionHelper = new CollectionClass();
     $xmlstr = $collectionHelper->getStream($this->pid, "ROMEO", 0);