[geeklog-cvs] Translator mergeversions,1.3,1.4

[tony at iowaoutdoors.org]

Update of /var/cvs/Translator
In directory www:/tmp/cvs-serv30539

Modified Files:
	mergeversions 
Log Message:
Removed some code I added to make debugging easier

Index: mergeversions
===================================================================
RCS file: /var/cvs/Translator/mergeversions,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mergeversions	12 Aug 2004 15:26:30 -0000	1.3
--- mergeversions	12 Aug 2004 20:35:46 -0000	1.4
***************
*** 110,113 ****
--- 110,125 ----
      /**
      * @access private
+     * @var string
+     */
+     private $lanaguage = null;
+     
+     /**
+     * @access private
+     * @var string
+     */
+     private $languageDesc = null;
+     
+     /**
+     * @access private
      * @var array
      */
***************
*** 242,245 ****
--- 254,258 ----
      	$tmpNode = $tmpList->item(0);
      	$this->language = $tmpNode->getAttribute('language');
+     	$this->languageDesc = $tmpNode->getAttribute('name');
      	
      	return;
***************
*** 343,346 ****
--- 356,360 ----
          $tmpNode = $appNode->appendChild($translationNode);
          $tmpNode->setAttribute('language', $this->language);
+         $tmpNode->setAttribute('name', $this-languageDesc);
          
          // Finally append Application Node with attributes
***************
*** 370,377 ****
      {
          // Validate arguments and load set-up data
!         //$this->handleCommandLineArgs($args);
!         $this->loadStrings('/srv/www/htdocs/Translator/en.xml', true);
!         $this->loadStrings('/srv/www/htdocs/Translator/new.xml', false);
!         $this->outputFile = '/srv/www/htdocs/Translator/merged.xml';
          
          $keys = array_keys($this->newStrings);
--- 384,388 ----
      {
          // Validate arguments and load set-up data
!         $this->handleCommandLineArgs($args);
          
          $keys = array_keys($this->newStrings);