[Lxr-commits] CVS: lxr/lib/LXR Index.pm, 1.12, 1.13 Tagger.pm, 1.22, 1.23

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

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

Modified Files:
	Index.pm Tagger.pm 
Log Message:
Feature 1691378 (Rearchitect the DB backends) Part IV:
* Renamed LXR::Index subroutines to be more understandable

Index: Index.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Index.pm	21 Apr 2009 20:03:04 -0000	1.12
+++ Index.pm	25 Apr 2009 20:40:24 -0000	1.13
@@ -43,69 +43,79 @@
 # Stub implementations of this interface
 #
 
-sub getindex {
-  my ($self, $symname, $release) = @_;
-  my @indexes;
-	warn  __PACKAGE__."::getindex not implemented. Parameters @_";
-  return @indexes;
+sub fileid {
+  my ($self, $filename, $revision) = @_; 	# CAUTION: $revision is not $release!  
+  my $fileid;
+	warn  __PACKAGE__."::fileid not implemented. Parameters @_";
+  return $fileid;
 }
 
-sub index {
-  my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_;
-	warn  __PACKAGE__."::index not implemented. Parameters @_";
+# Indicate that the file referred to by $fileid is part of $release
+sub setfilerelease {
+  my ($self, $fileid, $release) = @_;
+	warn  __PACKAGE__."::setfilerelease not implemented. Parameters @_";
   return;
 }
 
-sub toindex {
+# If the file referred to by $fileid has already been indexed return true.
+# Otherwise return false.
+sub fileindexed {
   my ($self, $fileid) = @_;
   my $filefoundboolean;
-	warn  __PACKAGE__."::toindex not implemented. Parameters @_";
+	warn  __PACKAGE__."::fileindexed not implemented. Parameters @_";
   return $filefoundboolean;
 }
 
-sub setindexed {
+sub setfileindexed {
   my ($self, $fileid) = @_;
-	warn  __PACKAGE__."::setindexed not implemented. Parameters @_";
+	warn  __PACKAGE__."::setfileindexed not implemented. Parameters @_";
   return;
 }
 
-sub fileid {
-  my ($self, $filename, $revision) = @_;
-  my $fileid;
-	warn  __PACKAGE__."::fileid not implemented. Parameters @_";
-  return $fileid;
+sub filereferenced {
+  my ($self, $fileid) = @_;
+  my $referencefoundboolean;
+	warn  __PACKAGE__."::filereferenced not implemented. Parameters @_";
+  return $referencefoundboolean;
 }
 
-sub getreference {
+sub setfilereferenced {
+  my ($self, $fileid) = @_;
+	warn  __PACKAGE__."::setfilereferenced not implemented. Parameters @_";
+  return;
+}
+
+sub symdeclarations {
   my ($self, $symname, $release) = @_;
-  my @references;
-	warn  __PACKAGE__."::getreference not implemented. Parameters @_";
-  return @references;
+  my @indexes;
+	warn  __PACKAGE__."::symdeclarations not implemented. Parameters @_";
+  return @indexes;
 }
 
-sub reference {
-  my ($self, $symname, $fileid, $line) = @_;
-	warn  __PACKAGE__."::reference not implemented. Parameters @_";
+sub setsymdeclaration {
+  my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_;
+	warn  __PACKAGE__."::setsymdeclaration not implemented. Parameters @_";
   return;
 }
 
-sub toreference {
-  my ($self, $fileid) = @_;
-  my $referencefoundboolean;
-	warn  __PACKAGE__."::toreference not implemented. Parameters @_";
-  return $referencefoundboolean;
+sub symreferences {
+  my ($self, $symname, $release) = @_;
+  my @references;
+	warn  __PACKAGE__."::symreferences not implemented. Parameters @_";
+  return @references;
 }
 
-sub setreferenced {
-  my ($self, $fileid) = @_;
-	warn  __PACKAGE__."::setreferenced not implemented. Parameters @_";
+sub setsymreference {
+  my ($self, $symname, $fileid, $line) = @_;
+	warn  __PACKAGE__."::setsymreference not implemented. Parameters @_";
   return;
 }
 
-sub release {
-  my ($self, $fileid, $release) = @_;
-	warn  __PACKAGE__."::release not implemented. Parameters @_";
-  return;
+sub issymbol {
+	my ($self, $symname, $release) = @_;
+  my $symbolfoundboolean;
+	warn  __PACKAGE__."::issymbol not implemented. Parameters @_";
+  return $symbolfoundboolean;
 }
 
 sub symid {
@@ -122,23 +132,19 @@
   return $symname;
 }
 
-sub issymbol {
-	my ($self, $symname, $release) = @_;
-  my $symbolfoundboolean;
-	warn  __PACKAGE__."::issymbol not implemented. Parameters @_";
-  return $symbolfoundboolean;
-}
-
-sub getdecid {
+sub decid {
   my ($self, $lang, $string) = @_;
   my $decid;
-	warn  __PACKAGE__."::getdecid not implemented. Parameters @_";
+	warn  __PACKAGE__."::decid not implemented. Parameters @_";
   return $decid;
 }
 
-sub empty_cache {
+# This function should be called before parsing each new file,
+# if this is not done then too much memory will be used and
+# things will become very slow.
+sub emptycache {
   my ($self) = @_;
-	warn  __PACKAGE__."::empty_cache not implemented. Parameters @_";
+	warn  __PACKAGE__."::emptycache not implemented. Parameters @_";
   return;
 }
 

Index: Tagger.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Tagger.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Tagger.pm	21 Jul 2004 20:44:30 -0000	1.22
+++ Tagger.pm	25 Apr 2009 20:40:24 -0000	1.23
@@ -40,16 +40,16 @@
 	if ($index) {
 		my $fileid = $index->fileid($pathname, $revision);
 
-		$index->release($fileid, $release);
+		$index->setfilerelease($fileid, $release);
 
-		if ($index->toindex($fileid)) {
-			$index->empty_cache();
+		if ($index->fileindexed($fileid)) {
+			$index->emptycache();
 			print(STDERR "--- $pathname $fileid\n");
 
 			my $path = $files->tmpfile($pathname, $release);
 
 			$lang->indexfile($pathname, $path, $fileid, $index, $config);
-			$index->setindexed($fileid);
+			$index->setfileindexed($fileid);
 			unlink($path);
 		} else {
 			print(STDERR "$pathname was already indexed\n");
@@ -77,14 +77,14 @@
 	if ($index) {
 		my $fileid = $index->fileid($pathname, $revision);
 
-		if ($index->toreference($fileid)) {
-			$index->empty_cache();
+		if ($index->filereferenced($fileid)) {
+			$index->emptycache();
 			print(STDERR "--- $pathname $fileid\n");
 
 			my $path = $files->tmpfile($pathname, $release);
 
 			$lang->referencefile($pathname, $path, $fileid, $index, $config);
-			$index->setreferenced($fileid);
+			$index->setfilereferenced($fileid);
 			unlink($path);
 		} else {
 			print STDERR "$pathname was already referenced\n";