- Koha-devel - lists.koha-community.org

CVS: koha format.t,NONE,1.1.2.1 testKoha.pl,1.1.2.3,1.1.2.4
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv31657 Modified Files: Tag: rel-1-2 testKoha.pl Added Files: Tag: rel-1-2 format.t Log Message: started adding tests for C4::Format --- NEW FILE --- BEGIN { $| = 1; print "1..5\n"; } END {print "not ok 1\n" unless $loaded;} use C4::Format; $loaded = 1; print "ok 1\n"; # # ensure &startint returns a reasonable value # # try right formatting if (" foo" eq fmtstr('','foo','R5')) { print "ok 2\n"; } else { print "not ok 2\n"; } # try left formatting if ("foo " eq fmtstr('','foo','L5')) { print "ok 3\n"; } else { print "not ok 3\n"; } # try centering with even spacing if (" foo " eq fmtstr('','foo','C5')) { print "ok 4\n"; } else { print "not ok 4\n"; } # try centering with uneven spacing if ("foo " eq fmtstr('','foo','C4')) { print "ok 5\n"; } else { print "not ok 5\n"; } Index: testKoha.pl =================================================================== RCS file: /cvsroot/koha/koha/testKoha.pl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** testKoha.pl 25 Apr 2002 16:11:50 -0000 1.1.2.3 --- testKoha.pl 25 Apr 2002 21:51:09 -0000 1.1.2.4 *************** *** 5,8 **** # please add many tests here ! runtests ('koha.t', 'output.t'); --- 5,8 ---- # please add many tests here ! runtests ('koha.t', 'output.t', 'format.t');

1 0

Re: koha
by Pat Eyler 25 Apr '02

25 Apr '02

I'm responding to the koha-devel list as well to ensure that the people most involved with the things Sergey's touched on hear his comments. On Thu, 25 Apr 2002, Sergey A Yanovitsky wrote: > Hello Pat, > > Monday, April 22, 2002, 11:26:37 PM, you wrote: > > PE> Hi Jah, > hi > PE> thought I'd check in and see what your thoughts were on koha. Let me know > PE> what you (and the others working with you) think, okay? > > It's a nice system. You guys did lots of work there. :)) > > But it seems that it is growing without particular plan. Database > sources are just dump from someone's (maybe your leader's) working DB > and they really need normalization. It would be nice to make a diagram, > that represents your database. Something like the one that i attached > to this letter (i made it in Graphviz). I know that some people are looking into the DB. I don't know what their plans are, so I can't really comment on them. > There is also no unified api for working with web forms. And it > seems that it would be hard to extend your system :( I think you should > look at something like Mason. I agree, some kind of templating, and an overall shift to a separation of logic and presentation makes sense > Or, if you plan to shift to ruby > -- mod_ruby+eRuby. I think I'm the only rubyist working on koha, so I doubt a shift to ruby is in the works. > My expirience says that php will not help here. > It's too messy for such a big project. agreed > > Unfortunately i can't say more by now. Too much work :( I asked my > teammates to look at Koha. Later i'll send their opinions to you. Please inlcude the koha-devel list, I'm afraid I'd step on information when I tried to pass it along and I'm sure the other folks working on koha would appreciate seeing them. > Also i'd like to speak with the guy/gal who wrote Koha's databases. I'm not sure who it is, but he/she should be here on the devel list. > > -pate

2 1

CVS: koha/C4 Output.pm,1.6.2.6,1.6.2.7
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv25430 Modified Files: Tag: rel-1-2 Output.pm Log Message: refactored &mkformnotable to use foreach and ifels instead of while and many ifs Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -C2 -r1.6.2.6 -r1.6.2.7 *** Output.pm 25 Apr 2002 19:45:46 -0000 1.6.2.6 --- Output.pm 25 Apr 2002 20:16:50 -0000 1.6.2.7 *************** *** 267,289 **** my ($action,@inputs)=@_; my $string="<form action=$action method=post>\n"; ! my $count=@inputs; ! for (my $i=0; $i<$count; $i++){ ! 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[$i][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]\">"; } } --- 267,290 ---- my ($action,@inputs)=@_; my $string="<form action=$action method=post>\n"; ! foreach my $input (@inputs){ ! if ($$input[0] eq 'hidden'){ ! $string .= ! "<input type=hidden name=$$input[1] value=\"$$input[2]\">\n"; ! } elsif ($$input[0] eq 'radio') { ! $string .= ! "<input type=radio name=$$input[1] value=$$input[2]>$$input[2]"; ! } elsif ($$input[0] eq 'text') { ! $string .= ! "<input type=$$input[0] name=$$input[1] value=\"$$input[2]\">"; ! } elsif ($$input[0] eq 'textarea') { ! $string .= ! "<textarea name=$$input[1] wrap=physical cols=40 rows=4>"; ! $string .= ! "$$input[2]</textarea>"; ! } elsif ($$input[0] eq 'reset'){ ! $string .= ! "<input type=reset name=$$input[1] value=\"$$input[2]\">"; ! } elsif ($$input[0] eq 'submit'){ ! $string.="<input type=submit name=$$input[1] value=\"$$input[2]\">"; } }

