Changeset 483


Ignore:
Timestamp:
11/09/08 14:58:26 (3 years ago)
Author:
RobManson
Message:

Item38: Fixed up a load of legacy package/namespace issues so I could install it so I could test the changes I made to remove the backticks and replace them with ->sysCommand(). There's still an issue in TWikiReleaseTrackerPlugin.pm:137-139 with the Content-type. If you take this line out then twiki/bin/view/TWiki/TRTChangesFromDistribution gets sent as plain/text.

Location:
trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin.pm

    r336 r483  
    5858 my $ans = untaint( $cgiQuery->param($paramName) ); 
    5959 
    60  #    writeDebug("$inlineParamString\n1: $paramName = $ans"); 
    6160 if ( $ans eq "" ) { 
    6261  $ans = TWiki::Func::extractNameValuePair( $inlineParamString, $paramName ); 
    63  } 
    64  
    65  #    writeDebug("2: $paramName = $ans"); 
    66  if ( $ans eq "" ) { 
    6762  $ans = TWiki::Func::getPreferencesValue("\U$pluginName\E_\U$paramName\E"); 
    68  } 
    69  
    70  #    writeDebug("$paramName = $ans"); 
    71  # Circumstances sometimes that getPreferencesValue returns a CR, breaking the table definitions. 
    72  # Arguably a bug in TWiki::Func::getPreferencesValue (Codev.GetPreferencesValueReturnsNL) 
    73  $ans =~ s/\n//; 
     63 } else { 
     64  #    writeDebug("$paramName = $ans"); 
     65  # Circumstances sometimes that getPreferencesValue returns a CR, breaking the table definitions. 
     66  # Arguably a bug in TWiki::Func::getPreferencesValue (Codev.GetPreferencesValueReturnsNL) 
     67  $ans =~ s/\n//; 
     68 } 
    7469 return $ans; 
    7570} 
    … …  
    8984 my $compareFromDistribution = getParam( $param, 'from' ) 
    9085   || 'localInstallation'; 
    91  Common::setIndexTopic( getParam( $param, 'indexTopic' ) 
     86 TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::setIndexTopic( getParam( $param, 'indexTopic' ) 
    9287    || 'TWiki.TWikiReleaseTrackerPlugin' ); 
    9388 
    … …  
    132127 } 
    133128 elsif ( $modeParam eq 'indexLocalInstallation' ) { 
    134   $ans .= "<pre>" . IndexDistributions::indexLocalInstallation() . "</pre>"; 
     129  $ans .= "<pre>" . TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexLocalInstallation() . "</pre>"; 
    135130  $ans .= browserCallback( "Back to listing", 'mode' => 'listing' ); 
    136131 } 
    … …  
    140135   @distributions ); 
    141136 } 
     137 # SMELL: Not sure where but the Content-type headers are getting messed up 
     138 #        MartinCleaver, maybe you can fix up this part 
     139 print "Content-type: text/html\n\n"; 
    142140 return $ans; 
    143141} 
    … …  
    187185 if ( $param =~ m/distributions/ ) { 
    188186  return formatList( $format, $separator, $selection, $marker, 
    189    sort &FileDigest::getDistributions ); 
     187   sort &TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::getDistributions ); 
    190188 } 
    191189 elsif ( $param =~ m/filenames/ ) { 
    … …  
    290288 # then unmentionedDistributions = (C); 
    291289 my @mentionedDistributions = sort @distributions, $compareToDistribution; 
    292  my @allDistributions = FileDigest::retreiveDistributionsForFilename($file); 
     290 my @allDistributions = TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveDistributionsForFilename($file); 
    293291 my @remainingDistributions = sort @allDistributions; 
    294292 
    … …  
    415413 loadIndexes(); 
    416414 
    417  return "<pre>" . FileDigest::dataOutline() . "</pre>"; 
     415 return "<pre>" . TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::dataOutline() . "</pre>"; 
    418416} 
    419417 
    … …  
    439437 
    440438  my @distributionsWithDigest = 
    441     FileDigest::retreiveDistributionsForDigest( $digest, $relativeFile ); 
     439    TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveDistributionsForDigest( $digest, $relativeFile ); 
    442440  @distributionsWithDigest = 
    443441    grep { !/$compareToDistribution/ } 
    … …  
    445443 
    446444  my @allDistributionsForFilename = 
    447     FileDigest::retreiveDistributionsForFilename($relativeFile); 
     445    TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveDistributionsForFilename($relativeFile); 
    448446  @allDistributionsForFilename = 
    449447    grep { !/$compareToDistribution/ } 
    … …  
    529527 #                           $Common::excludeFilePattern, 
    530528 #                           $matchCallback); 
    531  my $countMatches = DistributionWalker::match( 
     529 my $countMatches = TWiki::Plugins::TWikiReleaseTrackerPlugin::DistributionWalker::match( 
    532530  $compareToDistribution,      $Common::installationDir, 
    533531  $Common::excludeFilePattern, $matchCallback 
    … …  
    537535  foreach my $dist ( @distributions, $compareToDistribution ) { 
    538536   my $numberEntries = 
    539      scalar( FileDigest::retreiveOccurancesForDistribution($dist) ); 
     537     scalar( TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveOccurancesForDistribution($dist) ); 
    540538   $ans .= "<LI> Distribution $dist has " . $numberEntries . " entries\n"; 
    541539   if ( $dist eq "localInstallation" ) { 
    … …  
    601599 my ($param) = @_; 
    602600 return "" unless ( defined $param ); 
    603  $param =~ s/$TWiki::securityFilter//go; 
     601 #SMELL: $TWiki::securityFilter doesn't seem to exist anywhere! 
     602 #$param =~ s/$TWiki::securityFilter//go; 
    604603 $param =~ /(.*)/; 
    605604 return $1; 
    … …  
    700699 writeDebug("Loading from $Common::md5IndexDir"); 
    701700 eval { 
    702   FileDigest::emptyIndexes(); 
    703   FileDigest::loadIndexes($Common::md5IndexDir); 
     701  TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::emptyIndexes(); 
     702  TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::loadIndexes($Common::md5IndexDir); 
    704703 }; 
    705704 writeDebug($@) if ($@); 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/Commands.pm

    r336 r483  
    7171 
    7272 
    73 use FileDigest; 
    74 use TRTConfig; 
     73use TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest; 
     74use TWiki::Plugins::TWikiReleaseTrackerPlugin::TRTConfig; 
    7575 
    7676use TWiki; 
    … …  
    8686 
    8787sub loadIndexes { 
    88     FileDigest::loadIndexes("pub/TWiki/TWikiReleaseTrackerPlugin"); 
     88    TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::loadIndexes("pub/TWiki/TWikiReleaseTrackerPlugin"); 
    8989} 
    9090 
    … …  
    236236  unlink $filename; 
    237237  my $cmd = "zip ".$filename." ".join(" ", @files); 
    238   my $ans = `$cmd`; 
     238  #my $ans = `$cmd`; 
     239  my ($ans) = $sandbox->sysCommand($cmd); 
    239240  printIfVerbose($config, "$cmd:\n ".$ans); 
    240241  printIfVerbose($config, "File saved as ".$filename); 
    … …  
    324325  my $command = join(" ", @_); 
    325326    
    326   my $ans = `$command`; 
     327  #my $ans = `$command`; 
     328  my ($ans) = $sandbox->sysCommand($command); 
    327329  print $ans; 
    328330 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/Common.pm

    r336 r483  
    44 
    55 
    6 package Common; 
    7 use TRTConfig; 
     6package TWiki::Plugins::TWikiReleaseTrackerPlugin::Common; 
     7use TWiki::Plugins::TWikiReleaseTrackerPlugin::TRTConfig; 
    88use Cwd; 
    99 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/DistributionWalker.pm

    r336 r483  
    44use Digest::MD5; 
    55use FileHandle; 
    6 use IndexDistributions; 
    7 use FileDigest; 
    8 use Common; 
     6use TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions; 
     7use TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest; 
     8use TWiki::Plugins::TWikiReleaseTrackerPlugin::Common; 
    99 
    10 package DistributionWalker; 
     10package TWiki::Plugins::TWikiReleaseTrackerPlugin::DistributionWalker; 
    1111 
    1212sub match { 
    … …  
    5353    }; 
    5454 
    55     my @occurances = FileDigest::retreiveOccurancesForDistribution($distribution); 
     55    my @occurances = TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveOccurancesForDistribution($distribution); 
    5656    foreach my $occurance (@occurances) { 
    5757        my ($filename, $digest) = @{$occurance}; 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/FileDigest.pm

    r336 r483  
    44use Digest::MD5; 
    55use FileHandle; 
    6 use Common; 
    7  
    8 package FileDigest; 
     6use TWiki::Plugins::TWikiReleaseTrackerPlugin::Common; 
     7 
     8package TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest; 
    99=pod 
    1010 
    … …  
    197197    my $dh = DirHandle->new($dir) || die "$! - $dir"; 
    198198 
    199     Common::debug "loading indexes from $dir:\n\n"; 
     199    TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "loading indexes from $dir:\n\n"; 
    200200    foreach my $index (sort grep { /.md5$/ } $dh -> read()) { 
    201201        loadIndex($dir."/".$index); 
    … …  
    205205sub loadIndex { 
    206206    my ($filename) = @_; 
    207     Common::debug "loading index $filename\n"; 
     207    TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "loading index $filename\n"; 
    208208    my $fh = new FileHandle $filename, "r"; 
    209209    unless (defined $fh) { 
    … …  
    214214    while (my $line = <$fh>) { 
    215215        chomp $line; 
    216         Common::debug "$line\n"; 
     216        TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "$line\n"; 
    217217 
    218218        next if ($line eq ""); 
    … …  
    220220        my ($digest, $distributionfile) = split /\s+/, $line; 
    221221        my ($distribution, $file) = split /=/, $distributionfile; 
    222         Common::debug "$distribution, $file, $digest \n"; 
     222        TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "$distribution, $file, $digest \n"; 
    223223        addOccurance($distribution, $file, $digest); 
    224224    } 
    … …  
    232232        die "$! - $filename"; 
    233233    }; 
    234     Common::debug "Saving to $filename\n"; 
     234    TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "Saving to $filename\n"; 
    235235    foreach my $digest (keys %digestToOccurances) { 
    236236        my @occurances = retreiveOccurancesForDigest($digest); 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/IndexDistributions.pm

    r336 r483  
    33use strict; 
    44use FileHandle; 
    5 use FileDigest; 
    6 use Common; 
     5use TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest; 
     6use TWiki::Plugins::TWikiReleaseTrackerPlugin::Common; 
    77 
    88# TODO: split out the generic from the TWiki-specific parts of this. 
    9 package IndexDistributions; 
     9package TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions; 
    1010 
    1111sub indexDistribution { 
    … …  
    2424 my $findCallback = sub { 
    2525  my $pathname = $File::Find::name;    #  complete pathname to the file. 
    26   Common::debug "$pathname\n"; 
     26  TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "$pathname\n"; 
    2727  my $relativePath = 
    28     Common::relativeFromPathname( $pathname, $distributionLocation ); 
     28    TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::relativeFromPathname( $pathname, $distributionLocation ); 
    2929  return unless includeInResults($relativePath); 
    3030  return unless -f $pathname; 
    3131  return if -z $pathname; 
    32   Common::debug "$pathname\n"; 
     32  TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug "$pathname\n"; 
    3333  indexFile( $distribution, $distributionLocation, $pathname, $pathPrefix, 
    3434   $relativePath ); 
    … …  
    5151   = @_; 
    5252 my $digest = digestForFile($file); 
    53  Common::debug $relativePath. " = " . $digest . "\n"; 
    54  FileDigest::addOccurance( $distribution, $pathPrefix . $relativePath, 
     53 TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::debug $relativePath. " = " . $digest . "\n"; 
     54 TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::addOccurance( $distribution, $pathPrefix . $relativePath, 
    5555  $digest ); 
    5656} 
    … …  
    102102 my $ans; 
    103103 ensureInstallationDir(); 
    104  FileDigest::emptyIndexes(); 
     104 TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::emptyIndexes(); 
    105105 $ans .=  "Indexing localInstallation '$Common::installationDir'\n"; 
    106  IndexDistributions::indexDistribution( "localInstallation",  
     106 TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexDistribution( "localInstallation",  
    107107                                        $Common::installationDir, $Common::excludeFilePattern, 
    108108                                        "twiki"); 
    … …  
    115115sub indexLocalEmptyDistribution { 
    116116    my $ans; 
    117     FileDigest::emptyIndexes(); 
     117    TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::emptyIndexes(); 
    118118    $ans .=  "Emptying localInstallation\n"; 
    119119    $ans .= saveIndex("localInstallation.md5"); 
    … …  
    166166 
    167167sub installsOfMine { 
    168  IndexDistributions::indexDistribution( "athens", 
     168 TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexDistribution( "athens", 
    169169  $ENV{HOME} . "/athenstwiki.mrjc.com/", 
    170170  $Common::excludeFilePattern ); 
    171  IndexDistributions::indexDistribution( "beijing", 
     171 TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexDistribution( "beijing", 
    172172  $ENV{HOME} . "/beijingtwiki.mrjc.com/", 
    173173  $Common::excludeFilePattern ); 
    174  IndexDistributions::indexDistribution( "cairo", 
     174 TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexDistribution( "cairo", 
    175175  $ENV{HOME} . "/cairotwiki.mrjc.com/", 
    176176  $Common::excludeFilePattern ); 
    … …  
    193193 my ( $filterInSub, $indexName ) = @_; 
    194194 my $ans; 
    195  FileDigest::emptyIndexes(); 
     195 TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::emptyIndexes(); 
    196196 my $dir = $Common::downloadDir; 
    197197 
    … …  
    201201  next unless &$filterInSub($download); 
    202202  $ans .= "Indexing $download\n"; 
    203   IndexDistributions::indexDistribution( $download, $dir . $download, 
     203  TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexDistribution( $download, $dir . $download, 
    204204   $Common::excludeFilePattern, "twiki" ); 
    205205 } 
    … …  
    213213 my $ans = "saving to " . File::Spec->rel2abs($saveFile) . "\n"; 
    214214 
    215  FileDigest::saveIndex($saveFile); 
     215 TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::saveIndex($saveFile); 
    216216 return $ans; 
    217217} 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/InstallationWalker.pm

    r336 r483  
    44use Digest::MD5; 
    55use FileHandle; 
    6 use IndexDistributions; 
    7 use FileDigest; 
    8 use Common; 
     6use TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions; 
     7use TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest; 
     8use TWiki::Plugins::TWikiReleaseTrackerPlugin::Common; 
    99 
    10 package InstallationWalker; 
     10package TWiki::Plugins::TWikiReleaseTrackerPlugin::InstallationWalker; 
    1111 
    1212sub match { 

  • trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin/TRTConfig.pm

    r336 r483  
    22 
    33use strict; 
     4 
     5package TWiki::Plugins::TWikiReleaseTrackerPlugin::TRTConfig; 
    46 
    57BEGIN { 
Note: See TracChangeset for help on using the changeset viewer.