openfirst-cvscommit Mailing List for openFIRST (Page 11)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/openfirst/base/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3795/includes

Modified Files:
	xmlModule.php 
Log Message:
XML parser finally finished!

Index: xmlModule.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/xmlModule.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xmlModule.php	23 Aug 2005 18:15:46 -0000	1.4
--- xmlModule.php	11 Sep 2005 14:19:57 -0000	1.5
***************
*** 37,41 ****
  #  /*private*/ var $mIncludesTag, $mDBTag;
    // States
!   /*private*/ var $mxmlCurTable, $mxmlCurField, $mxmlCurKey;
    
    function xmlModule($File) {
--- 37,41 ----
  #  /*private*/ var $mIncludesTag, $mDBTag;
    // States
!   /*private*/ var $mxmlCurTable, $mxmlCurField, $mxmlCurKey, $mxmlCurRow;
    
    function xmlModule($File) {
***************
*** 51,54 ****
--- 51,55 ----
      $this->mxmlCurField = false;
      $this->mxmlCurKey = false;
+     $this->mxmlCurRow = false;
      
      $hXML = xml_parser_create();
***************
*** 83,86 ****
--- 84,88 ----
      unset($this->mRootElement);
      unset($this->mTagStack);
+     unset($this->mxmlCurRow);
      
      if (is_null($this->mMaintainer)) $this->mMaintainer = $this->mAuthor;
***************
*** 162,287 ****
    
    /*** PUBLIC FUNCTIONS ***/
-   /** Parse the <db> tag
-    */
-   /*public*/ function prepareTables() {
-     $this->mTables = array();
-     
-     foreach($this->mDBTag->Contents as $table) {
-       if (!( is_object($table) && is_a($table, 'xmlElement') )) continue;
-       if ($table->Name != 'TABLE') continue;
-       $name = $table->Attributes['name'];
-       
-       $this->mTables[$name] = array( 'name'   => $name,
-                                'fields' => array(),
-                                'keys'   => array()
-                              );
-       
-       foreach($table->Contents as $tag) {
-         switch($tag->Name) {
-         case 'FIELDS':
-           $this->mTables[$name]['fields'] = $this->parseFields($tag);
-           break;
-           
-         case 'KEYS':
-           $this->mTables[$name]['keys'] = $this->parseKeys($tag);
-           break;
-         
-         case 'ROWS':
-           $this->mTables[$name]['data'] = $this->parseData($tag);
-           break;
-         }
-       }  
-     }
-     // Free up space
-     $this->mDBTag = false;
-   }
    
    /*** PRIVATE FUNCTIONS ***/
-   /*private*/ function parseFields($fieldtag) {
-     $rtn = array();
-     foreach($fieldtag->Contents as $tag) {
-       if ($tag->Name != 'FIELD') continue;
-       $field = array();
-       $field['name'] = $tag->Attributes['name'];
-       if (isset($tag->Attributes['null']))
-         $field['null'] = ofConvert2Bool($tag->Attributes['null'], array('null'));
-       if (isset($tag->Attributes['autoincrement']))
-         $field['auto'] = ofConvert2Bool($tag->Attributes['autoincrement'], array('autoincrement'));
-       
-       foreach($tag->Contents as $partstag) {
-         switch($partstag->Name) {
-         case 'TYPE':
-           $field['type'] = $partstag->getTextContents();
-           break;
-         
-         case 'SET':
-         case 'ENUM':
-           $field['type'] = $partstag->Name;
-           //Parse contents
-           $values = array();
-           foreach($partstag->Children as $value) {
-             $values[] = $value->getTextContents();
-           }
-           $field['values'] = $values;
-           break;
-           
-         case 'DEFAULT':
-           $field['default'] = $partstag->getTextContents();
-           break;
-         }
-       }
-       
-       $rtn[$field['name']] = $field;
-     }
-     
-     return $rtn;
-   }
-   
-   /**
-    */
-   /*private*/ function parseKeys($keytag) {
-     $rtn = array();
-     foreach($keytag->Contents as $tag) {
-       if ($tag->Name != 'KEY') continue;
-       $key = array();
-       $key['type'] = 'index';
-       if (isset($tag->Attributes['type'])) $key['type'] = $tag->Attributes['type'];
-       $key['name'] = $tag->Attributes['name'];
-       if ( (strcasecmp($key['type'], 'primary') == 0) || (strcasecmp($key['name'], 'primary') == 0) ) {
-         $key['type'] = 'primary';
-         $key['name'] = 'PRIMARY';
-       } else if ( $key['type'] && 
-                   strcasecmp($key['type'], 'primary') && 
-                   strcasecmp($key['type'], 'unique') && 
-                   strcasecmp($key['type'], 'index') ) {
-         // invalid key type. Skip this tag
-         continue;
-       }
-       
-       $key['cols'] = array();
-       foreach($tag->Contents as $coltag) {
-         $key['cols'][] = $coltag->getTextContents();
-       }
-       $rtn[$key['name']] = $key;
-     }
-     
-     return $rtn;
-   }
-   
-   /**
-    */
-   /*private*/ function parseData($datatag) {
-     $rtn = array();
-     foreach($datatag->Contents as $tag) {
-       if ($tag->Name != 'ROW') continue;
-       $row = array();
-       foreach($tag->Contents as $coltag) {
-         $row[$coltag->Attributes['name']] = $coltag->getTextContents();
-       }
-       $rtn[] = $row;
-     }
-     
-     return $rtn;
-   }
    
    /*private*/ function getModuleDTD() {
--- 164,169 ----
***************
*** 370,375 ****
        $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['type'] = $name;
        $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['values'] = array();
-       
      }
    }
    
--- 252,265 ----
        $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['type'] = $name;
        $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['values'] = array();
      }
