[geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.4.2.php, 1.12, 1.13

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv85235

Modified Files:
	mysql_1.4.1_to_1.4.2.php 
Log Message:
fix poll upgrade, check for plugin install

Index: mysql_1.4.1_to_1.4.2.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.4.2.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mysql_1.4.1_to_1.4.2.php	28 Apr 2007 17:45:05 -0000	1.12
--- mysql_1.4.1_to_1.4.2.php	11 Jul 2007 02:36:03 -0000	1.13
***************
*** 9,32 ****
  $_SQL[] = "ALTER TABLE `{$_TABLES['storysubmission']}` ADD bodytext TEXT AFTER introtext";
  
- // Poll plugin updates
- $_SQL[] = "RENAME TABLE `{$_TABLES['pollquestions']}` TO `{$_TABLES['polltopics']}`;";
- $_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` CHANGE `question` `topic` VARCHAR( 255 )  NULL DEFAULT NULL";
- $_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
- $_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` ADD questions int(11) default '0' NOT NULL AFTER voters";
- $_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` ADD open tinyint(4) NOT NULL default '1' AFTER display";
- $_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` ADD hideresults tinyint(1) NOT NULL default '1' AFTER open";
- $_SQL[] = "ALTER TABLE `{$_TABLES['pollanswers']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
- $_SQL[] = "ALTER TABLE `{$_TABLES['pollanswers']}` ADD `qid` VARCHAR( 20 ) NOT NULL DEFAULT '0' AFTER `pid`;";
- $_SQL[] = "ALTER TABLE `{$_TABLES['pollvoters']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
- $_SQL[] = "CREATE TABLE {$_TABLES['pollquestions']} (
-       qid mediumint(9) NOT NULL DEFAULT '0',
-       pid varchar(20) NOT NULL,
-       question varchar(255) NOT NULL,
-       PRIMARY KEY (qid)
-     ) TYPE=MyISAM
-     ";
- 
- $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (pid, question) SELECT pid, topic FROM {$_TABLES['polltopics']}";
- 
  // new comment code: close comments
  $_SQL[] = "INSERT INTO {$_TABLES['commentcodes']} (code, name) VALUES (1,'Comments Closed')";
--- 9,12 ----
***************
*** 37,41 ****
  // update plugin version numbers
  $_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1', pi_gl_version = '1.4.1' WHERE pi_name = 'links'";
- $_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0', pi_gl_version = '1.4.1' WHERE pi_name = 'polls'";
  
  // Increase block function size to accept arguments:
--- 17,20 ----
***************
*** 45,48 ****
--- 24,71 ----
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_last_modified VARCHAR(40) DEFAULT NULL AFTER rdfupdated";
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL AFTER rdf_last_modified";
+ 
+ function upgrade_PollPlugin() {
+     global $_TABLES;
+     // Poll plugin updates
+     $check_sql = "SELECT pi_name FROM `gl_plugins` WHERE pi_name = 'polls';";
+     $check_rst = DB_query ($check_sql);
+     if (DB_numRows($check_rst) == 1) {
+         $P_SQL = array();
+         $P_SQL[] = "RENAME TABLE `{$_TABLES['pollquestions']}` TO `{$_TABLES['polltopics']}`;";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` CHANGE `question` `topic` VARCHAR( 255 )  NULL DEFAULT NULL";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` ADD questions int(11) default '0' NOT NULL AFTER voters";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` ADD open tinyint(4) NOT NULL default '1' AFTER display";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['polltopics']}` ADD hideresults tinyint(1) NOT NULL default '1' AFTER open";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['pollanswers']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['pollanswers']}` ADD `qid` VARCHAR( 20 ) NOT NULL DEFAULT '0' AFTER `pid`;";
+         $P_SQL[] = "ALTER TABLE `{$_TABLES['pollvoters']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
+         $P_SQL[] = "CREATE TABLE {$_TABLES['pollquestions']} (
+               qid mediumint(9) NOT NULL DEFAULT '0',
+               pid varchar(20) NOT NULL,
+               question varchar(255) NOT NULL,
+               PRIMARY KEY (qid)
+             ) TYPE=MyISAM
+             ";
+         for ($i = 0; $i < count ($P_SQL); $i++) {
+             DB_query (current ($P_SQL));
+             next ($P_SQL);
+         }
+         $P_SQL = array();
+         $move_sql = "SELECT pid, topic FROM {$_TABLES['polltopics']}";
+         $move_rst = DB_query ($move_sql);
+         $count_move = DB_numRows($move_rst);
+         for ($i=0; $i<$count_move; $i++) {
+             $A = DB_fetchArray($move_rst);
+             $P_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (pid, question) VALUES ('{$A[0]}','{$A[1]}');";
+         }
+         $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0', pi_gl_version = '1.4.1' WHERE pi_name = 'polls'";
+         //var_dump($P_SQL);
+         for ($i = 0; $i < count ($P_SQL); $i++) {
+             DB_query (current ($P_SQL));
+             next ($P_SQL);
+         }
+     }
+ }
  
  ?>