Changeset 479

Timestamp:

02/10/08 23:04:54 (11 months ago)

Author:

padams

Message:

fixes for gallery plugin not installing under mysqli db extension.

Location:

trunk

Files:

• module.inc (modified) (5 diffs)
• owa_caller.php (modified) (2 diffs)
• owa_install.php (modified) (1 diff)
• owa_module.php (modified) (1 diff)

trunk/module.inc

@@ -26 +26 @@
  * All configuration taken from Gallery directly.
  */
-function owa_factory() {
+function owa_factory($params = array()) {
         
         static $owa;
@@ -38 +38 @@
                 
                 // init the configuration array for this caller
-                $owa_config = array();
+                $owa_config = $params;
                 
                 // OWA DATABASE CONFIGURATION 
@@ -47 +47 @@
                 // Get Gallery's DB configuration
                 $db_config = $gallery->getConfig('storage.config');
-                        
-                // set OWA's database configuration values      
-                $owa_config['db_type'] = $db_config['type'];
+                        $gallery->debug($db_config['type']);
+                // set OWA's database configuration values
+                if ($db_config['type'] === 'mysqli'):
+                        $owa_config['db_type'] = 'mysql';
+                else:
+                        $owa_config['db_type'] = $db_config['type'];
+                endif;
+                $gallery->debug($owa_config['db_type']);
                 $owa_config['db_name'] = $db_config['database'];
                 $owa_config['db_host'] = $db_config['hostname']; 
@@ -77 +82 @@
                 $owa_config['is_embedded'] = 'true';
                 
+                $gallery->debug('hello from owa');
+
                 // create owa instance
                 $owa = new owa_php($owa_config);
+$gallery->debug('hello from owa after');
                 
                 return $owa;
@@ -279 +287 @@
                 
                 global $gallery;
-                                
-                $owa = owa_factory();
-                
-                // set user priviledges of the request for OWA to log
+                
+                $owa_config = array();
+                $owa_config['do_not_fetch_config_from_db'] = true;              
+                $owa = owa_factory($owa_config);
+                                // set user priviledges of the request for OWA to log
                 owa_set_priviledges();
                 

trunk/owa_caller.php

@@ -111 +111 @@
                 $this->e->debug('Caller configuration overrides applied.');
                 
-                
                 /* APPLY CONFIGURATION FILE OVERRIDES */
                 
@@ -219 +218 @@
                 // needed for backwards compatability 
                 $this->config = $this->c->fetch('base');
-
+                
                 return;
         

trunk/owa_install.php

@@ -82 +82 @@
                 
                 $table_check = array();
-                
+                //$this->e->notice(print_r($this->tables, true));
                 // test for existance of tables
                 foreach ($this->tables as $table) {

trunk/owa_module.php

@@ -271 +271 @@
                 
                 $obj = $this->installerFactory();
+                //$this->e->notice(print_r($obj, true));
+
                 $this->e->notice('starting install');
                 $tables_to_install = $obj->checkForSchema();