[Koha-cvs] CVS: koha Install.pm,1.1.2.14,1.1.2.15 buildrelease,1.1.2.20,1.1.2.21 installer.pl,1.2.2.64,1.2.2.65 koha.upgrade,1.1.2.18,1.1.2.19 kohareporter,1.1.2.1,1.1.2.2

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        Install.pm buildrelease installer.pl koha.upgrade kohareporter 
Log Message:
Call kohareporter from installer.pl and koha.upgrade


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -r1.1.2.14 -r1.1.2.15
*** Install.pm  16 Aug 2002 21:02:09 -0000      1.1.2.14
--- Install.pm  3 Sep 2002 21:59:48 -0000       1.1.2.15
***************
*** 116,119 ****
--- 116,120 ----
  %s
  |;
+ 
  $messages->{'AllPerlModulesInstalled'}->{en}=qq|
  
***************
*** 207,211 ****
  
  sub releasecandidatewarning {
!     my $message=getmessage('ReleaseCandidateWarning', [$::kohaversion, 
$::kohaversion]);
      my $answer=showmessage($message, 'yn', 'n');
  
--- 208,212 ----
  
  sub releasecandidatewarning {
!     my $message=getmessage('ReleaseCandidateWarning', [$::newversion, 
$::newversion]);
      my $answer=showmessage($message, 'yn', 'n');
  
***************
*** 264,269 ****
--- 265,301 ----
  
  
+     unless (-x "/usr/bin/perl") {
+       my $realperl=`which perl`;
+       chomp $realperl;
+       $realperl = showmessage(getmessage('NoUsrBinPerl'), 'none');
+       until (-x $realperl) {
+           $realperl=showmessage(getmessage('AskLocationOfPerlExecutable', 
$realperl), 'free', $realperl, 1);
+       }
+       my $response=showmessage(getmessage('ConfirmPerlExecutableSymlink', 
$realperl), 'yn', 'y', 1);
+       unless ($response eq 'n') {
+           system("ln -s $realperl /usr/bin/perl");
+       }
+     }
+ 
+ 
  }
  
+ $messages->{'NoUsrBinPerl'}->{en}=qq|
+ 
+ ========================================
+ = Perl is not located in /usr/bin/perl =
+ ========================================
+ 
+ The Koha perl scripts expect to find the perl executable in the /usr/bin
+ directory.  It is not there on your system.
+ 
+ |;
+ 
+ $messages->{'AskLocationOfPerlExecutable'}->{en}=qq|Location of Perl 
Executable: [%s]: |;
+ $messages->{'ConfirmPerlExecutableSymlink'}->{en}=qq|
+ The Koha scripts will _not_ work without a symlink from %s to /usr/bin/perl
+ 
+ May I create this symlink? ([Y]/N): 
+ : |;
  
  sub getmessage {

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -C2 -r1.1.2.20 -r1.1.2.21
*** buildrelease        16 Aug 2002 20:53:23 -0000      1.1.2.20
--- buildrelease        3 Sep 2002 21:59:48 -0000       1.1.2.21
***************
*** 225,228 ****
--- 225,229 ----
  system("mv $rootdir/intranet-cgi/koha.upgrade $rootdir"); 
  system("mv $rootdir/intranet-cgi/Install.pm $rootdir"); 
+ system("mv $rootdir/intranet-cgi/kohareporter $rootdir"); 
  chmod 0770, "$rootdir/installer.pl";
  chmod 0770, "$rootdir/koha.upgrade";

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.64
retrieving revision 1.2.2.65
diff -C2 -r1.2.2.64 -r1.2.2.65
*** installer.pl        25 Jul 2002 18:07:32 -0000      1.2.2.64
--- installer.pl        3 Sep 2002 21:59:48 -0000       1.2.2.65
***************
*** 95,96 ****
--- 95,103 ----
  
  
+ 
+ 
+ my $reply=showmessage('Would you like to complete a survey about your 
library?', 'yn', 'y');
+ if ($reply=~/y/i) {
+     system("perl kohareporter");
+ }
+ 

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -C2 -r1.1.2.18 -r1.1.2.19
*** koha.upgrade        30 Aug 2002 16:30:10 -0000      1.1.2.18
--- koha.upgrade        3 Sep 2002 21:59:48 -0000       1.1.2.19
***************
*** 454,455 ****
--- 454,461 ----
  Please report any problems you encounter through http://bugs.koha.org/
  |;
+ 
+ 
+ my $reply=showmessage('Would you like to complete a survey about your 
library?', 'yn', 'y');
+ if ($reply=~/y/i) {
+     system("perl kohareporter");
+ }

Index: kohareporter
===================================================================
RCS file: /cvsroot/koha/koha/Attic/kohareporter,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** kohareporter        3 Sep 2002 21:17:51 -0000       1.1.2.1
--- kohareporter        3 Sep 2002 21:59:48 -0000       1.1.2.2
***************
*** 37,41 ****
  ============================
  
! Feel free to skip any questions that you do not want to answer,
  
  
--- 37,44 ----
  ============================
  
! Feel free to skip any questions that you do not want to answer.
! 
! There will be a comments section at the end if you would like to provide
! additional information that does not fit within these questions.
  
  
***************
*** 63,66 ****
--- 66,71 ----
  print "\n\nAdditional Comments: [leave two blank lines to end]\n";
  
+ 
+ 
  my $additionalcomments='%0D%0D';
  my $lastlineblank=0;
***************
*** 80,83 ****
--- 85,104 ----
  $params.="&AdditionalComments=$additionalcomments";
  
+ print "\n\n";
+ print qq|
+ ====================
+ = Survey Completed =
+ ====================
+ 
+ Thank you for completing our survey.  We will now connect to a web server on
+ $host to transfer your responses.
+ 
+ Do you wish to continue submitting your survey results ([Y]/N)?  |;
+ my $reply=<STDIN>;
+ if ($reply=~/n/i) {
+     print "Aborting survey submission...\n";
+     sleep 3;
+     exit;
+ }