1 0

CVS: koha output.t,1.1.2.3,1.1.2.4
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv24789 Modified Files: Tag: rel-1-2 output.t Log Message: more tests, &mkformnotable has reasonable coverage now Index: output.t =================================================================== RCS file: /cvsroot/koha/koha/Attic/output.t,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** output.t 25 Apr 2002 19:45:01 -0000 1.1.2.3 --- output.t 25 Apr 2002 20:15:32 -0000 1.1.2.4 *************** *** 1,3 **** ! BEGIN { $| = 1; print "1..20\n"; } END {print "not ok 1\n" unless $loaded;} use C4::Output; --- 1,3 ---- ! BEGIN { $| = 1; print "1..25\n"; } END {print "not ok 1\n" unless $loaded;} use C4::Output; *************** *** 172,178 **** @inputRadio = qw(radio radioname radiovalue); @inputText = qw(text textname textvalue); ! #@inputTextarea = qw(textarea testareaname textareavalue); ! #@inputSubmit = qw(submit submitname submitvalue); ! #@inputReset = qw(reset resetname resetvalue); # 1 input; hidden --- 172,178 ---- @inputRadio = qw(radio radioname radiovalue); @inputText = qw(text textname textvalue); ! @inputTextarea = qw(textarea textareaname textareavalue); ! @inputSubmit = qw(submit submitname submitvalue); ! @inputReset = qw(reset resetname resetvalue); # 1 input; hidden *************** *** 214,223 **** # 1 input; textarea ! # 1 input; reset # 1 input; submit # 2 inputs; hidden and submit - # 3 inputs; text, reset, and submit --- 214,282 ---- # 1 input; textarea + @inputs = (\@inputTextarea); + $return = "<form action=actionurl method=post>\n"; + $return .= "<textarea name=textareaname wrap=physical cols=40 rows=4>textareavalue</textarea>"; + $return .= "</form>"; ! if ($return eq mkformnotable('actionurl', @inputs)) { ! print "ok 21\n"; ! } else { ! print "not ok 21\n"; ! } # 1 input; submit + @inputs = (\@inputSubmit); + $return = "<form action=actionurl method=post>\n"; + $return .= "<input type=submit name=submitname value=\"submitvalue\">"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 22\n"; + } else { + print "not ok 22\n"; + } + + # 1 input; reset + @inputs = (\@inputReset); + $return = "<form action=actionurl method=post>\n"; + $return .= "<input type=reset name=resetname value=\"resetvalue\">"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 23\n"; + } else { + print "not ok 23\n"; + } # 2 inputs; hidden and submit + @inputs = (\@inputHidden, \@inputSubmit); + $return = "<form action=actionurl method=post>\n"; + $return .= "<input type=hidden name=hiddenname value=\"hiddenvalue\">\n"; + $return .= "<input type=submit name=submitname value=\"submitvalue\">"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 24\n"; + } else { + print "not ok 24\n"; + } + + + # 3 inputs; text, submit, and reset + @inputs = (\@inputText, \@inputSubmit, \@inputReset); + $return = "<form action=actionurl method=post>\n"; + $return .= "<input type=text name=textname value=\"textvalue\">"; + $return .= "<input type=submit name=submitname value=\"submitvalue\">"; + $return .= "<input type=reset name=resetname value=\"resetvalue\">"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 25\n"; + } else { + print "not ok 25\n"; + } + + + +

1 0

