Merge branch 'hf0.7.5a'

boughtonp · Jan 8, 2013 · ff8ef2e · ff8ef2e
2 parents c2a9295 + ee073cb
commit ff8ef2e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/cfcs/cfregex.cfc b/cfcs/cfregex.cfc
@@ -208,10 +208,10 @@
 				<cfset MatchInfo.Groups[CurGroup] =
 					{ Pos   = Arguments.PosOffset+Matcher.start(CurGroup)
 					, Len   = Matcher.end(CurGroup)-Matcher.start(CurGroup)
-					, Match = Matcher.group(CurGroup)
+					, Match = Matcher.group(JavaCast('int',CurGroup))
 					} />
 			<cfelse>
-				<cfset MatchInfo.Groups[CurGroup] = Matcher.group(CurGroup) />
+				<cfset MatchInfo.Groups[CurGroup] = Matcher.group(JavaCast('int',CurGroup)) />
 			</cfif>
 		</cfloop>
 
@@ -301,15 +301,6 @@
 	</cffunction>
 
 
-	<cffunction name="search"  returntype="any"     output="false" access="public" action>
-		<cfargument name="Text"       type="String"   required="true"  />
-		<cfthrow
-			message = "Not Yet implemented!"
-			type    = "cfRegex.Search.NotYetImplemented"
-		/>
-	</cffunction>
-
-
 	<cffunction name="match"   returntype="Array"   output="false" access="public" action>
 		<cfargument name="Text"         type="String"   required="true"  />
 		<cfargument name="Start"        type="Numeric"  optional  />
@@ -354,13 +345,13 @@
 				<cfcase value="groups">
 					<cfset var CurMatch = [] />
 					<cfloop index="local.CurGroup" from=1 to=#Matcher.groupCount()#>
-						<cfset CurMatch[CurGroup] = Matcher.group(CurGroup) />
+						<cfset CurMatch[CurGroup] = Matcher.group(JavaCast('int',CurGroup)) />
 					</cfloop>
 				</cfcase>
 				<cfcase value="namedgroups">
 					<cfset var CurMatch = {} />
 					<cfloop index="local.CurGroup" from=1 to=#Matcher.groupCount()#>
-						<cfset CurMatch[Arguments.GroupNames[CurGroup]] = Matcher.group(CurGroup) />
+						<cfset CurMatch[Arguments.GroupNames[CurGroup]] = Matcher.group(JavaCast('int',CurGroup)) />
 					</cfloop>
 				</cfcase>
 				<cfcase value="full">
@@ -528,10 +519,10 @@
 				<cfif isSimpleValue(Arguments.Replacement[ReplacePos])>
 					<cfset Matcher.appendReplacement( Results , Arguments.Replacement[ReplacePos] )/>
 				<cfelse>
-					<cfset local.CurrentReplaceFunc = Arguments.Replacement[ReplacePos] />
+					<cfset var CurrentReplaceFunc = Arguments.Replacement[ReplacePos] />
 <cfset Matcher.appendReplacement
 						( Results
-						, local.CurrentReplaceFunc( ArgumentCollection=buildMatchInfo(Matcher,Offset,Arguments.GroupNames) , Data = Arguments.CallbackData )
+						, CurrentReplaceFunc( ArgumentCollection=buildMatchInfo(Matcher,Offset,Arguments.GroupNames) , Data = Arguments.CallbackData )
 						)/>
 				</cfif>
 

diff --git a/cfcs/cfregex.readme.txt b/cfcs/cfregex.readme.txt
@@ -1,4 +1,4 @@
-cfRegex v0.1.002-qp
+cfRegex v0.1.003-qp
 www.cfregex.net
 
 NOTE:
@@ -20,8 +20,8 @@ all designed to be used instead of the existing regex functions.
 
 STATUS
 ������
-Version: 0.1.002
-Released: 2011-07-14
+Version: 0.1.003
+Released: 2012-05-31
 
 
 DOCUMENTATION & HELP

diff --git a/circuits/scanner/dsp_html.cfm b/circuits/scanner/dsp_html.cfm
@@ -38,7 +38,7 @@
 							<span class="scope_info">Scopes: #XmlFormat(ScopeList)# <cfif ContainsClientScope><em>!!!CLIENT SCOPE!!!</em></cfif></span>
 						</cfif>
 					</dt>
-					<cfset QCode = HtmlEditFormat(QueryCode).replaceAll( '(?<!\A)\n\r?' , '<br/>' )/>
+					<cfset QCode = HtmlEditFormat(QueryCode).replaceAll( '(?<!\A)\r?\n' , '<br/>' )/>
 					<dd class="query_code" id="#QueryId#">#QCode#</dd>
 				</cfoutput>
 				</dl>