diff -urp exif.old/exif.info exif/exif.info --- exif.old/exif.info 2008-12-13 20:18:40.000000000 -0600 +++ exif/exif.info 2008-12-13 20:45:22.000000000 -0600 @@ -1,11 +1,12 @@ ; $Id: exif.info,v 1.1.2.3 2007/06/18 23:06:42 dww Exp $ name = Exif description = "Display Exif metadata on image nodes." -dependencies = image +dependencies[] = image package = Image +core = 6.x ; Information added by drupal.org packaging script on 2008-04-06 -version = "5.x-1.x-dev" +version = "6.x-1.x-dev" project = "exif" datestamp = "1207440292" diff -urp exif.old/exif.install exif/exif.install --- exif.old/exif.install 2008-12-13 20:18:40.000000000 -0600 +++ exif/exif.install 2008-12-13 20:35:16.000000000 -0600 @@ -2,84 +2,41 @@ // $Id: exif.install,v 1.2.2.3 2008/02/06 22:56:29 davidlesieur Exp $ /** - * Implementation of hook_install(). + * Implementation of hook_schema. */ -function exif_install() { - switch ($GLOBALS['db_type']) { - case 'mysql': - case 'mysqli': - db_query("CREATE TABLE {exif_tags} ( - ifd int(10) unsigned NOT NULL default '0', - tag int(10) unsigned NOT NULL default '0', - status int(10) unsigned NOT NULL default '0', - weight int(11) NOT NULL default '0', - PRIMARY KEY (ifd, tag) - ) /*!40100 DEFAULT CHARACTER SET utf8 */;" - ); - db_query("CREATE TABLE {exif} ( - fid int(10) unsigned NOT NULL default '0', - ifd int(10) unsigned NOT NULL default '0', - tag int(10) unsigned NOT NULL default '0', - value varchar(255) NOT NULL default '', - PRIMARY KEY (fid, ifd, tag) - ) /*!40100 DEFAULT CHARACTER SET utf8 */;" - ); - break; - case 'pgsql': - db_query("CREATE TABLE {exif_tags} ( - ifd integer NOT NULL default '0', - tag integer NOT NULL default '0', - status integer NOT NULL default '0', - weight integer NOT NULL default '0', - PRIMARY KEY (ifd, tag) - );" - ); - db_query("CREATE TABLE {exif} ( - fid int(10) unsigned NOT NULL default '0', - ifd int(10) unsigned NOT NULL default '0', - tag int(10) unsigned NOT NULL default '0', - value varchar(255) NOT NULL default '', - PRIMARY KEY (fid, ifd, tag) - );" - ); - break; - } +function exif_schema() { + $schema['exif_tags'] = array( + 'fields' => array( + 'ifd' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + 'tag' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + 'status' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + 'weight' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + ), + 'primary key' => array('ifd', 'tag'), + ); + $schema['exif'] = array( + 'fields' => array( + 'fid' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + 'ifd' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + 'tag' => array('type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, 'default' => 0), + 'value' => array('type' => 'varchar', 'not null' => TRUE, 'length' => '255', 'default' => ''), + ), + 'primary key' => array('fid', 'ifd', 'tag'), + ); + + return $schema; } -function exif_update_1() { - // Works for postgres?? - $ret[] = update_sql('ALTER TABLE {exif} RENAME TO {exif_tags}'); - // make new table for caching and tracking exif data. - switch ($GLOBALS['db_type']) { - case 'mysql': - case 'mysqli': - $ret[] = update_sql("CREATE TABLE {exif} ( - fid int(10) unsigned NOT NULL default '0', - ifd int(10) unsigned NOT NULL default '0', - tag int(10) unsigned NOT NULL default '0', - value varchar(255) NOT NULL default '', - PRIMARY KEY (fid, ifd, tag) - ) /*!40100 DEFAULT CHARACTER SET utf8 */;" - ); - break; - case 'pgsql': - $ret[] = update_sql("CREATE TABLE {exif} ( - fid int(10) unsigned NOT NULL default '0', - ifd int(10) unsigned NOT NULL default '0', - tag int(10) unsigned NOT NULL default '0', - value varchar(255) NOT NULL default '', - PRIMARY KEY (fid, ifd, tag) - );" - ); - break; - } - return $ret; +/** + * Implementation of hook_install(). + */ +function exif_install() { + drupal_install_schema('exif'); } /** * Implementation of hook_uninstall(). */ function exif_uninstall() { - db_query('DROP TABLE {exif_tags}'); - db_query('DROP TABLE {exif}'); + drupal_uninstall_schema('exif'); } \ No newline at end of file diff -urp exif.old/exif.module exif/exif.module --- exif.old/exif.module 2008-12-13 20:18:40.000000000 -0600 +++ exif/exif.module 2008-12-13 20:40:27.000000000 -0600 @@ -4,19 +4,16 @@ /** * Implementation of hook_menu(). */ -function exif_menu($may_cache) { +function exif_menu() { $items = array(); - if ($may_cache) { - $items[] = array( - 'path' => 'admin/settings/exif', - 'title' => t('Exif'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('exif_admin_settings_form'), - 'access' => user_access('administer site configuration'), - 'description' => t('Configure what Exif tags to display.'), - ); - } + $items['admin/settings/exif'] = array( + 'title' => t('Exif'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('exif_admin_settings_form'), + 'access arguments' => array('administer site configuration'), + 'description' => t('Configure what Exif tags to display.'), + ); return $items; } @@ -102,7 +99,7 @@ function exif_admin_settings_form() { return $form; } -function exif_admin_settings_form_submit($form_id, $values) { +function exif_admin_settings_form_submit($form, &$form_state) { $op = isset($_POST['op']) ? $_POST['op'] : ''; if ($op == t('Reset to defaults')) { @@ -110,7 +107,7 @@ function exif_admin_settings_form_submit drupal_set_message(t('The configuration options have been reset to their default values.')); } elseif ($op == t('Save configuration')) { - exif_save_settings($values); + exif_save_settings($form_state['values']); drupal_set_message(t('The configuration options have been saved.')); } } Only in exif.old: po Only in exif: translations