ENH: New file organization

Author: Julien Jomier

core/include.php

@@ -4,8 +4,7 @@
 require_once BASE_PATH.'/core/AppFilters.php';
 require_once BASE_PATH.'/core/AppComponent.php';
 require_once BASE_PATH.'/core/AppForm.php';
-require_once BASE_PATH.'/core/models/AppDatabasePdo.php';
-require_once BASE_PATH.'/core/models/AppDatabaseCassandra.php';
+require_once BASE_PATH.'/core/models/AppModel.php';
 require_once BASE_PATH.'/core/models/AppDao.php';
 
 //include constant files

core/models/AppDatabaseCassandra.php

@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * 
+ */
+class AppModel extends MIDASModel
+{
+
+    
+}
+?>

core/models/AppDatabasePdo.php

@@ -1,5 +1,5 @@
 <?php
-class MIDASAssetstoreModel extends MIDASModel
+class AssetstoreModelBase extends AppModel
 {
   public function __construct()
     {
@@ -16,7 +16,6 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  
-  
-} // end class MIDASAssetstoreModel
+ 
+} // end class AssetstoreModelBase
 ?>

core/models/AppModel.php

@@ -1,5 +1,5 @@
 <?php
-class MIDASBitstreamModel extends MIDASModel
+class BitstreamModelBase extends AppModel
 {
   public function __construct()
     {
@@ -24,5 +24,5 @@ public function __construct()
     $this->initialize(); // required  
     } // end __construct()
 
-} // end class MIDASBitstreamModel
+} // end class BitstreamModelBase
 ?>

library/MIDAS/models/MIDASAssetstoreModel.php renamed to core/models/base/AssetstoreModelBase.php

@@ -1,5 +1,5 @@
 <?php
-abstract class MIDASCommunityModel extends MIDASModel
+abstract class CommunityModelBase extends AppModel
 {
   public function __construct()
     {
@@ -32,5 +32,5 @@ public function __construct()
   abstract function getPublicCommunities($limit=20);
   abstract function getByName($name);
 
-} // end class MIDASCommunityModel
+} // end class CommunityModelBase
 ?>

library/MIDAS/models/MIDASBitstreamModel.php renamed to core/models/base/BitstreamModelBase.php

@@ -1,5 +1,5 @@
 <?php
-abstract class MIDASFeedModel extends MIDASModel
+abstract class FeedModelBase extends AppModel
 {
   public function __construct()
     {
@@ -44,5 +44,5 @@ function getFeedsByCommunity($loggedUserDao,$communityDao,$policy=0,$limit=20)
     return $this->_getFeeds($loggedUserDao,null,$communityDao,$policy,$limit);
     } //end getFeedsByCommunity
 
-} // end class MIDASFeedModel
+} // end class FeedModelBase
 ?>

library/MIDAS/models/MIDASCommunityModel.php renamed to core/models/base/CommunityModelBase.php

@@ -1,5 +1,5 @@
 <?php
-class MIDASFeedpolicygroupModel extends MIDASModel
+class FeedpolicygroupModelBase extends AppModel
 {
   public function __construct()
     {
@@ -23,5 +23,5 @@ public function __construct()
     } // end __construct()
 
 
-} // end class MIDASFeedpolicygroupModel
+} // end class FeedpolicygroupModelBase
 ?>

library/MIDAS/models/MIDASFeedModel.php renamed to core/models/base/FeedModelBase.php

@@ -1,5 +1,5 @@
 <?php
-class MIDASFeedpolicyuserModel extends MIDASModel
+class FeedpolicyuserModelBase extends AppModel
 {
   public function __construct()
     {
@@ -54,5 +54,5 @@ public function createPolicy($user, $folder, $policy)
     return $policyUser;
     }
 
-} // end class MIDASFeedpolicyuserModel
+} // end class FeedpolicyuserModelBase
 ?>