[Mydatabasepilot-cvs] MyDatabasePilot/dbProcessBody AddField.cfm,1.10,1.11

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

Update of /cvsroot/mydatabasepilot/MyDatabasePilot/dbProcessBody
In directory sc8-pr-cvs1:/tmp/cvs-serv32432/dbProcessBody

Modified Files:
	AddField.cfm 
Log Message:
[ 754163 ] Removed Evalute Dynamic Functions from 
dbProcessBody/AddField.cfm 

Now using #alterSpec[i].colType# syntax 
opposed to #Evaluate("FORM.fieldType#i#")# 

Renamed valueList to legalValues and 
Renamed default to defaultValue 
to prevent CF language conflicts 

Index: AddField.cfm
===================================================================
RCS file: /cvsroot/mydatabasepilot/MyDatabasePilot/dbProcessBody/AddField.cfm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AddField.cfm	13 Jun 2003 15:47:51 -0000	1.10
--- AddField.cfm	13 Jun 2003 18:55:44 -0000	1.11
***************
*** 266,275 ****
  							<td valign="middle">
  								<!---||| Show Available Field Options Based on Selected Field Type |||--->
! 								<cfswitch expression="#Evaluate("FORM.fieldType#i#")#">
  									<!---||| VARCHAR and CHAR Options |||--->
  									<cfcase value="VARCHAR,CHAR">
  										<!--- Show Lenght Option, set value to previous request if it exists --->
  										<!--- Make sure it is an interger between 0-255, set it to required --->
