[Koha-cvs] CVS: koha/C4 Output.pm,1.27,1.28

Andrew Arensburger arensb at users.sourceforge.net
Sun Oct 13 08:06:01 CEST 2002


Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv19638

Modified Files:
	Output.pm 
Log Message:
Added some FIXME comments.


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** Output.pm	11 Oct 2002 12:40:50 -0000	1.27
--- Output.pm	13 Oct 2002 06:05:59 -0000	1.28
***************
*** 480,484 ****
        $i++;
    }
!   $string=$string."</tr>\n";
    return($string);
  }
--- 480,484 ----
        $i++;
    }
!   $string=$string."</tr>\n";		# FIXME - .=
    return($string);
  }
***************
*** 502,506 ****
    my ($action,%inputs)=@_;
    my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();
    my $key;
    my @keys=sort keys %inputs;
--- 502,506 ----
    my ($action,%inputs)=@_;
    my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();		# FIXME - .=
    my $key;
    my @keys=sort keys %inputs;
***************
*** 514,517 ****
--- 514,518 ----
      if ($data[0] eq 'hidden'){
        $string=$string."<input type=hidden name=$keys[$i2] value=\"$data[1]\">\n";
+ 					# FIXME - .=
      } else {
        my $text;
***************
*** 531,540 ****
         	while ($data[$i] ne "") {
  	  my $val = $data[$i+1];
!       	  $text = $text."<option value=$data[$i]>$val";
! 	  $i = $i+2;
  	}
  	$text=$text."</select>";
        }
!       $string=$string.mktablerow(2,'white',$keys[$i2],$text);
        #@order[$posn] =mktablerow(2,'white',$keys[$i2],$text);
      }
--- 532,542 ----
         	while ($data[$i] ne "") {
  	  my $val = $data[$i+1];
!       	  $text = $text."<option value=$data[$i]>$val";		# FIXME - .=
! 	  $i = $i+2;		# FIXME - +=
  	}
  	$text=$text."</select>";
+ 				# FIXME - .=
        }
!       $string=$string.mktablerow(2,'white',$keys[$i2],$text);	# FIXME - .=
        #@order[$posn] =mktablerow(2,'white',$keys[$i2],$text);
      }
***************
*** 543,548 ****
    #$string=$string.join("\n", at order);
    $string=$string.mktablerow(2,'white','<input type=submit>','<input type=reset>');
!   $string=$string.mktableft;
!   $string=$string."</form>";
  }
  
--- 545,551 ----
    #$string=$string.join("\n", at order);
    $string=$string.mktablerow(2,'white','<input type=submit>','<input type=reset>');
! 				# FIXME - .=
!   $string=$string.mktableft;	# FIXME - .=
!   $string=$string."</form>";	# FIXME - .=
  }
  
***************
*** 651,658 ****
         	while ($data[$i] ne "") {
  	  my $val = $data[$i+1];
!       	  $text = $text."<option value=$data[$i]>$val";
  	  $i = $i+2;		# FIXME - Use $i += 2.
  	}
! 	$text=$text."</select>";
        }
  #      $string=$string.mktablerow(2,'white',$keys[$i2],$text);
--- 654,661 ----
         	while ($data[$i] ne "") {
  	  my $val = $data[$i+1];
!       	  $text = $text."<option value=$data[$i]>$val";		# FIXME - .=
  	  $i = $i+2;		# FIXME - Use $i += 2.
  	}
! 	$text=$text."</select>";	# FIXME - .=
        }
  #      $string=$string.mktablerow(2,'white',$keys[$i2],$text);
***************
*** 662,670 ****
    }
    my $temp=join("\n", at order);
!   # FIXME - Use ".=". That's what it's for.
!   $string=$string.$temp;
!   $string=$string.mktablerow(1,'white','<input type=submit>');
!   $string=$string.mktableft;
!   $string=$string."</form>";
    # FIXME - A return statement, while not strictly necessary, would be nice.
  }
--- 665,672 ----
    }
    my $temp=join("\n", at order);
!   $string=$string.$temp;					# FIXME - .=
!   $string=$string.mktablerow(1,'white','<input type=submit>');	# FIXME - .=
!   $string=$string.mktableft;					# FIXME - .=
!   $string=$string."</form>";					# FIXME - .=
    # FIXME - A return statement, while not strictly necessary, would be nice.
  }
