Changeset 282 for framework/trunk/fuseboxCircuit.cfc

Timestamp:

12/21/06 12:20:33 (2 years ago)

Author:

scorfield

Message:

Addresses #95 by allowing fusebox.xml parameter overrides for lexiconPath and errortemplatesPath
and both of those can be relative (to the application root) or absolute / mapped. In addition
lexicons can now be relative (to the lexicon path) or absolute / mapped.

Files:

• framework/trunk/fuseboxCircuit.cfc (modified) (3 diffs)

framework/trunk/fuseboxCircuit.cfc

@@ -189 +189 @@
                                 
                         </cftry>
+<!---           
+                        this was initially implemented as part of ticket 135 but feedback on
+                        the mailing list seems to indicate people think it is too draconian
+                        a restriction, even in strict mode - and I agree! -- Sean Corfield
                         
                         <cfif variables.fuseboxApplication.strictMode and not circuitImplicit and
@@ -196 +200 @@
                                                 detail="The circuit xml file, #circuitFile#, in #variables.fullPath#, uses a different file extension to the application's fusebox xml file. Strict requires consistency." />
                         </cfif>
-                        
+ --->                   
                         <cftry>
                                 
@@ -466 +470 @@
                                                         detail="You have attempted to declare a namespace '#aLex.namespace#' (in Circuit #getAlias()#) which is reserved by the Fusebox framework." />
                                 </cfif>
-                                <cfset attributes[attr] = replace(attributes[attr],"\","/","all") />
+                                <cfset attributes[attr] = variables.fuseboxApplication.normalizePartialPath(attributes[attr]) />
                                 <cfif left(attributes[attr],1) is "/">
                                         <!--- assume mapped / root-relative path --->
                                         <cfset aLex.path = attributes[attr] />
+                                <cfelseif left(variables.fuseboxApplication.lexiconPath,1) is "/">
+                                        <!--- assume mapped / root-relative path --->
+                                        <cfset aLex.path = variables.fuseboxApplication.lexiconPath & attributes[attr] />
                                 <cfelse>
-                                        <cfset aLex.path = variables.fuseboxApplication.getCoreToAppRootPath() & variables.fuseboxApplication.lexiconPath & attributes[attr] />
-                                </cfif>
-                                <cfif right(aLex.path,1) is not "/">
-                                        <cfset aLex.path = aLex.path & "/" />
+                                        <!--- relative paths --->
+                                        <cfset aLex.path = variables.fuseboxApplication.getCoreToAppRootPath() & 
+                                                        variables.fuseboxApplication.lexiconPath & attributes[attr] />
                                 </cfif>
                                 <cfset variables.lexicons[aLex.namespace] = aLex />