Changeset 1692

Timestamp:

02/21/07 17:25:20 (20 months ago)

Author:

mbonetti

Message:

massive hack to clean up schema generation

Location:

trunk/gregarius

Files:

• .htaccess (modified) (1 diff)
• cls/l10n.php (modified) (2 diffs)
• init.php (modified) (3 diffs)
• schema.php (modified) (4 diffs)

trunk/gregarius/.htaccess

@@ -61 +61 @@
   RewriteRule ^(.+)/?$   feed.php?channel=$1 [L,QSA]
 </IfModule>
+
+### php_value xdebug.profiler_enable 1

trunk/gregarius/cls/l10n.php

@@ -26 +26 @@
 ###############################################################################
 
-rss_require('extlib/l10n/streams.php');
-rss_require('extlib/l10n/gettext.php');
+require_once(dirname(__FILE__) .'/../extlib/l10n/streams.php');
+require_once(dirname(__FILE__) .'/../extlib/l10n/gettext.php');
 define('RSS_LOCALE_COOKIE','rss_preferred_locale');
 class RSSl10n {
@@ -136 +136 @@
 
 function __($msg, $cnt = null) {
+    if (!isset($GLOBALS['rssl10n'])) {
+        $GLOBALS['rssl10n'] = new RSSl10n();
+    }
     return $GLOBALS['rssl10n'] -> translate($msg, $cnt);
 }

trunk/gregarius/init.php

@@ -35 +35 @@
 
 function rss_require($file,$once=true) {
-    $required_file = rss_home_dir() .  $file;
+    $required_file = dirname(__FILE__) . '/'. $file;
     if ($once) {
         require_once($required_file);
@@ -50 +50 @@
     rss_require('rss_extra.php');
 }
-
 ////////////////////////////////////////////////////////////////////////////////
 // Bootstrap
@@ -67 +66 @@
 rss_require('plugins.php');
 rss_require('cls/user.php');
-//rss_require('config.php');
-
-
-
 
 ////////////////////////////////////////////////////////////////////////////////

trunk/gregarius/schema.php

@@ -29 +29 @@
 
 require_once('util.php');
-
+require_once('cls/l10n.php');
 /**
  * Checks the db schema for the for all required tables, adds those which are missing.
@@ -97 +97 @@
 }
 function rss_query_wrapper($query, $dieOnError=true, $preventRecursion=false) {
-    global $out;
-
     if (defined('DUMP_SCHEMA')) {
-        $out .= $query . ";\n";
+        global $out;
+        $out .= ($query . ";\n");
     } else {
         rss_query(trim($query),$dieOnError,$preventRecursion);
@@ -718 +717 @@
 
 if (isset($argv) && in_array('--dump',$argv)) {
+    $stdOut = false;
     foreach ($argv as $idx => $arg) {
         if (substr($arg,0,9) == '--prefix=') {
             define ('DB_TABLE_PREFIX',substr($arg,9));
+        } elseif ($arg == '--stdout') {
+            $stdOut = true;
         }
     }
     define ('DUMP_SCHEMA', true);
-    define ('PROFILING', false);
-    @require_once('init.php');
-    
+    define ('RSS_NO_CACHE',true);
+    define ('RSS_NO_DB',true);  
+    if (!defined('PROFILING')) {define ('PROFILING', false);}
+    require_once('db.php');
+    if (!function_exists('rss_require')) {
+        function rss_require($file,$once=true) {
+            $required_file = dirname(__FILE__) . '/'. $file;
+            if ($once) {
+                require_once($required_file);
+            } else {
+                require($required_file);
+            }
+        }
+    }
     $out = "################
 # Gregarius " . _VERSION_ . "
@@ -733 +746 @@
 
 ";
-    foreach (array("channels","config","folders","item","metatag","tag","rating", "users", "dashboard") as $tbl) {
+
+
+
+    foreach (getExpectedTables() as $tbl => $dummy) {
         call_user_func("_init_$tbl"); 
     }
     // shamelessly copied from install.php
-        $fp = @fopen(DBSTRUCT, 'w');
+        
+        $fp = $stdOut ? FALSE : @fopen(DBSTRUCT, 'w');
+        
         if(!$fp) {
             // unable to open file for writing