CVS: koha ChangeLog,1.1.2.2,1.1.2.3
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv10989 Modified Files: Tag: rel-1-2 ChangeLog Log Message: found (and fixed) an error in &mkformnotable while adding tests Index: ChangeLog =================================================================== RCS file: /cvsroot/koha/koha/ChangeLog,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** ChangeLog 25 Apr 2002 16:15:52 -0000 1.1.2.2 --- ChangeLog 25 Apr 2002 19:47:05 -0000 1.1.2.3 *************** *** 5,9 **** * C4/Output.pm: added prototyping where possible, cleaned up some ! compiler warnings 2002-04-25 06:57 pate --- 5,10 ---- * C4/Output.pm: added prototyping where possible, cleaned up some ! compiler warnings, found and fixed an error in mkformnotable while ! adding tests 2002-04-25 06:57 pate

1 0

CVS: koha/C4 Output.pm,1.6.2.5,1.6.2.6
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv10386 Modified Files: Tag: rel-1-2 Output.pm Log Message: found (and fixed) an error in &mkformnotable while adding tests Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.6.2.5 retrieving revision 1.6.2.6 diff -C2 -r1.6.2.5 -r1.6.2.6 *** Output.pm 25 Apr 2002 17:33:16 -0000 1.6.2.5 --- Output.pm 25 Apr 2002 19:45:46 -0000 1.6.2.6 *************** *** 273,277 **** } 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') { --- 273,277 ---- } if ($inputs[$i][0] eq 'radio') { ! $string.="<input type=radio name=$inputs[$i][1] value=$inputs[$i][2]>$inputs[$i][2]"; } if ($inputs[$i][0] eq 'text') { *************** *** 292,295 **** --- 292,302 ---- 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 + # pull the nested if,elsif structure back up to the main level + # pull the code for the different kinds of inputs into separate + # functions my ($action,%inputs)=@_; my $string="<form action=$action method=post>\n"; *************** *** 349,352 **** --- 356,368 ---- } + =pod + + =head2 &endpage + + &endpage does not expect any arguments, it returns the string: + </body></html>\n + + =cut + sub endpage() { *************** *** 354,357 **** --- 370,385 ---- } + =pod + + =head2 &mklink + + &mklink expects two arguments, the url to link to and the text of the link. + It returns this string: + <a href="$url">$text</a> + where $url is the first argument and $text is the second. + + =cut + + sub mklink($$) { my ($url,$text)=@_; *************** *** 360,377 **** } sub mkheadr { my ($type,$text)=@_; my $string; if ($type eq '1'){ ! $string="<FONT SIZE=6><em>$text</em></FONT><br>"; } ! if ($type eq '2'){ ! $string="<FONT SIZE=6><em>$text</em></FONT>"; ! } ! if ($type eq '3'){ ! $string="<FONT SIZE=6><em>$text</em></FONT><p>"; ! } ! return ($string); } sub center() { --- 388,441 ---- } + =pod + + =head2 &mkheadr + + &mkeadr expects two strings, a type and the text to use in the header. + types are: + + =over + + =item 1 ends with <br> + + =item 2 no special ending tag + + =item 3 ends with <p> + + =back + + Other than this, the return value is the same: + <FONT SIZE=6><em>$text</em></FONT>$string + Where $test is the text passed in and $string is the tag generated from + the type value. + + =cut + + sub mkheadr { + # FIXME + # would it be better to make this more generic by accepting an optional + # argument with a closing tag instead of a numeric type? + my ($type,$text)=@_; my $string; if ($type eq '1'){ ! $string="<br>"; ! } elsif ($type eq '3') { ! $string="<p>"; ! } else { ! $string=""; } ! return ("<FONT SIZE=6><em>$text</em></FONT>$string"); } + + =pod + + =head2 &center and &endcenter + + &center and &endcenter take no arguments and return html tags <CENTER> and + </CENTER> respectivley. + + =cut sub center() {

1 0

