[Yaacs-svn] SF.net SVN: yaacs: [646] trunk

[<bu...@us...>]

Revision: 646
Author:   bugant
Date:     2006-04-07 09:03:00 -0700 (Fri, 07 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/yaacs/?rev=646&view=rev

Log Message:
-----------
* fix bug 1465631
  see http://sourceforge.net/tracker/index.php?func=detail&aid=1465631&group_id=47069&atid=448358
  for details;

Modified Paths:
--------------
    trunk/share/contract.txt.sample
    trunk/yacco.tcl
Modified: trunk/share/contract.txt.sample
===================================================================
--- trunk/share/contract.txt.sample	2006-04-07 16:00:12 UTC (rev 645)
+++ trunk/share/contract.txt.sample	2006-04-07 16:03:00 UTC (rev 646)
@@ -10,6 +10,8 @@
 *CITYXXXX and ADDRXXXX for city *
 *and address; CODXXXX for the   *
 *code.                          *
+*You can use WAGEXXXX to refer  *
+*to the operator's hour salary. *
 
 
 

Modified: trunk/yacco.tcl
===================================================================
--- trunk/yacco.tcl	2006-04-07 16:00:12 UTC (rev 645)
+++ trunk/yacco.tcl	2006-04-07 16:03:00 UTC (rev 646)
@@ -962,6 +962,7 @@
 	}
 	set codfis [string toupper $data(codfis)]
 	set name "$name $surname"
+	set salary [format "%.2f" $data(salary)]
 	set date [clock format [clock seconds] -format "%d/%B/%Y"]
 
 	set empty [mc "None"]
@@ -1009,6 +1010,7 @@
 	
 	regsub -all "NAMEXXXX" $tmpData $name tmpData
 	regsub -all "ADDRXXXX" $tmpData $address tmpData
+	regsub -all "WAGEXXXX" $tmpData $salary tmpData
 	regsub -all "CODXXXX" $tmpData $codfis tmpData
 	regsub -all "BPLACEXXXX" $tmpData $bplace tmpData
 	regsub -all "BDATEXXXX" $tmpData $bdate tmpData


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.