[Lxr-commits] CVS: lxr ident,1.13,1.14

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory usw-pr-cvs1:/tmp/cvs-serv16133

Modified Files:
	ident 
Log Message:
Implement separate templates for the declarations and the references in the
ident display.
This helps speed up getting the results to the client browser, since the 
declarations can be sent before the references query is completed.
Fixes bug 526807



Index: ident
===================================================================
RCS file: /cvsroot/lxr/lxr/ident,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ident	20 Nov 2001 15:34:00 -0000	1.13
+++ ident	7 Mar 2002 15:44:31 -0000	1.14
@@ -97,31 +97,47 @@
 
 sub printident {
     my $dir = shift;
-    my $templ;
+    my ($templ, $templ_refs);
     
     #$templ = "<ul>\n\$files{\n<li>\$iconlink \$namelink\n}</ul>\n";
     if ($config->htmlident) {
-	unless (open(TEMPL, $config->htmlident)) {
-	    warning("Template ".$config->htmlident." does not exist.");
-	} else {
-	    local($/) = undef;
-	    $templ = <TEMPL>;
-	    close(TEMPL);
+		unless (open(TEMPL, $config->htmlident)) {
+			warning("Template ".$config->htmlident." does not exist.");
+		} else {
+			local($/) = undef;
+			$templ = <TEMPL>;
+			close(TEMPL);
+		}
+    } else {
+		die "Ident template not configured";
 	}
-    }
+	
+	
+	if ($config->htmlident_refs) {
+		unless (open(TEMPL, $config->htmlident_refs)) {
+			warning("Template ".$config->htmlident_refs." does not exist.");
+		} else {
+			local($/) = undef;
+			$templ_refs = <TEMPL>;
+			close(TEMPL);
+		}
+    } else {
+		die "Ident refs template not configured";
+	}
+	
     
     # print the description of the current directory
     #dirdesc($dir);
     
     # print the listing itself
     print(expandtemplate($templ,
-			 (test => sub { "testik" },
-			  variables => \&varinputs,
-			  identifier => sub { return $identifier },
-			  refs => sub { refexpand(@_) },
-			  uses => sub { usesexpand(@_) },
-			 )
-			));
+						 (variables => \&varinputs,
+						  identifier => sub { return $identifier },
+						  refs => sub { refexpand(@_) },
+						 )));
+	print(expandtemplate($templ_refs,
+						 (uses => sub { usesexpand(@_) },
+						 )));
 }