Changeset 483 for trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin.pm

Timestamp:

11/09/08 14:58:26 (4 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.

File:

• trunk/TWikiReleaseTrackerPlugin/lib/TWiki/Plugins/TWikiReleaseTrackerPlugin.pm (modified) (13 diffs)

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

@@ -58 +58 @@
  my $ans = untaint( $cgiQuery->param($paramName) );
 
- #    writeDebug("$inlineParamString\n1: $paramName = $ans");
  if ( $ans eq "" ) {
   $ans = TWiki::Func::extractNameValuePair( $inlineParamString, $paramName );
- }
-
- #    writeDebug("2: $paramName = $ans");
- if ( $ans eq "" ) {
   $ans = TWiki::Func::getPreferencesValue("\U$pluginName\E_\U$paramName\E");
- }
-
- #    writeDebug("$paramName = $ans");
- # Circumstances sometimes that getPreferencesValue returns a CR, breaking the table definitions.
- # Arguably a bug in TWiki::Func::getPreferencesValue (Codev.GetPreferencesValueReturnsNL)
- $ans =~ s/\n//;
+ } else {
+  #    writeDebug("$paramName = $ans");
+  # Circumstances sometimes that getPreferencesValue returns a CR, breaking the table definitions.
+  # Arguably a bug in TWiki::Func::getPreferencesValue (Codev.GetPreferencesValueReturnsNL)
+  $ans =~ s/\n//;
+ }
  return $ans;
 }
@@ -89 +84 @@
  my $compareFromDistribution = getParam( $param, 'from' )
    || 'localInstallation';
- Common::setIndexTopic( getParam( $param, 'indexTopic' )
+ TWiki::Plugins::TWikiReleaseTrackerPlugin::Common::setIndexTopic( getParam( $param, 'indexTopic' )
     || 'TWiki.TWikiReleaseTrackerPlugin' );
 
@@ -132 +127 @@
  }
  elsif ( $modeParam eq 'indexLocalInstallation' ) {
-  $ans .= "<pre>" . IndexDistributions::indexLocalInstallation() . "</pre>";
+  $ans .= "<pre>" . TWiki::Plugins::TWikiReleaseTrackerPlugin::IndexDistributions::indexLocalInstallation() . "</pre>";
   $ans .= browserCallback( "Back to listing", 'mode' => 'listing' );
  }
@@ -140 +135 @@
    @distributions );
  }
+ # SMELL: Not sure where but the Content-type headers are getting messed up
+ #        MartinCleaver, maybe you can fix up this part
+ print "Content-type: text/html\n\n";
  return $ans;
 }
@@ -187 +185 @@
  if ( $param =~ m/distributions/ ) {
   return formatList( $format, $separator, $selection, $marker,
-   sort &FileDigest::getDistributions );
+   sort &TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::getDistributions );
  }
  elsif ( $param =~ m/filenames/ ) {
@@ -290 +288 @@
  # then unmentionedDistributions = (C);
  my @mentionedDistributions = sort @distributions, $compareToDistribution;
- my @allDistributions = FileDigest::retreiveDistributionsForFilename($file);
+ my @allDistributions = TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveDistributionsForFilename($file);
  my @remainingDistributions = sort @allDistributions;
 
@@ -415 +413 @@
  loadIndexes();
 
- return "<pre>" . FileDigest::dataOutline() . "</pre>";
+ return "<pre>" . TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::dataOutline() . "</pre>";
 }
 
@@ -439 +437 @@
 
   my @distributionsWithDigest =
-    FileDigest::retreiveDistributionsForDigest( $digest, $relativeFile );
+    TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveDistributionsForDigest( $digest, $relativeFile );
   @distributionsWithDigest =
     grep { !/$compareToDistribution/ }
@@ -445 +443 @@
 
   my @allDistributionsForFilename =
-    FileDigest::retreiveDistributionsForFilename($relativeFile);
+    TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveDistributionsForFilename($relativeFile);
   @allDistributionsForFilename =
     grep { !/$compareToDistribution/ }
@@ -529 +527 @@
  #                           $Common::excludeFilePattern,
  #                           $matchCallback);
- my $countMatches = DistributionWalker::match(
+ my $countMatches = TWiki::Plugins::TWikiReleaseTrackerPlugin::DistributionWalker::match(
   $compareToDistribution,      $Common::installationDir,
   $Common::excludeFilePattern, $matchCallback
@@ -537 +535 @@
   foreach my $dist ( @distributions, $compareToDistribution ) {
    my $numberEntries =
-     scalar( FileDigest::retreiveOccurancesForDistribution($dist) );
+     scalar( TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::retreiveOccurancesForDistribution($dist) );
    $ans .= "<LI> Distribution $dist has " . $numberEntries . " entries\n";
    if ( $dist eq "localInstallation" ) {
@@ -601 +599 @@
  my ($param) = @_;
  return "" unless ( defined $param );
- $param =~ s/$TWiki::securityFilter//go;
+ #SMELL: $TWiki::securityFilter doesn't seem to exist anywhere!
+ #$param =~ s/$TWiki::securityFilter//go;
  $param =~ /(.*)/;
  return $1;
@@ -700 +699 @@
  writeDebug("Loading from $Common::md5IndexDir");
  eval {
-  FileDigest::emptyIndexes();
-  FileDigest::loadIndexes($Common::md5IndexDir);
+  TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::emptyIndexes();
+  TWiki::Plugins::TWikiReleaseTrackerPlugin::FileDigest::loadIndexes($Common::md5IndexDir);
  };
  writeDebug($@) if ($@);