public
Description: Midgard Components Framework 3rd generation
Homepage: http://www.midgard-project.org
Clone URL: git://github.com/bergie/midcom.git
Cleaned up the code a bit
Tero Heikkinen (author)
Sat Jul 05 12:15:01 -0700 2008
commit  a31ec8170fa500ae76dcd3bb4f32889c04a2e27f
tree    57cd67a1e72595d65f4323740336a020a9f47eef
parent  acfd4a981b07f584db079bb5609e884f0b488b4a
...
212
213
214
215
216
217
218
...
403
404
405
 
406
407
408
...
417
418
419
420
421
422
423
424
...
427
428
429
430
431
432
433
434
...
458
459
460
461
462
463
464
...
494
495
496
497
498
499
500
501
...
212
213
214
 
215
216
217
...
402
403
404
405
406
407
408
...
417
418
419
 
 
420
421
422
...
425
426
427
 
 
428
429
430
...
454
455
456
 
457
458
459
...
489
490
491
 
 
492
493
494
0
@@ -212,7 +212,6 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
             }
0
             $route_id_map[] = array('route' => $route_configuration['route'],
0
                                     'route_id' => $route_id);
0
-// $route_id_map[$route_configuration['route']] = $route_id;
0
         }
0
         unset($route_configuration, $route_id);
0
         if (!$this->route_matches($route_id_map))
0
@@ -403,6 +402,7 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
         {
0
             $route = $r['route'];
0
             $route_id = $r['route_id'];
0
+
0
             // Reset variables
0
             $this->action_arguments = array();
0
             list ($route_path, $route_get, $route_args) = $_MIDCOM->configuration->split_route($route);
0
@@ -417,8 +417,6 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
                 {
0
                     // echo "DEBUG: simple match route_id:{$route_id}\n";
0
                     $this->route_array[] = $route_id;
0
- //$_MIDCOM->context->route_id = $this->route_id;
0
- //return true;
0
                 }
0
                 if ($route_args) // Route @ set
0
                 {
0
@@ -427,8 +425,6 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
                     {
0
                         $this->route_array[] = $route_id;
0
                         $this->action_arguments['variable_arguments'] = explode('/', $matches[1]);
0
- //$_MIDCOM->context->route_id = $this->route_id;
0
- //return true;
0
                     }
0
                 }
0
                 // Did not match, try next route
0
@@ -458,7 +454,6 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
 
0
             // We have a complete match, setup route_id arguments and return
0
             $this->route_array[] = $route_id;
0
- //$_MIDCOM->context->route_id = $this->route_id;
0
             // Map variable arguments
0
             
0
             foreach ($route_path_matches[1] as $index => $varname)
0
@@ -494,8 +489,6 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
                     {
0
                         $this->route_array[] = $route_id;
0
                         $this->action_arguments = explode('/', $matches[1]);
0
- //$_MIDCOM->context->route_id = $this->route_id;
0
- //return true;
0
                     }
0
                 }
0
                 

Comments

    No one has commented yet.