Browse Source

Forgot to remove dpm and added new tripal_toc table

Stephen Ficklin 10 years ago
parent
commit
a5b6e8ee9b
2 changed files with 77 additions and 41 deletions
  1. 76 40
      tripal_core/tripal_core.install
  2. 1 1
      tripal_core/tripal_core.module

+ 76 - 40
tripal_core/tripal_core.install

@@ -96,7 +96,11 @@ function tripal_core_get_schemas() {
   foreach ($temp as $table => $arr) {
     $schema[$table] = $arr;
   }
-  $temp = tripal_core_tripaltoken_schema();
+  $temp = tripal_core_tripal_token_schema();
+  foreach ($temp as $table => $arr) {
+    $schema[$table] = $arr;
+  }
+  $temp = tripal_core_tripal_toc_schema();
   foreach ($temp as $table => $arr) {
     $schema[$table] = $arr;
   }
@@ -348,7 +352,7 @@ function tripal_core_custom_tables_schema() {
   return $schema;
 }
 
-function tripal_core_tripaltoken_schema() {
+function tripal_core_tripal_token_schema() {
   $schema = array();
   $schema['tripal_token_formats'] = array(
     'fields' => array(
@@ -389,6 +393,51 @@ function tripal_core_tripaltoken_schema() {
   return $schema;
 }
 
+/**
+ * 
+ * 
+ */
+function tripal_core_tripal_toc_schema() {
+  $schema = array();
+  $schema['tripal_toc'] = array(
+    'fields' => array(
+      'toc_item_id' => array(
+        'type' => 'serial',
+        'unsigned' => TRUE,
+        'not NULL' => TRUE
+      ),
+      'node_type' => array(
+        'type' => 'varchar',
+        'length' => 32,
+        'not NULL' => TRUE
+      ),
+      'key' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not NULL' => TRUE,
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not NULL' => TRUE
+      ),
+      'weight' => array(
+        'type' => 'int',
+        'not NULL' => TRUE
+      ),
+    ),
+    'indexes' => array(
+      'tripal_toc_idx1' => array('node_type', 'key'),
+    ),
+    'unique keys' => array(
+      'tripal_toc_uq1' => array('node_type', 'key'),
+    ),
+    'primary key' => array('toc_item_id'),
+  );
+
+  return $schema;
+}
+
 /**
  * Adds an mview_id column to the tripal_custom_tables table and makes an assocation between the mview and the custom table
  *
@@ -463,44 +512,31 @@ function tripal_core_update_7201() {
 
 
 /**
- * Adds in tripal token formats table to handle page title and path rewrites
+ * Adds a tripal_token_formats table for custom page titles and URL paths
  */
 function tripal_core_update_7202() {
-  $schema = array();
-  $schema['tripal_token_formats'] = array(
-    'fields' => array(
-      'tripal_format_id' => array(
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not NULL' => TRUE
-      ),
-      'content_type' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not NULL' => TRUE
-      ),
-      'application' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not NULL' => TRUE
-      ),
-      'format' => array(
-        'type' => 'text',
-        'not NULL' => TRUE
-      ),
-      'tokens' => array(
-        'type' => 'text',
-        'not NULL' => TRUE
-      ),
-    ),
-    'indexes' => array(
-      'tripal_format_id' => array('tripal_format_id'),
-      'type_application' => array('content_type', 'application'),
-    ),
-    'unique keys' => array(
-      'type_application' => array('content_type', 'application'),
-    ),
-    'primary key' => array('tripal_format_id'),
-  );
-  db_create_table('tripal_token_formats', $schema['tripal_token_formats']);
+  try {
+    $schema = drupal_get_schema_unprocessed('tripal_core', 'tripal_token_formats');
+    db_create_table('tripal_token_formats', $schema);
+  }
+  catch (Exception $e) {
+    $error = $e->getMessage();
+    throw new DrupalUpdateException('Could not add tripal_token_formats table: '. $error);
+  }
+}
+
+/**
+ * Adds a tripal_toc table for customizing the table of contents on each Tripal page.
+ */
+function tripal_core_update_7203() {
+  try {
+    $schema = drupal_get_schema_unprocessed('tripal_core', 'tripal_toc');
+    db_create_table('tripal_toc', $schema);
+  }
+  catch (Exception $e) {
+    $error = $e->getMessage();
+    throw new DrupalUpdateException('Could not add tripal_toc table: '. $error);
+    
+  }
+  
 }

+ 1 - 1
tripal_core/tripal_core.module

@@ -528,7 +528,7 @@ function tripal_core_views_api() {
  */
 function tripal_core_node_view_alter(&$build) {
   global $theme;
-
+  
   // if this is not a full node view, we do not want to alter
   if ($build['#view_mode'] != 'full' OR !array_key_exists('#tripal_generic_node_template', $build)) {
     return;