Browse Source

Formatting changes for loaders output text

spficklin 12 years ago
parent
commit
d72c084643

+ 2 - 2
tripal_feature/includes/fasta_loader.inc

@@ -560,10 +560,10 @@ function tripal_feature_load_fasta($dfile, $organism_id, $type,
         $intv_read = 0;
         $percent = sprintf("%.2f", ($num_read / $filesize) * 100);
         if ($name) {
-          print "Parsing Line $i (" . $percent . "%). memory: " . number_format(memory_get_usage()) . " bytes. Parsing: $name\r";
+          print "Parsing Line $i (" . $percent . "%). Memory: " . number_format(memory_get_usage()) . " bytes. Parsing: $name\r";
         }
         else {
-          print "Parsing Line $i (" . $percent . "%). memory: " . number_format(memory_get_usage()) . " bytes. Parsing: $uname\r";	
+          print "Parsing Line $i (" . $percent . "%). Memory: " . number_format(memory_get_usage()) . " bytes. Parsing: $uname\r";	
         }
         tripal_job_set_progress($job, intval(($num_read / $filesize) * 100));
       }

+ 2 - 2
tripal_feature/includes/gff_loader.inc

@@ -286,7 +286,7 @@ function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
   $intv_read = 0;
 
   // iterate through each line of the GFF file
-  print "Parsing Line $line_num (0.00%). memory: " . number_format(memory_get_usage()) . " bytes\r";
+  print "Parsing Line $line_num (0.00%). Memory: " . number_format(memory_get_usage()) . " bytes\r";
   while ($line = fgets($fh)) {
 
     $line_num++;
@@ -297,7 +297,7 @@ function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
     if ($job and $intv_read >= $interval) {
       $intv_read = 0;
       $percent = sprintf("%.2f", ($num_read / $filesize) * 100);
-      print "Parsing Line $line_num (" . $percent . "%). memory: " . number_format(memory_get_usage()) . " bytes.\r";
+      print "Parsing Line $line_num (" . $percent . "%). Memory: " . number_format(memory_get_usage()) . " bytes.\r";
       tripal_job_set_progress($job, intval(($num_read / $filesize) * 100));
     }