+     else if ($name == 'ROW' && in_array('ROWS', $this->mTagStack)) {
+       $this->mxmlCurRow = array();
+     }
+     else if ($name == 'ROWS' && in_array('TABLE', $this->mTagStack)) {
+       $this->mTables[$this->mxmlCurTable]['data'] = array();
+     }
+     else if (in_array('ROW', $this->mTagStack)) {
+       if (isset($attrs['NAME'])) $this->mxmlCurField = $attrs['NAME'];
+     }  
    }
    
***************
*** 378,381 ****
--- 268,272 ----
      if (count($this->mTagStack) > 1)
        $par_name = $this->mTagStack[count($this->mTagStack)-2]; // One for the zero start, one for second from end
+     
      if ($name == 'NAME') {
        $this->mName = $this->mxmlCurTag->getTextContents();
***************
*** 406,409 ****
--- 297,305 ----
      } else if ($par_name == 'SET' || $par_name == 'ENUM') {
        $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['values'][] = $this->mxmlCurTag->getTextContents();
+     } else if ($name == 'ROW') {
+       $this->mTables[$this->mxmlCurTable]['data'][] = $this->mxmlCurRow;
+       $this->mxmlCurRow = false;
+     } else if ($par_name == 'ROW') {
+       $this->mxmlCurRow[$this->mxmlCurField] = $this->mxmlCurTag->getTextContents();
      }

2003	Jan	Feb	Mar	Apr	May (41)	Jun (210)	Jul (39)	Aug (153)	Sep (147)	Oct (173)	Nov (81)	Dec (163)
2004	Jan (33)	Feb (18)	Mar	Apr (62)	May	Jun (100)	Jul (38)	Aug (58)	Sep (1)	Oct	Nov (25)	Dec (172)
2005	Jan (31)	Feb (12)	Mar (67)	Apr (92)	May (247)	Jun (34)	Jul (36)	Aug (192)	Sep (15)	Oct (42)	Nov (92)	Dec (4)
2006	Jan	Feb (21)	Mar	Apr	May	Jun (53)	Jul (7)	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb	Mar (4)	Apr (4)	May	Jun (15)	Jul	Aug	Sep	Oct	Nov	Dec

openfirst-cvscommit Mailing List for openFIRST (Page 11)

openfirst-cvscommit — Notify subscribers of changes to files in CVS.