***************
*** 738,759 ****
      if ($inputs[$i][0] eq 'hidden'){
        $string=$string."<input type=hidden name=$inputs[$i][1] value=\"$inputs[$i][2]\">\n";
      }
      if ($inputs[$i][0] eq 'radio') {
        $string.="<input type=radio name=$inputs[1] value=$inputs[$i][2]>$inputs[$i][2]";
      }
      if ($inputs[$i][0] eq 'text') {
        $string.="<input type=$inputs[$i][0] name=$inputs[$i][1] value=\"$inputs[$i][2]\">";
      }
      if ($inputs[$i][0] eq 'textarea') {
          $string.="<textarea name=$inputs[$i][1] wrap=physical cols=40 rows=4>$inputs[$i][2]</textarea>";
      }
      if ($inputs[$i][0] eq 'reset'){
        $string.="<input type=reset name=$inputs[$i][1] value=\"$inputs[$i][2]\">";
      }
      if ($inputs[$i][0] eq 'submit'){
        $string.="<input type=submit name=$inputs[$i][1] value=\"$inputs[$i][2]\">";
      }
    }
!   $string=$string."</form>";
  }
  
--- 740,767 ----
      if ($inputs[$i][0] eq 'hidden'){
        $string=$string."<input type=hidden name=$inputs[$i][1] value=\"$inputs[$i][2]\">\n";
+ 				# FIXME - .=
      }
      if ($inputs[$i][0] eq 'radio') {
        $string.="<input type=radio name=$inputs[1] value=$inputs[$i][2]>$inputs[$i][2]";
+ 				# FIXME - .=
      }
      if ($inputs[$i][0] eq 'text') {
        $string.="<input type=$inputs[$i][0] name=$inputs[$i][1] value=\"$inputs[$i][2]\">";
+ 				# FIXME - .=
      }
      if ($inputs[$i][0] eq 'textarea') {
          $string.="<textarea name=$inputs[$i][1] wrap=physical cols=40 rows=4>$inputs[$i][2]</textarea>";
+ 				# FIXME - .=
      }
      if ($inputs[$i][0] eq 'reset'){
        $string.="<input type=reset name=$inputs[$i][1] value=\"$inputs[$i][2]\">";
+ 				# FIXME - .=
      }
      if ($inputs[$i][0] eq 'submit'){
        $string.="<input type=submit name=$inputs[$i][1] value=\"$inputs[$i][2]\">";
+ 				# FIXME - .=
      }
    }
!   $string=$string."</form>";	# FIXME - .=
  }
  
***************
*** 834,838 ****
  sub mkform2{
      # FIXME
!     # no POD and no tests yet.  Once tests are written,
      # this function can be cleaned up with the following steps:
      #  turn the while loop into a foreach loop
--- 842,846 ----
  sub mkform2{
      # FIXME
!     # No tests yet.  Once tests are written,
      # this function can be cleaned up with the following steps:
      #  turn the while loop into a foreach loop
***************
*** 842,846 ****
    my ($action,%inputs)=@_;
    my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();
    my $key;
    my @order;
--- 850,854 ----
    my ($action,%inputs)=@_;
    my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();		# FIXME - .=
    my $key;
    my @order;
***************
*** 852,855 ****
--- 860,864 ----
      if ($data[0] eq 'hidden'){
        $string=$string."<input type=hidden name=$key value=\"$data[1]\">\n";
+ 					# FIXME - .=
      } else {
        my $text;
***************
*** 876,898 ****
         	while ($data[$i] ne "") {
  	  my $val = $data[$i+1];
!        	  $text = $text."<option value=\"$data[$i]\"";
  	  if ($data[$i] eq $sel) {
! 	     $text = $text." selected";
  	  }
!           $text = $text.">$val";
! 	  $i = $i+2;
  	}
! 	$text=$text."</select>";
        }
        if ($reqd eq "R") {
!         $ltext = $ltext." (Req)";
  	}
        $order[$posn] =mktablerow(2,'white',$ltext,$text);
      }
    }
!   $string=$string.join("\n", at order);
    $string=$string.mktablerow(2,'white','<input type=submit>','<input type=reset>');
!   $string=$string.mktableft;
!   $string=$string."</form>";
  }
  
--- 885,908 ----
         	while ($data[$i] ne "") {
  	  my $val = $data[$i+1];
!        	  $text = $text."<option value=\"$data[$i]\"";	# FIXME - .=
  	  if ($data[$i] eq $sel) {
! 	     $text = $text." selected";			# FIXME - .=
  	  }
!           $text = $text.">$val";			# FIXME - .=
! 	  $i = $i+2;					# FIXME - +=
  	}
! 	$text=$text."</select>";			# FIXME - .=
        }
        if ($reqd eq "R") {
!         $ltext = $ltext." (Req)";			# FIXME - .=
  	}
        $order[$posn] =mktablerow(2,'white',$ltext,$text);
      }
    }
!   $string=$string.join("\n", at order);			# FIXME - .=
    $string=$string.mktablerow(2,'white','<input type=submit>','<input type=reset>');
! 							# FIXME - .=
!   $string=$string.mktableft;				# FIXME - .=
!   $string=$string."</form>";				# FIXME - .=
  }
  





More information about the Koha-cvs mailing list