[Idrs-commit] CVS: Idrs/dev/projects/compiler rmlTrans.xml,1.2,1.3 rmlTransSchema.xml,1.2,1.3

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/projects/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv27321/dev/projects/compiler

Modified Files:
	rmlTrans.xml rmlTransSchema.xml 
Log Message:
The macro translation process is MOSTLY working, there are still a couple of bugs to kick out of the system though


Index: rmlTrans.xml
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/projects/compiler/rmlTrans.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rmlTrans.xml	2002/01/19 06:51:26	1.2
--- rmlTrans.xml	2002/01/19 17:42:45	1.3
***************
*** 2,33 ****
  <trans:rmlTrans xmlns:trans="rmlTransSchema.xml">
  	<!-- define valid rml tags -->
! 	<trans:rml>rml</trans:rml>
! 	<trans:rml>ishtml</trans:rml>
! 	<trans:rml>scriptClass</trans:rml>
! 	<trans:rml>head</trans:rml>
! 	<trans:rml>object</trans:rml>
! 	<trans:rml>class</trans:rml>	
! 	<trans:rml>constructor</trans:rml>
! 	<trans:rml>vartype</trans:rml>
! 	<trans:rml>method</trans:rml>
! 	<trans:rml>name</trans:rml>
! 	<trans:rml>db</trans:rml>
! 	<trans:rml>dbDriver</trans:rml>
! 	<trans:rml>dbName</trans:rml>
! 	<trans:rml>dbUser</trans:rml>
! 	<trans:rml>dbPass</trans:rml>
! 	<trans:rml>useDb</trans:rml>
! 	<trans:rml>usemethod</trans:rml>
! 	<trans:rml>sql</trans:rml>
! 	<trans:rml>storedProc</trans:rml>
! 	<trans:rml>varlist</trans:rml>
! 	<trans:rml>body</trans:rml>
! 	<trans:rml>field</trans:rml>
! 	<trans:rml>ifResults</trans:rml>
! 	<trans:rml>yes</trans:rml>
! 	<trans:rml>no</trans:rml>
! 	<trans:rml>repeat</trans:rml>
! 	<trans:rml>ifChange</trans:rml>
! 	<trans:rml>inputResults</trans:rml>
  	
  	<!-- text tag -->
--- 2,34 ----
  <trans:rmlTrans xmlns:trans="rmlTransSchema.xml">
  	<!-- define valid rml tags -->
! 	<trans:rml simple="false" >rml</trans:rml>
! 	<trans:rml simple="true" >ishtml</trans:rml>
! 	<trans:rml simple="true" >scriptClass</trans:rml>
! 	<trans:rml simple="false" >head</trans:rml>
! 	<trans:rml simple="false" >object</trans:rml>
! 	<trans:rml simple="true" >class</trans:rml>	
! 	<trans:rml simple="false" >constructor</trans:rml>
! 	<trans:rml simple="true" >vartype</trans:rml>
! 	<trans:rml simple="false" >method</trans:rml>
! 	<trans:rml simple="true" >name</trans:rml>
! 	<trans:rml simple="false" >db</trans:rml>
! 	<trans:rml simple="true" >dbDriver</trans:rml>
! 	<trans:rml simple="true" >dbName</trans:rml>
! 	<trans:rml simple="true" >dbUser</trans:rml>
! 	<trans:rml simple="true" >dbPass</trans:rml>
! 	<trans:rml simple="true" >useDb</trans:rml>
! 	<trans:rml simple="true" >usemethod</trans:rml>
! 	<trans:rml simple="false" >sql</trans:rml>
! 	<trans:rml simple="false" >storedProc</trans:rml>
! 	<trans:rml simple="false" >varlist</trans:rml>
! 	<trans:rml simple="false" >body</trans:rml>
! 	<trans:rml simple="true" >field</trans:rml>
! 	<trans:rml simple="true" >src</trans:rml>
! 	<trans:rml simple="false" >ifResults</trans:rml>
! 	<trans:rml simple="false" >yes</trans:rml>
! 	<trans:rml simple="false" >no</trans:rml>
! 	<trans:rml simple="false" >repeat</trans:rml>
! 	<trans:rml simple="false" >ifChange</trans:rml>
! 	<trans:rml simple="true" >inputResults</trans:rml>
  	
  	<!-- text tag -->
***************
*** 38,45 ****
  	
  	<!-- echo script tag -->
! 	<trans:echoScriptTag>echoScriptTag</trans:echoScriptTag>
  	
  	<!-- Script tag char -->
! 	<trans:schriptChar>$</trans:scriptChar>
  	
  	<!-- Location of RML Schema -->
--- 39,46 ----
  	
  	<!-- echo script tag -->
! 	<trans:echoScriptTag>echoScript</trans:echoScriptTag>
  	
  	<!-- Script tag char -->
! 	<trans:scriptChar>$</trans:scriptChar>
  	
  	<!-- Location of RML Schema -->

Index: rmlTransSchema.xml
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/projects/compiler/rmlTransSchema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rmlTransSchema.xml	2002/01/19 06:51:26	1.2
--- rmlTransSchema.xml	2002/01/19 17:42:46	1.3
***************
*** 5,27 ****
  			<xs:sequence>
  				<!-- a list of rml elements is used to identify all valid rml tags (db,field,... -->
! 				<element name="rml" type="xs:string" minOccurrs="1" maxOccurrs="unbound" />
  				
  				<!-- Used to identify what tag will be used for non-RML text purposes -->
! 				<element name="textTag" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- Used to identify what tag will be used for script purposes -->
! 				<element name="scriptTag" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- Used to identify what tag will be used for echo script  purposes -->
! 				<element name="echoScriptTag" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- defines what character will be used to signify a script, currently $ -->
! 				<element name="schriptChar" type="xs:char" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- defines the RML schema's locaton -->
! 				<element name="schemaLocation" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- defines the RML schema's name space -->
! 				<element name="schemaNameSpace" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  			</xs:sequence>
  		</xs:complexType>
--- 5,29 ----
  			<xs:sequence>
  				<!-- a list of rml elements is used to identify all valid rml tags (db,field,... -->
! 				<xs:element name="rml" type="xs:string" minOccurrs="1" maxOccurrs="unbound">
! 				 <xs:attribute name="simple" type="xs:boolean" />
! 				</xs:element>
  				
  				<!-- Used to identify what tag will be used for non-RML text purposes -->
! 				<xs:element name="textTag" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- Used to identify what tag will be used for script purposes -->
! 				<xs:element name="scriptTag" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- Used to identify what tag will be used for echo script  purposes -->
! 				<xs:element name="echoScriptTag" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- defines what character will be used to signify a script, currently $ -->
! 				<xs:element name="scriptChar" type="xs:char" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- defines the RML schema's locaton -->
! 				<xs:element name="schemaLocation" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  				
  				<!-- defines the RML schema's name space -->
! 				<xs:element name="schemaNameSpace" type="xs:string" minOccurrs="1" maxOccurrs="1" />
  			</xs:sequence>
  		</xs:complexType>