Changeset 1927 for branches/release-35/lib/MT.pm.pre

Timestamp:

04/16/08 15:36:30 (20 months ago)

Author:

mpaschal

Message:

Land the new implementation of metadata based on narrow tables
BugzID: 68749

Files:

• branches/release-35/lib/MT.pm.pre (modified) (9 diffs)

branches/release-35/lib/MT.pm.pre

@@ -58 +58 @@
             no strict 'refs';
             unless ( defined *{ $compat . '::' } ) {
-                eval "require $compat;";
+                eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $compat;";
             }
         }
@@ -267 +267 @@
         return $object_types{$k} if exists $object_types{$k};
 
+        if ($k =~ m/^(.+):meta$/) {
+            my $ppkg = $pkg->model($1);
+            my $mpkg = $ppkg->meta_pkg;
+            return $mpkg ? $object_types{$k} = $mpkg : undef;
+        }
+
         my $model = $pkg->registry( 'object_types', $k );
         if ( ref($model) eq 'ARRAY' ) {
@@ -287 +293 @@
         unless ( defined *{ $model . '::__properties' } ) {
             use strict 'refs';
-            eval "require $model;";
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $model;";
             if ( $@ && ( $k =~ m/^(.+)\./ ) ) {
 
@@ -612 +618 @@
 
     $cb->error();    # reset the error string
-    my $result = eval { $cb->invoke(@args) };
+    my $result = eval {
+        # line __LINE__ __FILE__
+        $cb->invoke(@args);
+    };
     if ( my $err = $@ ) {
         $cb->error($err);
@@ -1262 +1271 @@
                     $Plugins{$plugin_sig}{full_path} = $plugin_full_path;
                     $timer->pause_partial if $timer;
-                    eval { require $plugin };
+                    eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire '$plugin';";
                     $timer->mark("Loaded plugin " . $sig) if $timer;
                     if ($@) {
@@ -1270 +1279 @@
                         # the database has been initialized...
                         eval {
+                            # line __LINE__ __FILE__
                             require MT::Log;
                             $mt->log(
@@ -2588 +2598 @@
             if ($method) {
                 return sub {
-                    eval "require $hdlr_pkg;"
+                    eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $hdlr_pkg;"
                       or Carp::confess(
                         "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2599 +2609 @@
             else {
                 return sub {
-                    eval "require $hdlr_pkg;"
+                    eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $hdlr_pkg;"
                       or Carp::confess(
                         "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2613 +2623 @@
         }
         else {
-            eval "require $hdlr_pkg;"
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $hdlr_pkg;"
               or Carp::confess(
                 "failed loading package $hdlr_pkg for routine $name: $@");