Creating tripal_views module

base/tripal_core/tripal_core.info

@@ -4,8 +4,5 @@ description = The core module for the Tripal package that integrates Drupal and
 core = 6.x
 project = tripal_core
 package = Tripal
-version = 6.x-0.3.1b
+version = 6.x-0.4
 
-dependencies[] = views
-dependencies[] = ahah_helper
-dependencies[] = views_data_export

base/tripal_core/tripal_core.install

@@ -60,10 +60,6 @@ function tripal_core_get_schemas (){
    foreach ($temp as $table => $arr){ 
       $schema[$table] = $arr; 
    }
-   $temp = tripal_core_views_schema();
-   foreach ($temp as $table => $arr){ 
-      $schema[$table] = $arr; 
-   } 
 
 	return $schema;
 }
@@ -131,169 +127,4 @@ function tripal_core_jobs_schema(){
    );
    return $schema;
 }
-/************************************************************************
-* 
-*
-* @ingroup tripal_core
-*/
-function tripal_core_views_schema(){
-   $schema = array();
-	$schema['tripal_views'] = array(
-		'description' => 'contains the setupes, their materialized view id and base table name that was used.',
-		'fields' => array(
-			'setup_id' => array(
-				'description' => 'the id of the setup',
-				'type' => 'serial',
-				'unsigned' => TRUE,
-				'not null' => TRUE,
-			),
-			'mview_id' => array(
-				'description' => 'the materialized view used for this setup',
-				'type' => 'int',
-				'unsigned' => TRUE,
-			),
-			'table_name' => array(
-				'description' => 'the base table name to be used when using this setup. Use this field when not using a materialized view',
-				'type' => 'varchar',
-				'length' => 255,
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'name' => array(
-				'description' => 'Human readable name of this setup',
-				'type' => 'varchar',
-				'length' => 255,
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'comment' => array(
-				'description' => 'add notes about this views setup',
-				'type' => 'text',
-				'size' => 'normal',
-				'not null' => FALSE,
-				'default' => '',
-			),
-		),
-		'unique_keys' => array(
-			'setup_id' => array('setup_id'),
-		),
-		'primary key' => array('setup_id'),
-	);
-
-	$schema['tripal_views_join'] = array(
-		'description' => 'coordinate the joining of tables',
-		'fields' => array(
-		  'view_join_id' => array(
-				'description' => 'the id of the join',
-				'type' => 'serial',
-				'unsigned' => TRUE,
-				'not null' => TRUE,
-		  ),
-			'setup_id' => array(
-				'description' => 'setup id from tripal_views table',
-				'type' => 'int',
-				'unsigned' => TRUE,
-				'not null'=> TRUE,
-			),
-			'base_table' => array(
-			   'description' => 'the name of the base table',
-				'type' => 'varchar',
-				'length' => '255',
-				'not null' => TRUE,
-				'default' => '',
-	      ),
-			'base_field' => array(
-				'description' => 'the name of the base table column that will be joined',
-				'type' => 'varchar',
-				'length' => '255',
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'left_table' => array(
-				'description' => 'the table on which to perform a left join',
-				'type' => 'varchar',
-				'length' => '255',
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'left_field' => array(
-				'description' => 'the column on which to perform a left join',
-				'type' => 'varchar',
-				'length' => '255',
-				'not null' => TRUE,
-				'default' => '',
-	      ),
-		),
-		'unique_keys' => array(
-			'setup_id' => array('view_join_id'),
-		),
-		'primary key' => array('view_join_id'),
-	);
-
-	$schema['tripal_views_handlers'] = array(
-		'description' => 'in formation for views: column and views handler name',
-		'fields' => array(
-			'handler_id' => array(
-				'description' => 'the id of the handler',
-				'type' => 'serial',
-			   'unsigned' => TRUE,
-			   'not null' => TRUE,
-	      ),
-			'setup_id' => array(
-				'description' => 'setup id from the tripal_views table',
-				'type' => 'int',
-				'unsigned' => TRUE,
-				'not null'=> TRUE,
-			),
-			'column_name' => array(
-				'description' => '',
-				'type' => 'varchar',
-				'length' => '255',
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'handler_type' => array(
-				'description' => 'identifies the type of hander (e.g. field, filter, sort, argument, relationship, etc.)',
-				'type' => 'varchar',
-				'length' => '50',
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'handler_name' => array(
-				'description' => 'the name of the handler',
-				'type' => 'varchar',
-				'length' => '255',
-				'not null' => TRUE,
-				'default' => '',
-			),
-			'arguments' => array(
-				'description' => 'arguments that may get passed to the handler',
-				'type' => 'text',
-				'size' => 'normal',
-				'not null' => FALSE,
-				'default' => '',
-			),
-		),
-		'unique_keys' => array(
-		   'setup_id' => array('handler_id'),
-	   ),
-		'primary key' => array('handler_id'),
-	);
-
-   return $schema;
-}
-/************************************************************************
-* 
-*
-* @ingroup tripal_core
-*/
-function tripal_core_update_6000(){
-   $schema = tripal_core_views_schema();
-   $ret = array();
-   foreach ($schema as $name => $table) {
-      db_create_table($ret, $name, $table);
-   }   
-   return $ret;
-}
-
 ?>

base/tripal_core/tripal_core.module

@@ -4,10 +4,8 @@ require_once "jobs.php";
 require_once "mviews.php";
 require_once "cvterms.php";
 require_once "chado_install.php";
-require_once "tripal_views_integration.inc";
-
 require_once "tripal_core.api.inc";
-require_once "tripal_core.views.inc";
+
 
 /**
  * @defgroup tripal_modules Tripal Modules
@@ -183,38 +181,6 @@ function tripal_core_menu() {
      'access arguments' => array('access administration pages'),
      'type' => MENU_CALLBACK,
    );
- 	$items['admin/tripal/views/integration'] = array(
-     'title' => t('Views Integration'),
-     'description' => t('Allows you to select existing materialized views and provide details for integration with Drupal Views.'),
-     'page callback' => 'tripal_core_views_integration_setup_list',
-     'access arguments' => array('manage tripal_views_integration'),
-     'type' => MENU_NORMAL_ITEM,
- 	);
-
-
-	$items['admin/tripal/views/integration/new'] = array(
-     'title' => 'Integrate Views',
-     'page callback' => 'drupal_get_form',
-     'page arguments' => array('tripal_core_views_integration_form'),
-     'access arguments' => array('manage tripal_views_integration'), //TODO: figure out the proper permissions arguments
-     'type' => MENU_CALLBACK,
-	);
-	
-	$items['admin/tripal/views/integration/edit/%'] = array(
-     'title' => 'Edit Views Integration',
-     'page callback' => 'drupal_get_form',
-     'page arguments' => array('tripal_core_views_integration_form',5),
-     'access arguments' => array('manage tripal_views_integration'), //TODO: figure out the proper permissions arguments
-     'type' => MENU_CALLBACK,
-	);
-
-	$items['admin/tripal/views/integration/delete/%'] = array(
-     'title' => 'Delete Views Integration',
-     'page callback' => 'tripal_core_views_integration_delete',
-     'page arguments' => array(5),
-     'access arguments' => array('manage tripal_views_integration'), //TODO: figure out the proper permissions arguments
-     'type' => MENU_CALLBACK,
-	);
   return $items;
 }