[geeklog-cvs] MVCnPHP XMLLoader.class.php,1.2,1.3

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/MVCnPHP
In directory internal.geeklog.net:/tmp/cvs-serv7143

Modified Files:
	XMLLoader.class.php 
Log Message:
Now assume MVCnPHP folder is in include_path, also modified it to use new terminology to eliminate confusion

Index: XMLLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/XMLLoader.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLLoader.class.php	9 Apr 2003 18:31:16 -0000	1.2
--- XMLLoader.class.php	14 Jul 2003 16:41:26 -0000	1.3
***************
*** 89,98 ****
                      }
                      break;
!                 case 'MODEL':
!                     $model = $parser->getAttribute($curIndex, 'id');
                      $default = $parser->getAttribute($curIndex, 'default');
!                     $configData[MVC_MODELS][$model][MVC_NAME] = $parser->getAttribute($curIndex, 'name');
                      if ($default) {
!                         $configData[MVC_MODELS][$model][MVC_DEFAULT] = true;
                      }
                      break;
--- 89,98 ----
                      }
                      break;
!                 case 'COMMAND':
!                     $command = $parser->getAttribute($curIndex, 'id');
                      $default = $parser->getAttribute($curIndex, 'default');
!                     $configData[MVC_COMMANDS][$command][MVC_NAME] = $parser->getAttribute($curIndex, 'name');
                      if ($default) {
!                         $configData[MVC_COMMANDS][$command][MVC_DEFAULT] = true;
                      }
                      break;
***************
*** 105,109 ****
                          $configData[MVC_VIEWS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TYPE] = $parser->getAttribute($curIndex, 'type');
                      } else {
!                         if ($parentTag == 'MODEL') {
                              $configData[MVC_MODELS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TARGET] = $parser->getValue($curIndex);
                              $configData[MVC_MODELS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TYPE] = $parser->getAttribute($curIndex, 'type');
--- 105,109 ----
                          $configData[MVC_VIEWS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TYPE] = $parser->getAttribute($curIndex, 'type');
                      } else {
!                         if ($parentTag == 'COMMAND') {
                              $configData[MVC_MODELS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TARGET] = $parser->getValue($curIndex);
                              $configData[MVC_MODELS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TYPE] = $parser->getAttribute($curIndex, 'type');