Index: pageroute.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute.install,v
retrieving revision 1.10.2.6
diff -u -r1.10.2.6 pageroute.install
--- pageroute.install	5 Aug 2009 14:36:32 -0000	1.10.2.6
+++ pageroute.install	30 Sep 2009 14:15:27 -0000
@@ -43,122 +43,60 @@
   drupal_uninstall_schema('pageroute');
 }
 
-
-function pageroute_update_1() {
+/**
+ * d5 to d6 upgrade
+ */
+function pageroute_update_6001() {
   $ret = array();
-  db_add_column($ret, 'pageroute_routes', 'options', 'varchar(255) NOT NULL');
-  return $ret;
-}
 
-function pageroute_update_2() {
-  $ret = array();
-  switch ($GLOBALS['db_type']) {
-    case 'mysqli':
-    case 'mysql':
-      $ret[] = update_sql("ALTER TABLE {pageroute_pages} CHANGE `options` `options` mediumtext");
-    break;
-    case 'pgsql':
-      db_change_column($ret, 'pageroute_pages', 'options', 'options', 'text', array("not null" => TRUE));
-    break;
-  }
-  return $ret;
-}
+  if (db_table_exists('pageroute_pages') && !db_column_exists('pageroute_pages', 'module')) {
+    db_add_field($ret, 'pageroute_pages', 'module', array('type' => 'varchar', 'length' => 32, 'not null' => TRUE));
 
-function pageroute_update_3() {
-  $lonely_node_types = pageroute_ui_get_lonely_node_types();
-  if (!$lonely_node_types) {
-    return array();
-  }
+    drupal_load('module', 'pageroute');
 
-  $result = db_query("SELECT * FROM {pageroute_pages}");
+    $page_types = module_invoke_all('pageroute_info');
+    $check_single = array();
 
-  while ($page = db_fetch_object($result)) {
-    $page->options = unserialize($page->options);
-    if (in_array($page->options['content-type'], array_keys($lonely_node_types))) {
-      update_sql("UPDATE {pageroute_pages} SET type = %d WHERE prid = %d AND name = '%s'",
-        NODE_MANAGE_LONELY, $page->prid, $page->name);
+    foreach ($page_types as $module => $type_ids) {
+      foreach ($type_ids as $type_id => $file) {
+        update_sql("UPDATE {pageroute_pages} SET module = '%s' WHERE type = '%s'", $module, $type_id);
+      }
     }
   }
-  return array();
-}
 
-function pageroute_update_4() {
-  $ret = array();
   $ret[] = update_sql("ALTER TABLE {pageroute_pages} MODIFY type varchar(32) NOT NULL");
 
   $result = db_query("SELECT * FROM {pageroute_pages}");
   while ($page = db_fetch_object($result)) {
     switch ($page->type) {
-      case 1:
+      case 'add':
         $new_type = 'add';
+        $module = 'pageroute';
         break;
-      case 2:
+      case 'view':
         $new_type = 'view';
+        $module = 'pageroute';
+        break;
+      case 'edit':
+        $new_type = 'edit';
+        $module = 'pageroute';
         break;
-      case 3:
+      case 'manage':
         $new_type = 'manage';
+        drupal_set_message(t("Manage page types are no longer supported in pageroute 6, please delete pages" .
+          "with this page types, otherwise you'll get an error message!", 'warning'));
         break;
-      case 4:
-        $new_type = 'manage_lonely';
+      case 'user_edit':
+      	$new_type = 'useredit';
+      	$module = 'pageroute';
         break;
       default:
         break 2;
     }
-    $ret[] = update_sql("UPDATE {pageroute_pages} SET type = '%s' ".
-                        "WHERE prid = %d".
-                        " AND name = '%s'",
-                        $new_type, intval($page->prid), db_escape_string($page->name));
-  }
-  return $ret;
-}
-
-function pageroute_update_5() {
-  $ret = array();
-  switch ($GLOBALS['db_type']) {
-    case 'mysqli':
-    case 'mysql':
-      $ret[] = update_sql("ALTER TABLE {pageroute_routes} CHANGE `options` `options` mediumtext");
-    break;
-    case 'pgsql':
-      db_change_column($ret, 'pageroute_routes', 'options', 'options', 'text', array("not null" => TRUE));
-    break;
-  }
-  return $ret;
-}
-
-function pageroute_update_6() {
-  $ret = array();
-  $ret[] = update_sql("UPDATE {pageroute_pages} SET type = 'user_edit' WHERE type = 'user edit'");
-  return $ret;
-}
-
-/*
- * Clears the menu cache so that the route objects and their page index is rebuilt
- */
-function pageroute_update_7() {
-  cache_clear_all('*', 'cache_menu', TRUE);
-  return array();
-}
-
-/*
- * d5 to d6 upgrade
- */
-function pageroute_update_6001() {
-  $ret = array();
-
-  if (db_table_exists('pageroute_pages') && !db_column_exists('pageroute_pages', 'module')) {
-    db_add_field($ret, 'pageroute_pages', 'module', array('type' => 'varchar', 'length' => 32, 'not null' => TRUE));
-
-    drupal_load('module', 'pageroute');
-
-    $page_types = module_invoke_all('pageroute_info');
-    $check_single = array();
-
-    foreach ($page_types as $module => $type_ids) {
-      foreach ($type_ids as $type_id => $file) {
-        update_sql("UPDATE {pageroute_pages} SET module = '%s' WHERE type = '%s'", $module, $type_id);
-      }
-    }
+    $prid = intval($page->prid);
+    $name = db_escape_string($page->name);
+    db_query("UPDATE {pageroute_pages} SET type = '%s', module = '%s' WHERE prid = '%d' AND name = '%s'", $new_type, $module, $prid, $name);
   }
+  
   return $ret;
 }