CVS: koha output.t,1.1.2.2,1.1.2.3
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv10049 Modified Files: Tag: rel-1-2 output.t Log Message: more tests Index: output.t =================================================================== RCS file: /cvsroot/koha/koha/Attic/output.t,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** output.t 25 Apr 2002 16:11:50 -0000 1.1.2.2 --- output.t 25 Apr 2002 19:45:01 -0000 1.1.2.3 *************** *** 1,3 **** ! BEGIN { $| = 1; print "1..17\n"; } END {print "not ok 1\n" unless $loaded;} use C4::Output; --- 1,3 ---- ! BEGIN { $| = 1; print "1..20\n"; } END {print "not ok 1\n" unless $loaded;} use C4::Output; *************** *** 93,100 **** # - # skipping mkformnotable for now - # - - # # skipping mkform2 for now # --- 93,96 ---- *************** *** 168,169 **** --- 164,223 ---- print "not ok\n"; } + + # + # ensure &mkformnotable returns a valid value + # + + @inputHidden = qw(hidden hiddenname hiddenvalue); + @inputRadio = qw(radio radioname radiovalue); + @inputText = qw(text textname textvalue); + #@inputTextarea = qw(textarea testareaname textareavalue); + #@inputSubmit = qw(submit submitname submitvalue); + #@inputReset = qw(reset resetname resetvalue); + + # 1 input; hidden + @inputs = (\@inputHidden); + $return ="<form action=actionurl method=post>\n"; + $return .= "<input type=hidden name=hiddenname value=\"hiddenvalue\">\n"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 18\n"; + } else { + print "not ok 18\n"; + } + + # 1 input; radio + @inputs = (\@inputRadio); + $return ="<form action=actionurl method=post>\n"; + $return .= "<input type=radio name=radioname value=radiovalue>radiovalue"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 19\n"; + } else { + print "not ok 19\n"; + } + + # 1 input; text + @inputs = (\@inputText); + $return = "<form action=actionurl method=post>\n"; + $return .= "<input type=text name=textname value=\"textvalue\">"; + $return .= "</form>"; + + if ($return eq mkformnotable('actionurl', @inputs)) { + print "ok 20\n"; + } else { + print "not ok 20\n"; + } + + + # 1 input; textarea + + # 1 input; reset + + # 1 input; submit + + # 2 inputs; hidden and submit + + # 3 inputs; text, reset, and submit

1 0

CVS: koha/C4 Output.pm,1.6.2.4,1.6.2.5
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv16993 Modified Files: Tag: rel-1-2 Output.pm Log Message: oops, forgot extra linefeeds in pod section Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -C2 -r1.6.2.4 -r1.6.2.5 *** Output.pm 25 Apr 2002 17:30:03 -0000 1.6.2.4 --- Output.pm 25 Apr 2002 17:33:16 -0000 1.6.2.5 *************** *** 384,390 **** =pod =head2 &bold ! &bold requires that a single string be passed in by the caller. &bold ! will return "<b>$text</b>" where $text is the string passed in. =cut --- 384,393 ---- =pod + =head2 &bold ! ! &bold requires that a single string be passed in by the caller. &bold ! will return "<b>$text</b>" where $text is the string passed in. ! =cut

1 0

CVS: koha/C4 Output.pm,1.6.2.3,1.6.2.4
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv15969 Modified Files: Tag: rel-1-2 Output.pm Log Message: added a simple POD style comment to &bold to show how it can be done. Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** Output.pm 25 Apr 2002 16:12:45 -0000 1.6.2.3 --- Output.pm 25 Apr 2002 17:30:03 -0000 1.6.2.4 *************** *** 383,390 **** } sub bold($) { ! my ($text)=@_; ! my $string="<b>$text</b>"; ! return($string); } --- 383,395 ---- } + =pod + =head2 &bold + &bold requires that a single string be passed in by the caller. &bold + will return "<b>$text</b>" where $text is the string passed in. + =cut + sub bold($) { ! my ($text)=shift; ! return("<b>$text</b>"); }

1 0

CVS: koha/C4 Output.pm,1.6.2.2,1.6.2.3
by Pat Eyler 25 Apr '02

25 Apr '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv20078 Modified Files: Tag: rel-1-2 Output.pm Log Message: more prototypes in Output.pm Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -r1.6.2.2 -r1.6.2.3 *** Output.pm 25 Apr 2002 15:51:33 -0000 1.6.2.2 --- Output.pm 25 Apr 2002 16:12:45 -0000 1.6.2.3 *************** *** 163,167 **** } ! sub mktableft { return("</table>\n"); } --- 163,167 ---- } ! sub mktableft() { return("</table>\n"); } *************** *** 350,358 **** ! sub endpage{ return("</body></html>\n"); } ! sub mklink { my ($url,$text)=@_; my $string="<a href=\"$url\">$text</a>"; --- 350,358 ---- ! sub endpage() { return("</body></html>\n"); } ! sub mklink($$) { my ($url,$text)=@_; my $string="<a href=\"$url\">$text</a>"; *************** *** 375,387 **** } ! sub center { return ("<CENTER>\n"); } ! sub endcenter { return ("</CENTER>\n"); } ! sub bold { my ($text)=@_; my $string="<b>$text</b>"; --- 375,387 ---- } ! sub center() { return ("<CENTER>\n"); } ! sub endcenter() { return ("</CENTER>\n"); } ! sub bold($) { my ($text)=@_; my $string="<b>$text</b>";

1 0