--- import_instance1.php	Wed May 26 13:01:02 2010
+++ import_instance1.php	Wed Jun 02 14:17:52 2010
@@ -38,11 +38,12 @@
 echo "<br>";
 echo "Removing primary keys/Adjusting tables" ;
 //
+
 $result = db_query("ALTER TABLE $g_cn_project_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
 $result = db_query("ALTER TABLE $g_cn_bug_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
 $result = db_query("ALTER TABLE $g_cn_project_file_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
 $result = db_query("ALTER TABLE $g_cn_project_version_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
-$result = db_query("ALTER TABLE $g_cn_category_table DROP PRIMARY KEY  ");
+$result = db_query("ALTER TABLE $g_cn_category_table CHANGE `id` `id` INT( 10 ) UNSIGNED NOT NULL, DROP PRIMARY KEY  ");
 $result = db_query("ALTER TABLE $g_cn_project_user_list_table DROP PRIMARY KEY  ");
 $result = db_query("ALTER TABLE $g_cn_sponsorship_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
 $result = db_query("ALTER TABLE $g_cn_news_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
@@ -57,6 +58,7 @@
 $result = db_query("ALTER TABLE $g_cn_bugnote_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
 $result = db_query("ALTER TABLE $g_cn_bugnote_text_table DROP PRIMARY KEY ,ADD INDEX ( `id` ) ");
 $result = db_query("ALTER TABLE $g_cn_bug_monitor_table DROP PRIMARY KEY  ");
+
 //
 $query = 'ALTER TABLE ' . $g_cn_project_user_list_table . ' ADD `new_id` INT( 7 )';
 db_query( $query );
@@ -106,8 +108,8 @@
 
 echo '<BR>';
 echo "Preparing/Handling custom_field conversion" ;
-$result1 = mysql_query("SELECT id,name, type, possible_values,default_value,valid_regexp, access_level_r, access_level_rw, length_min, length_max,advanced,require_report,require_update,display_report,display_update,require_resolved,display_resolved,display_closed,require_closed  from $g_cn_custom_field_table");
-while (list( $id,$name, $type, $possible_values,$default_value,$valid_regexp, $access_level_r, $access_level_rw, $length_min, $length_max,$advanced,$require_report,$require_update,$display_report,$display_update,$require_resolved,$display_resolved,$display_closed,$require_closed ) = mysql_fetch_row($result1)) {
+$result1 = mysql_query("SELECT id,name, type, possible_values,default_value,valid_regexp, access_level_r, access_level_rw, length_min, length_max,require_report,require_update,display_report,display_update,require_resolved,display_resolved,display_closed,require_closed  from $g_cn_custom_field_table");
+while (list( $id,$name, $type, $possible_values,$default_value,$valid_regexp, $access_level_r, $access_level_rw, $length_min, $length_max,$require_report,$require_update,$display_report,$display_update,$require_resolved,$display_resolved,$display_closed,$require_closed ) = mysql_fetch_row($result1)) {
 	$result2 = db_query("SELECT id from $t_mantis_custom_field_table where name='$name'");
 	$num_rows = db_num_rows($result2);
 	if ($num_rows>0) {
@@ -119,9 +121,9 @@
 	} else {
 		## this user is not available yet
 		$query = "INSERT INTO $t_mantis_custom_field_table
-				    ( name, type, possible_values,default_value,valid_regexp, access_level_r, access_level_rw, length_min, length_max,advanced,require_report,require_update,display_report,display_update,require_resolved,display_resolved,display_closed,require_closed )
+				    ( name, type, possible_values,default_value,valid_regexp, access_level_r, access_level_rw, length_min, length_max,require_report,require_update,display_report,display_update,require_resolved,display_resolved,display_closed,require_closed )
 				  VALUES
-				    ('$name', $type, '$possible_values','$default_value','$valid_regexp', $access_level_r, $access_level_rw, $length_min, $length_max,$advanced,$require_report,$require_update,$display_report,$display_update,$require_resolved,$display_resolved,$display_closed,$require_closed  )";
+				    ('$name', $type, '$possible_values','$default_value','$valid_regexp', $access_level_r, $access_level_rw, $length_min, $length_max,$require_report,$require_update,$display_report,$display_update,$require_resolved,$display_resolved,$display_closed,$require_closed  )";
 		db_query( $query );
 		$result5 = db_query("SELECT id from $t_mantis_custom_field_table where name='$name'");
 		$result6 = db_fetch_array($result5);
@@ -227,7 +229,7 @@
 	$notetxt_start=0;
 }
 //
-$result = db_query("SELECT MAX(ID) AS LAST_ID FROM $t_mantis_categhory_table");
+$result = db_query("SELECT MAX(ID) AS LAST_ID FROM $t_mantis_category_table");
 $result = db_fetch_array($result);
 $category_start = $result[LAST_ID]; 	
 if (!is_numeric($category_start)){
--- import_instance2.php	Wed May 26 17:31:36 2010
+++ import_instance2.php	Wed Jun 02 13:40:53 2010
@@ -43,7 +43,7 @@
 /////////////////////////////////////
 echo "<br>";
 echo "Preparing category_table" ;
-$result = db_query("update $g_cn_category_table set category_id=category_id+$category_start");
+$result = db_query("update $g_cn_category_table set id=id+$category_start, project_id=project_id+$project_start");
 /////////////////////////////////////
 echo "<br>";
 echo "Preparing project_version_table" ;
@@ -64,7 +64,8 @@
 		$new_id=0;
 	}
 	## update table that needs importing
-	$result4 = db_query("update $g_cn_project_user_list_table set user_id=$new_id where project_id=$id and new_id=$id1 ");	
+	$result4 = db_query("update $g_cn_project_user_list_table set user_id=$new_id where project_id=$id and new_id=$id1 ");
 }
 /////////////////////////////////////
 echo "<br>";