Changeset 280 for framework/trunk/fuseboxApplication.cfc

Timestamp:

12/20/06 13:12:58 (2 years ago)

Author:

scorfield

Message:

Fixes #135 by adding a check in strict mode that (a) only one of *.xml / *.xml.cfm exists
(for fusebox and circuit files) and (b) the file extensions are consistent (i.e., you can't
have fusebox.xml and then circuit.xml.cfm). The last may prove controversial.

Files:

• framework/trunk/fuseboxApplication.cfc (modified) (7 diffs)

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- fix ticket 138 --->
+                <!--- fix ticket 135 --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -99 +99 @@
                 <cfset variables.fuseboxLexicon = variables.factory.getBuiltinLexicon() />
                 <cfset variables.customAttributes = structNew() />
+                
+                <cfset variables.fuseboxFileExtension = "" />
 
                 <cfset variables.fuseboxVersion = myVersion />
@@ -153 +155 @@
                 
                 <cfset var fbFile = "fusebox.xml.cfm" />
+                <cfset var fbFileAlt = "fusebox.xml" />
                 <cfset var fbXML = "" />
                 <cfset var fbCode = "" />
@@ -161 +164 @@
                 <cfset var jFuseboxFile = "" />
                 <cfset var dtLastModified = "" />
+                
+                <!---
+                        since we need to check the file, regardless of whether we load it,
+                        we might as well do the test up front and perform the strict check
+                        that just one version exists (ticket 135)
+                --->
+                <cfif fileExists(this.approotdirectory & fbFile)>
+                        <cfif this.strictMode and fileExists(this.approotdirectory & fbFileAlt)>
+                                <cfthrow type="fusebox.multipleFuseboxXML" 
+                                                message="Both 'fusebox.xml' and 'fusebox.xml.cfm' exist" 
+                                                detail="'fusebox.xml.cfm' will be used but 'fusebox.xml' also exists in '#this.approotdirectory#." />
+                        </cfif>
+                <cfelse>
+                        <cfset fbFile = fbFileAlt />
+                </cfif>
 
                 <cfif structKeyExists(this,"timestamp")>
-                        <cfif not fileExists(this.approotdirectory & fbFile)>
-                                <cfset fbFile = "fusebox.xml" />
-                        </cfif>
                         <!--- Java timestamp solution provided by Daniel Schmid --->
                         <cfset myFuseboxFilePath = this.approotdirectory & fbFile />
@@ -178 +193 @@
                         </cfif>
                         <!--- attempt to load fusebox.xml(.cfm): --->
-                        <cfif not fileExists(this.approotdirectory & fbFile)>
-                                <cfset fbFile = "fusebox.xml" />
-                        </cfif>
                         <cftry>
                                 
@@ -186 +198 @@
                                                 variable="fbXML"
                                                 charset="#this.characterEncoding#" />
+                                                
+                                <cfset variables.fuseboxFileExtension = listLast(fbFile,".") />
                                 
                                 <cfcatch type="any">
@@ -605 +619 @@
         </cffunction>
         
+        <cffunction name="getFuseboxFileExtension" returntype="string" access="public" output="false" 
+                                hint="I return the fusebox.xml file extension: either xml or cfm.">
+                                        
+                <cfreturn variables.fuseboxFileExtension />
+                
+        </cffunction>
+        
         <cffunction name="deleteParsedFiles" returntype="void" access="private" output="false" 
                                 hint="I delete all the script files in the parsed/ directory.">