! 										<nobr><label class="Fancy">Length(</label><cfinput name="length#i#" type="text" value="#Evaluate("FORM.length#i#")#" size="3" maxlength="3" range="0,255" required="yes" message="The legal range for length is 0-255. This is a required field. Please correct this field for row number #i#." validate="integer" class="Fancy" /><label class="Fancy">)</label></nobr><br />
  										<!--- Show BINARY Option, set it to checked if already set on a previous request --->
  										<nobr>
--- 266,275 ----
  							<td valign="middle">
  								<!---||| Show Available Field Options Based on Selected Field Type |||--->
! 								<cfswitch expression="#alterSpec[i].colType#">
  									<!---||| VARCHAR and CHAR Options |||--->
  									<cfcase value="VARCHAR,CHAR">
  										<!--- Show Lenght Option, set value to previous request if it exists --->
  										<!--- Make sure it is an interger between 0-255, set it to required --->
! 										<nobr><label class="Fancy">Length(</label><cfinput name="length#i#" type="text" value="#alterSpec[i].length#" size="3" maxlength="3" range="0,255" required="yes" message="The legal range for length is 0-255. This is a required field. Please correct this field for row number #i#." validate="integer" class="Fancy" /><label class="Fancy">)</label></nobr><br />
  										<!--- Show BINARY Option, set it to checked if already set on a previous request --->
  										<nobr>
***************
*** 308,313 ****
  									<cfcase value="ENUM,SET">
  										<!--- Show "Value List" Option, set value to previous request if it exists --->
! 										<label for="valueList#i#" class="Fancy">Value List:<br />Enter Each Value on a New Line</label><br />
! 										<textarea name="valueList#i#" cols="20" rows="5" class="Fancy">#Evaluate("FORM.valueList#i#")#</textarea>
  										<br />
  																				
--- 308,313 ----
  									<cfcase value="ENUM,SET">
  										<!--- Show "Value List" Option, set value to previous request if it exists --->
! 										<label for="legalValues#i#" class="Fancy">Value List:<br />Enter Each Value on a New Line</label><br />
! 										<textarea name="legalValues#i#" cols="20" rows="5" class="Fancy">#alterSpec[i].legalValues#</textarea>
  										<br />
  																				
***************
*** 327,331 ****
  										<!--- Show "Length" Option, set value to previous request if it exists --->
  										<!--- Make sure it is an interger between 1-20, set it to not required --->
! 										<nobr><label class="Fancy">Length(</label><cfinput name="length#i#" type="text" value="#Evaluate("FORM.length#i#")#" size="2" maxlength="2" range="1,20" required="no" message="The legal range for length is 1-20 in row number #i#. Please correct this field for row number #i#." validate="integer" class="Fancy" /><label class="Fancy">)</label></nobr><br />
  										<!--- Show AUTO_INCREMENT Option, set it to checked if already set on a previous request --->
  										<nobr>
--- 327,331 ----
  										<!--- Show "Length" Option, set value to previous request if it exists --->
  										<!--- Make sure it is an interger between 1-20, set it to not required --->
! 										<nobr><label class="Fancy">Length(</label><cfinput name="length#i#" type="text" value="#alterSpec[i].length#" size="2" maxlength="2" range="1,20" required="no" message="The legal range for length is 1-20 in row number #i#. Please correct this field for row number #i#." validate="integer" class="Fancy" /><label class="Fancy">)</label></nobr><br />
  										<!--- Show AUTO_INCREMENT Option, set it to checked if already set on a previous request --->
  										<nobr>
***************
*** 373,379 ****
  										<nobr>
  											<label class="Fancy">(</label>
! 											<cfinput name="length#i#" type="text" value="#Evaluate("FORM.length#i#")#" size="2" maxlength="2" range="1,24" required="no" message="The legal range for length is 1-24 in row number #i#. Please correct this field for row number #i#." validate="integer" class="Fancy" />
  											<label class="Fancy">,</label>
! 											<cfinput name="numberOfDecimals#i#" type="text" value="#Evaluate("FORM.numberOfDecimals#i#")#" size="2" maxlength="2" range="1,24" required="no" message="The legal range for Number of Decimals is 1-24. Please correct this field for row number #i#." validate="integer" class="Fancy" />
  											<label class="Fancy">)</label>
  										</nobr><br />
--- 373,379 ----
  										<nobr>
  											<label class="Fancy">(</label>
! 											<cfinput name="length#i#" type="text" value="#alterSpec[i].length#" size="2" maxlength="2" range="1,24" required="no" message="The legal range for length is 1-24 in row number #i#. Please correct this field for row number #i#." validate="integer" class="Fancy" />
  											<label class="Fancy">,</label>
! 											<cfinput name="numberOfDecimals#i#" type="text" value="#alterSpec[i].numberOfDecimals#" size="2" maxlength="2" range="1,24" required="no" message="The legal range for Number of Decimals is 1-24. Please correct this field for row number #i#." validate="integer" class="Fancy" />
  											<label class="Fancy">)</label>
  										</nobr><br />
***************
*** 411,424 ****
  										<!--- Show "Length" Option if Data Type is TIMESTAMP, set value to previous request if it exists --->
  										<!--- Make sure it is an interger between 2-14, set it to not required --->
! 										<cfif #Evaluate("FORM.fieldType#i#")# IS "TIMESTAMP">
! 											<nobr><label class="Fancy">Length(</label><cfinput name="length#i#" type="text" value="#Evaluate("FORM.length#i#")#" size="2" maxlength="2" range="2,14" required="no" message="The legal range for Length is 2-14 in row number #i#. Please correct this field for row number #i#." validate="integer" class="Fancy" /><label class="Fancy">)</label></nobr><br />
  										</cfif>
  										
  										<!--- Show "Length" Option if Data Type is TIMESTAMP --->
  										<!--- Set value 2 to checked if already set on a previous request otherwise set value 4 to checked --->
! 										<cfif #Evaluate("FORM.fieldType#i#")# IS "YEAR">
  											<nobr>
  												<label class="Fancy">Length(</label>
! 												<cfif #Evaluate("FORM.length#i#")# IS 2>
  													<cfinput name="length#i#" type="radio" value="2" checked="yes" /><label class="Fancy">2</label>
  													<cfinput name="length#i#" type="radio" value="4"  /><label class="Fancy">4</label>
--- 411,424 ----
  										<!--- Show "Length" Option if Data Type is TIMESTAMP, set value to previous request if it exists --->
  										<!--- Make sure it is an interger between 2-14, set it to not required --->
! 										<cfif #alterSpec[i].colType# IS "TIMESTAMP">
! 											<nobr><label class="Fancy">Length(</label><cfinput name="length#i#" type="text" value="#alterSpec[i].length#" size="2" maxlength="2" range="2,14" required="no" message="The legal range for Length is 2-14 in row number #i#. Please correct this field for row number #i#." validate="integer" class="Fancy" /><label class="Fancy">)</label></nobr><br />
  										</cfif>
  										
  										<!--- Show "Length" Option if Data Type is TIMESTAMP --->
  										<!--- Set value 2 to checked if already set on a previous request otherwise set value 4 to checked --->
! 										<cfif #alterSpec[i].colType# IS "YEAR">
  											<nobr>
  												<label class="Fancy">Length(</label>
! 												<cfif #alterSpec[i].length# IS 2>
  													<cfinput name="length#i#" type="radio" value="2" checked="yes" /><label class="Fancy">2</label>
  													<cfinput name="length#i#" type="radio" value="4"  /><label class="Fancy">4</label>
***************
*** 449,457 ****
  							<!---||| Allow User to Enter a Default Value for the Field Unless fieldType is BLOB or TEXT |||--->
  							<td>
! 								<cfswitch expression="#Evaluate("FORM.fieldType#i#")#">
  									<cfcase value="TINYBLOB,BLOB,MEDIUMBLOB,LONGBLOB,TINYTEXT,TEXT,MEDIUMTEXT,LONGTEXT">
  										<label class="Fancy">BLOB and TEXT field types can not have default values.</label>
  									</cfcase>
! 									<cfdefaultcase><cfinput name="default#i#" value="#Evaluate("FORM.default#i#")#" type="text" size="20" required="no" class="Fancy" /></cfdefaultcase> 
  								</cfswitch>
  							</td>
--- 449,457 ----
  							<!---||| Allow User to Enter a Default Value for the Field Unless fieldType is BLOB or TEXT |||--->
  							<td>
! 								<cfswitch expression="#alterSpec[i].colType#">
  									<cfcase value="TINYBLOB,BLOB,MEDIUMBLOB,LONGBLOB,TINYTEXT,TEXT,MEDIUMTEXT,LONGTEXT">
  										<label class="Fancy">BLOB and TEXT field types can not have default values.</label>
  									</cfcase>
! 									<cfdefaultcase><cfinput name="defaultValue#i#" value="#alterSpec[i].defaultValue#" type="text" size="20" required="no" class="Fancy" /></cfdefaultcase> 
  								</cfswitch>
  							</td>
***************
*** 461,465 ****
  								<cfinput name="key#i#" type="radio" value="Primary" /><label class="Fancy">Primary</label><br />
  								<cfinput name="key#i#" type="radio" value="Unique" /><label class="Fancy">Unique</label><br />
! 								<cfswitch expression="#Evaluate("FORM.fieldType#i#")#">
  									<cfcase value="TINYTEXT,TEXT,MEDIUMTEXT,LONGTEXT,VARCHAR">
  										<cfinput name="key#i#" type="radio" value="Fulltext" /><label class="Fancy">Fulltext</label><br />
--- 461,465 ----
  								<cfinput name="key#i#" type="radio" value="Primary" /><label class="Fancy">Primary</label><br />
  								<cfinput name="key#i#" type="radio" value="Unique" /><label class="Fancy">Unique</label><br />
! 								<cfswitch expression="#alterSpec[i].colType#">
  									<cfcase value="TINYTEXT,TEXT,MEDIUMTEXT,LONGTEXT,VARCHAR">
  										<cfinput name="key#i#" type="radio" value="Fulltext" /><label class="Fancy">Fulltext</label><br />
***************
*** 467,471 ****
  								</cfswitch>
  								<cfinput name="key#i#" type="radio" value="Index" /><label class="Fancy">Index</label>
! 								<cfswitch expression="#Evaluate("FORM.fieldType#i#")#">
  									<cfcase value="TINYBLOB,BLOB,MEDIUMBLOB,LONGBLOB,TINYTEXT,TEXT,MEDIUMTEXT,LONGTEXT,CHAR,VARCHAR">
  										Length()
--- 467,471 ----
  								</cfswitch>
  								<cfinput name="key#i#" type="radio" value="Index" /><label class="Fancy">Index</label>
! 								<cfswitch expression="#alterSpec[i].colType#">
  									<cfcase value="TINYBLOB,BLOB,MEDIUMBLOB,LONGBLOB,TINYTEXT,TEXT,MEDIUMTEXT,LONGTEXT,CHAR,VARCHAR">
  										Length()
***************
*** 487,492 ****
  			<div class="Code">
  				<cfoutput>
! 					RAW: #rawOutput#<br />
! 					HTML: #htmlOutput#<br />
  				</cfoutput>
  			</div>
--- 487,492 ----
  			<div class="Code">
  				<cfoutput>
! 					RAW:<br />#rawOutput#<br />
! 					HTML:<br />#htmlOutput#<br />
  				</cfoutput>
  			</div>