src/hg/utils/automation/Encode.pm 1.50

Index: src/hg/utils/automation/Encode.pm
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/utils/automation/Encode.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -b -B -U 4 -r1.49 -r1.50
--- src/hg/utils/automation/Encode.pm	2 Nov 2009 17:51:22 -0000	1.49
+++ src/hg/utils/automation/Encode.pm	6 Nov 2009 05:35:11 -0000	1.50
@@ -29,10 +29,10 @@
 #our $dafPrevVersion = "0.2.2";
 
 our $fieldConfigFile = "fields.ra";
 our $vocabConfigFile = "cv.ra";
-our $labsConfigFile = "labs.ra";
-our $piConfigFile = "pi.ra";    # for reporting purposes
+our $grantConfigFile = "labs.ra";
+our $labConfigFile = "pi.ra";    # for reporting purposes
 our $autoCreatedPrefix = "auto";
 
 our $restrictedMonths = 9;
 
@@ -174,25 +174,25 @@
 {
 # The grants are called "labs" in the labs.ra file (for historical reasons).
     my ($configPath) = @_;
     my %grants;
-    if(-e "$configPath/$labsConfigFile") {
+    if(-e "$configPath/$grantConfigFile") {
         # tolerate missing labs.ra in dev trees.
-        %grants = RAFile::readRaFile("$configPath/$labsConfigFile", "lab");
+        %grants = RAFile::readRaFile("$configPath/$grantConfigFile", "lab");
     }
     return \%grants;
 }
 
-sub getPIs
+sub getLabs
 {
-# file with pi/project/lab/grant -- used for reporting purposes
+# file with lab/pi/project/grant -- used for reporting purposes
 # Captures conventions in reporting spreadsheet and pipeline metadata
     my ($configPath) = @_;
-    my %piHash = ();
-    if(-e "$configPath/$piConfigFile") {
-        %piHash = RAFile::readRaFile("$configPath/$piConfigFile", "pi");
+    my %labs = ();
+    if(-e "$configPath/$labConfigFile") {
+        %labs = RAFile::readRaFile("$configPath/$labConfigFile", "lab");
     }
-    return \%piHash;
+    return \%labs;
 }
 
 sub getControlledVocab
 {