[Lxr-commits] CVS: lxr/lib/LXR/Lang Java.pm, 1.7, 1.8 Generic.pm, 1.24, 1.25 Cobol.pm, 1.2, 1.3

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Lang
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3821/lib/LXR/Lang

Modified Files:
	Java.pm Generic.pm Cobol.pm 
Log Message:
Feature 1691378 (Rearchitect the DB backends) Part X
* Renamed lxr_release.rel -> releaseid for Mysql
* Renamed lxr_release.release -> releaseid for Oracle and Postgres
* Renamed $release -> $releaseid generally

Index: Java.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Java.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Java.pm	10 Aug 2004 16:13:03 -0000	1.7
+++ Java.pm	10 May 2009 11:54:29 -0000	1.8
@@ -41,7 +41,7 @@
 	# "package java.lang.util"
 	$$frag =~ s#(package\s+)([\w.]+)#
 	    "<span class='reserved'>$1</span>".
-	    ($index->issymbol($2, $$self{'release'}) ?
+	    ($index->issymbol($2, $$self{'releaseid'}) ?
 		join($2, @{$$self{'itag'}}) : $2)
 	    #e;
 
@@ -49,7 +49,7 @@
 	# "import java.awt.*" by providing link to the package
 	$$frag =~ s#(import\s+)([\w.]+)(\.\*)#
 		"<span class='reserved'>$1</span>".
-			($index->issymbol($2, $$self{'release'}) ?
+			($index->issymbol($2, $$self{'releaseid'}) ?
 			 join($2, @{$$self{'itag'}}) : $2) . 
 				 $3 #e;
 
@@ -58,9 +58,9 @@
 	# package and the class
 	$$frag =~ s#(import\s+)([\w.]+)\.(\w+)(\W)#
 		"<span class='reserved'>$1</span>".
-  			($index->issymbol($2, $$self{'release'}) ?
+  			($index->issymbol($2, $$self{'releaseid'}) ?
   			 join($2, @{$$self{'itag'}}) : $2) . "." .
-				 ($index->issymbol($3, $$self{'release'}) ?
+				 ($index->issymbol($3, $$self{'releaseid'}) ?
 				  join($3, @{$$self{'itag'}}) : $3) . $4#e;
 
 }

Index: Generic.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Generic.pm	25 Apr 2009 20:40:24 -0000	1.24
+++ Generic.pm	10 May 2009 11:54:29 -0000	1.25
@@ -35,11 +35,11 @@
 @LXR::Lang::Generic::ISA = ('LXR::Lang');
 
 sub new {
-	my ($proto, $pathname, $release, $lang) = @_;
+	my ($proto, $pathname, $releaseid, $lang) = @_;
 	my $class = ref($proto) || $proto;
 	my $self = {};
 	bless($self, $class);
-	$$self{'release'}  = $release;
+	$$self{'releaseid'}  = $releaseid;
 	$$self{'language'} = $lang;
 
 	read_config() unless defined $generic_config;
@@ -161,7 +161,7 @@
 	   }
 	   {
 	     $1.
-		   ( $index->issymbol($2, $$self{'release'}) ? join($2, @{$$self{'itag'}}) : $2 );
+		   ( $index->issymbol($2, $$self{'releaseid'}) ? join($2, @{$$self{'itag'}}) : $2 );
   	 }gex;
 }
 
@@ -227,7 +227,7 @@
 					$string = $_;
 
 					#		  print "considering $string\n";
-					if (!$self->isreserved($string) && $index->issymbol($string, $$self{'release'}))
+					if (!$self->isreserved($string) && $index->issymbol($string, $$self{'releaseid'}))
 					{
 
 						#			print "adding $string to references\n";

Index: Cobol.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Cobol.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Cobol.pm	11 Apr 2009 11:23:43 -0000	1.2
+++ Cobol.pm	10 May 2009 11:54:29 -0000	1.3
@@ -41,7 +41,7 @@
 		( $2 eq "" ? $2 :
 		($self->isreserved($2) ? "<span class='reserved'>$2</span>" : 
 		(
-		  $index->issymbol($2, $$self{'release'})) ?
+		  $index->issymbol($2, $$self{'releaseid'})) ?
 		 join($2, @{$$self{'itag'}}) :
 		 $2));
 	}ge;