UTF8 encoding

sebgiroux · Jul 14, 2011 · 3dfdd8d · 3dfdd8d
1 parent 03b235d
commit 3dfdd8d
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 13 deletions.
diff --git a/README.mkd b/README.mkd
@@ -1,4 +1,4 @@
-Cassandra Cluster Admin by Sébastien Giroux
+Cassandra Cluster Admin by Sébastien Giroux
 ===============================================
 Cassandra Cluster Admin is a GUI tool to help people administrate their Apache Cassandra cluster.
 

diff --git a/columnfamily_action.php b/columnfamily_action.php
@@ -123,7 +123,8 @@
 			if (!isset($vw_vars['success_message'])) $vw_vars['success_message'] = '';
 			if (!isset($vw_vars['error_message'])) $vw_vars['error_message'] = '';
 
-			$vw_vars['mode'] = 'edit';						
+			$vw_vars['mode'] = 'edit';
+			$vw_vars['thrift_api_version'] = $sys_manager->describe_version();
 
 			echo getHTML('create_edit_columnfamily.php',$vw_vars);
 		}
@@ -737,17 +738,15 @@
 			if ($column_family->cfdef->column_type == 'Super') {
 				$new_value = $new_value[$super_column][$column];
 			}
-			else {
-
+			else {				
 				$new_value = $new_value[$column];
-			}
-
-
+			}			
 
 			redirect('counters.php?keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'&new_value='.$new_value);
         }
 		catch (Exception $e) {
-			echo displayErrorMessage('something_wrong_happened',array('message' => $e->getMessage()));
+			$_SESSION['message'] = $e->getMessage();
+			redirect('counters.php?keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'&error=1');
 		}		
 	}
 

diff --git a/counters.php b/counters.php
@@ -35,10 +35,18 @@
 			// Make sure the column family exists in this keyspace
 			if ($one_cf) {	
 				$vw_vars['success_message'] = '';
+				$vw_vars['error_message'] = '';
+
+				// Success
 				if (isset($_GET['new_value'])) {
 					$new_value = $_GET['new_value'];
 					$vw_vars['success_message'] = displaySuccessMessage('edit_counter',array('value' => $new_value));
 				}
+
+				// Error
+				if (isset($_GET['error']) == 1) {
+					$vw_vars['error_message'] = displayErrorMessage('something_wrong_happened',array('message' => $_SESSION['message']));
+				}
 
 				$vw_vars['cluster_name'] = $sys_manager->describe_cluster_name();
 				$vw_vars['keyspace_name'] = $keyspace_name;

diff --git a/describe_keyspace.php b/describe_keyspace.php
@@ -2,7 +2,7 @@
 	/*
 		Cassandra Cluster Admin
 		
-		@author Sébastien Giroux
+		@author Sébastien Giroux
 		@copyright All rights reserved - 2011
 	*/
 
@@ -36,6 +36,14 @@
 			echo displayErrorMessage('keyspace_doesnt_exists',array('keyspace_name' => $keyspace_name));
 		}
 		else {
+			// CF created successfully
+			$vw_vars['added_cf'] = '';
+			if (isset($_GET['create_cf']) == 1) {
+				$columnfamily_name = $_SESSION['message'];
+				$vw_vars['added_cf'] = displaySuccessMessage('create_columnfamily',array('columnfamily_name' => $columnfamily_name));
+			}
+
+			// CF deleted successfully
 			$vw_vars['deleted_cf'] = '';
 			if (isset($_GET['deleted_cf']) && $_GET['deleted_cf'] == 1) {
 				$vw_vars['deleted_cf'] = displaySuccessMessage('drop_columnfamily');
@@ -93,7 +101,7 @@
 			catch(Exception $e) {
 				$vw_vars['ring'] = $e->getMessage();
 			}
-
+				
 			echo getHTML('describe_keyspace.php',$vw_vars);	
 		}		
 	}

diff --git a/index.php b/index.php
@@ -2,7 +2,7 @@
 	/*
 		Cassandra Cluster Admin
 		
-		@author Sébastien Giroux
+		@author Sébastien Giroux
 		@copyright All rights reserved - 2011
 	*/
 

diff --git a/keyspace_action.php b/keyspace_action.php
@@ -86,7 +86,9 @@
 		try {
 			$sys_manager->create_column_family($keyspace_name, $columnfamily_name, $attrs);
 
-			$vw_vars['success_message'] = displaySuccessMessage('create_columnfamily',array('columnfamily_name' => $columnfamily_name));
+			$_SESSION['message'] = $columnfamily_name;
+
+			redirect('describe_keyspace.php?keyspace_name='.$keyspace_name.'&create_cf=1');
 		}
 		catch (Exception $e) {
 			$vw_vars['error_message'] = displayErrorMessage('create_columnfamily',array('columnfamily_name' => $columnfamily_name, 'message' => $e->getMessage()));
@@ -128,6 +130,7 @@
 		$vw_vars['memtable_operations_in_millions'] = '';				
 
 		$vw_vars['mode'] = 'create';		
+		$vw_vars['thrift_api_version'] = $sys_manager->describe_version();
 
 		if (!isset($vw_vars['success_message'])) $vw_vars['success_message'] = '';
 		if (!isset($vw_vars['error_message'])) $vw_vars['error_message'] = '';

diff --git a/views/counters.php b/views/counters.php
@@ -1,6 +1,7 @@
 <h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Counters</h3>
 
 <?=$success_message?>
+<?=$error_message?>
 
 <form method="post" action="columnfamily_action.php">
 	<div>

diff --git a/views/create_edit_columnfamily.php b/views/create_edit_columnfamily.php
@@ -94,7 +94,7 @@
 
 	<div>
 		<label for="default_validation_class">Default Validation Class</label>
-		<input type="text" id="default_validation_class" name="default_validation_class" value="<?=$default_validation_class?>" /> * Use "CounterColumnType" for Counter Column
+		<input type="text" id="default_validation_class" name="default_validation_class" value="<?=$default_validation_class?>" /> <? if ( version_compare($thrift_api_version,MINIMUM_THRIFT_API_VERSION_FOR_COUNTERS,'>=')): ?>* Use "CounterColumnType" for Counter Column<? endif;?>
 	</div>
 
 	<div>

diff --git a/views/describe_keyspace.php b/views/describe_keyspace.php
@@ -1,4 +1,5 @@
 <h3><a href="index.php"><?=$cluster_name?></a> &gt; <?=$keyspace_name?></h3>
+
 <div id="menu">
 	<div class="menu_item" style="width: 220px;" onclick="location.href='keyspace_action.php?action=create_cf&amp;keyspace_name=<?=$keyspace_name?>'">
 		<div class="icon create_column_family"></div> Create New Column Family
@@ -12,6 +13,7 @@
 	<div class="clear_left"></div>
 </div>
 
+<?=$added_cf;?>
 <?=$deleted_cf;?>
 
 <h3>Keyspace Details</h3>