Changeset 423

Show
Ignore:
Timestamp:
4/19/2007 5:54:26 PM (2 years ago)
Author:
dhughes
Message:

On last update someone had added these folders: conf, dav, db, hooks and locks (this looks like something to do with trac, honestly). These were removed.

This also includes a few fixes for unvared variables and/or argument vars that were not prefixed with arguments.

Location:
trunk/reactor
Files:
5 removed
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/reactor/core/object.cfc

    r417 r423  
    392392                <cfset var exactObjectName = "" /> 
    393393                <cfset var objectDAO = 0 /> 
     394                <cfset var exactName = 0 /> 
    394395 
    395396                <!--- 
    … …  
    436437                </cfif> 
    437438 
    438     <cfif xmlField.XmlAttributes["sequence"] gt ""> 
    439                 <cfset ObjectDao = CreateObject("Component" 
    440             , "reactor.data.#getConfig().getType()#.ObjectDao").init(getConfig().getDsn() 
    441             , getConfig().getUsername() 
    442             , getConfig().getPassword()) /> 
    443                 <cfset exactName = ObjectDao.getExactObjectName(objectName=xmlField.XmlAttributes["sequence"], objectTypeList="sequence") /> 
    444       <cfif compare( exactName, xmlField.XmlAttributes["sequence"] ) is not 0> 
    445         <cfset xmlField.XmlAttributes["sequence"] = exactName /> 
    446       </cfif> 
    447     </cfif> 
    448  
    449  
    450  
     439                <cfif xmlField.XmlAttributes["sequence"] gt ""> 
     440                        <cfset ObjectDao = CreateObject("Component", 
     441                                "reactor.data.#getConfig().getType()#.ObjectDao").init(getConfig().getDsn(), 
     442                                getConfig().getUsername(), 
     443                                getConfig().getPassword() 
     444                        ) /> 
     445                        <cfset exactName = ObjectDao.getExactObjectName(objectName=xmlField.XmlAttributes["sequence"], objectTypeList="sequence") /> 
     446                        <cfif compare( exactName, xmlField.XmlAttributes["sequence"] ) is not 0> 
     447                                <cfset xmlField.XmlAttributes["sequence"] = exactName /> 
     448                        </cfif> 
     449                </cfif> 
    451450                 
    452451                <!--- add the field node ---> 
    … …  
    464463                 
    465464                <cfif len(trim(oldNode.xmlComment))>             
    466                         <cfset newNode.xmlComment = trim(oldNode.xmlComment) /> 
     465                        <cfset arguments.newNode.xmlComment = trim(oldNode.xmlComment) /> 
    467466                </cfif> 
    468467         
    469468                <cfif len(trim(oldNode.xmlCData))> 
    470                         <cfset newNode.xmlCData = trim(oldNode.xmlCData)> 
    471                 </cfif> 
    472                  
    473                 <cfset newNode.xmlAttributes = oldNode.xmlAttributes> 
    474                  
    475                 <cfset newNode.xmlText = trim(oldNode.xmlText) /> 
     469                        <cfset arguments.newNode.xmlCData = trim(oldNode.xmlCData)> 
     470                </cfif> 
     471                 
     472                <cfset arguments.newNode.xmlAttributes = oldNode.xmlAttributes> 
     473                 
     474                <cfset arguments.newNode.xmlText = trim(oldNode.xmlText) /> 
    476475                 
    477476                <cfloop from="1" to="#arrayLen(oldNode.xmlChildren)#" index="i"> 
    478                         <cfset newNode.xmlChildren[i] = xmlElemNew(xmlDoc,oldNode.xmlChildren[i].xmlName) /> 
    479                         <cfset copyNode(xmlDoc,newNode.xmlChildren[i],oldNode.xmlChildren[i]) /> 
     477                        <cfset arguments.newNode.xmlChildren[i] = xmlElemNew(xmlDoc, oldNode.xmlChildren[i].xmlName) /> 
     478                        <cfset copyNode(xmlDoc, arguments.newNode.xmlChildren[i], oldNode.xmlChildren[i]) /> 
    480479                </cfloop> 
    481480        </cffunction> 

  • trunk/reactor/core/objectTranslator.cfc

    r417 r423  
    2323        <cfset var projectPath = "" />           
    2424                <!--- write the project object ---> 
    25        <cfset projectRoot = ExpandPath("/reactor/#Iif(arguments.plugin, De("Plugins"), De("xsl"))#" & "/" ) /> 
     25                <cfset var projectRoot = ExpandPath("/reactor/#Iif(arguments.plugin, De("Plugins"), De("xsl"))#" & "/" ) /> 
    2626 
    2727        <cfset generate( 

  • trunk/reactor/data/informix/ObjectDao.cfc

    r416 r423  
    170170                <cfargument name="typeName" hint="I am the type name to translate" required="yes" type="any" _type="string" /> 
    171171                 
    172                 <cfset typeName = getLowestTwoBits(typeName)> 
     172                <cfset arguments.typeName = getLowestTwoBits(typeName)> 
    173173                                 
    174174                <cfswitch expression="#arguments.typeName#"> 
    … …  
    208208                <cfargument name="typeName" hint="I am the type name to translate" required="yes" type="any" _type="string" /> 
    209209                 
    210                 <cfset typeName = getLowestTwoBits(typeName)> 
     210                <cfset arguments.typeName = getLowestTwoBits(typeName)> 
    211211                                 
    212212                <cfswitch expression="#arguments.typeName#">