Index: includes/tvi.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tvi/includes/tvi.admin.inc,v
retrieving revision 1.1
diff -u -r1.1 tvi.admin.inc
--- includes/tvi.admin.inc	4 Dec 2009 01:40:56 -0000	1.1
+++ includes/tvi.admin.inc	23 Apr 2010 09:35:31 -0000
@@ -14,11 +14,11 @@
  */
 function tvi_display_options_ahah() {
   
-  $view_id = $_GET['view_id'];
+  $view_name = $_GET['view_name'];
   $options = '';
   
-  if ($view_id > 0) {
-    foreach (tvi_get_view_displays($view_id) as $name => $label) {
+  if (strlen($view_name) > 0) {
+    foreach (tvi_get_view_displays($view_name) as $name => $label) {
       $options .= "<option value='$name'>$label</option>";
     }
   }  
@@ -121,11 +121,11 @@
   );
     
   //  View selector
-  $form['tvi']['view_id'] = array(
+  $form['tvi']['view_name'] = array(
     '#id' => 'tvi-view-selector',
     '#type' => 'select',
     '#title' => t('Using the view'),
-    '#default_value' => ($settings->view_id ? $settings->view_id : NULL),
+    '#default_value' => ($settings->view_name ? $settings->view_name : NULL),
     '#options' => tvi_get_views(),
     '#description' => t('The view that you wish to use for this display'),
   );
@@ -135,8 +135,8 @@
     '#type' => 'select',
     '#title' => t('View display'),
     '#default_value' => (
-      $settings->view_id 
-      ? $settings->view_id . ':' . $settings->display 
+      $settings->view_name 
+      ? $settings->view_name . ':' . $settings->display 
       : NULL
     ),
     '#options' => tvi_get_view_displays(), // Assume no Javascript
@@ -163,12 +163,12 @@
 function tvi_validate_handler($form, &$form_state) {
 	
 	$values = $form_state['values']['tvi'];
-	$view   = views_get_view($values['view_id']);
+	$view   = views_get_view($values['view_name']);
   
-  list($view_id, $display_name)           = explode(':', $values['display']);  
+  list($view_name, $display_name)           = explode(':', $values['display']);  
   $form_state['values']['tvi']['display'] = $display_name;
   
-  if ($view->vid != $view_id) {
+  if ($view->name != $view_name) {
     form_set_error('tvi][display', 
       t('You must select a display from the selected view.'
         . '  You wouldn\'t have this problem if you would enable Javascript.')
@@ -203,10 +203,10 @@
   foreach (views_get_all_views() as $view) {
   	
   	if ($return_object) {
-      $views[$view->vid] = $view;	
+      $views[$view->name] = $view;	
   	}
   	else {
-      $views[$view->vid] = $view->name;
+      $views[$view->name] = $view->name;
   	} 
   }
   return $views;
@@ -223,11 +223,11 @@
   $displays = array();
   
   if ($view === NULL) {
-    foreach(tvi_get_views(TRUE) as $view_id => $view) {
+    foreach(tvi_get_views(TRUE) as $view_name => $view) {
     	foreach($view->display as $display_name => $display) {
       	// Suppress the 'default' plugin display
         $add = ($display->display_plugin != 'default') ? ' - ' . $display->display_plugin : ''; 
-        $displays[$view_id . ':' . $display_name] = $view->name . ' - ' . $display->display_title . $add;
+        $displays[$view_name . ':' . $display_name] = $view->name . ' - ' . $display->display_title . $add;
       } 
     }
   }
@@ -240,7 +240,7 @@
       foreach($view->display as $display_name => $display) {
         // Suppress the 'default' plugin display
         $add = ($display->display_plugin != 'default') ? ' - ' . $display->display_plugin : ''; 
-        $displays[$view->vid . ':' . $display_name] = $display->display_title . $add;
+        $displays[$view->name . ':' . $display_name] = $display->display_title . $add;
       }
     }
   }
Index: includes/tvi.query.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tvi/includes/tvi.query.inc,v
retrieving revision 1.1
diff -u -r1.1 tvi.query.inc
--- includes/tvi.query.inc	4 Dec 2009 01:40:56 -0000	1.1
+++ includes/tvi.query.inc	23 Apr 2010 09:35:51 -0000
@@ -14,7 +14,7 @@
   $settings->type = $type;
   $settings->xid  = $xid;
   
-  $settings->view_id = 0;
+  $settings->view_name = '';
   $settings->display = TVI_DEFAULT_DISPLAY;
   $settings->status  = 0;
   
@@ -58,9 +58,9 @@
 	}
 	
   $result = db_query(
-    "UPDATE {tvi_settings} SET view_id = %d, display = '%s', status = %d"
+    "UPDATE {tvi_settings} SET view_name = '%s', display = '%s', status = %d"
     . " WHERE type = '%s' AND xid = %d",
-    $settings->view_id,
+    $settings->view_name,
     $settings->display,
     $settings->status,
     $settings->type,
@@ -69,11 +69,11 @@
 
   if (!db_affected_rows()) {
     $result = db_query(
-      "INSERT INTO {tvi_settings} (`type`, `xid`, `view_id`, `display`, `status`)"
-      . " VALUES ('%s', %d, %d, '%s', %d)", 
+      "INSERT INTO {tvi_settings} (`type`, `xid`, `view_name`, `display`, `status`)"
+      . " VALUES ('%s', %d, '%s', '%s', %d)", 
       $settings->type,
       $settings->xid,
-      $settings->view_id,
+      $settings->view_name,
       $settings->display,
       $settings->status    
     );
Index: tvi.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tvi/tvi.install,v
retrieving revision 1.3
diff -u -r1.3 tvi.install
--- tvi.install	4 Dec 2009 01:40:55 -0000	1.3
+++ tvi.install	23 Apr 2010 09:34:00 -0000
@@ -29,12 +29,12 @@
         'default' => 0,
         'description' => 'Taxonomy vocabulary or term ID.',
       ),
-      'view_id' => array(
-        'type' => 'int',
-        'unsigned' => TRUE,
+      'view_name' => array(
+        'type' => 'varchar',
+        'length' => 32,
         'not null' => TRUE,
-        'default' => 0,
-        'description' => 'The view id that is used for this taxonomy display.',
+        'default' => '',
+        'description' => 'The view name that is used for this taxonomy display.',
       ),
       'display' => array(
         'type' => 'varchar',
@@ -100,6 +100,24 @@
 	// Copy old table values into new table.
 	_tvi_update_move_6001($ret, 'tvi_vocab', 'vocid', TVI_TYPE_VOCAB);
 	_tvi_update_move_6001($ret, 'tvi_term', 'termid', TVI_TYPE_TERM);
+  
+  return $ret;
+}
+
+/**
+ * Implementation of tvi_hook_update_N().
+ */
+function tvi_update_6002() {
+  $ret = array();
+  
+  // Transform view_id column into view_name
+  db_change_field($ret, 'tvi_settings', 'view_id', 'view_name', array(
+    'type' => 'varchar',
+    'length' => 32,
+    'not null' => TRUE,
+    'default' => '',
+    'description' => 'The view name that is used for this taxonomy display.',
+  ));
 	
 	return $ret;
 }
Index: tvi.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tvi/tvi.js,v
retrieving revision 1.1
diff -u -r1.1 tvi.js
--- tvi.js	4 Dec 2009 01:40:55 -0000	1.1
+++ tvi.js	23 Apr 2010 09:34:24 -0000
@@ -17,15 +17,15 @@
 	//--------------------------------------------------------------------------
 	
 	var view_change_handler = function() {
-		var view_id = $('#tvi-view-selector').val();
+		var view_name = $('#tvi-view-selector').val();
 		
-		if (!view_id) {
-			view_id = $('#tvi-view-selector option:first').val();
-			$('#tvi-view-selector').val(view_id);
+		if (!view_name) {
+			view_name = $('#tvi-view-selector option:first').val();
+			$('#tvi-view-selector').val(view_name);
 		}		
 		// Load new view displays.
 		$('#tvi-display-selector').load(
-			'/tvi/js/display_options?view_id=' + view_id, 
+			'/tvi/js/display_options?view_name=' + view_name, 
 			'', set_active_option
 		);
 	}
Index: tvi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tvi/tvi.module,v
retrieving revision 1.6
diff -u -r1.6 tvi.module
--- tvi.module	13 Jan 2010 00:20:20 -0000	1.6
+++ tvi.module	23 Apr 2010 09:34:40 -0000
@@ -283,8 +283,8 @@
       $settings = tvi_load_settings($term->vid, TVI_TYPE_VOCAB, FALSE);
     }
     
-    if ($settings && $settings->view_id) {
-      $view = views_get_view($settings->view_id);
+    if ($settings && $settings->view_name) {
+      $view = views_get_view($settings->view_name);
     }
    
     $term_info[$tid] = array(

