[opendemo-cvs] CVS: opendemo/tools wpu,1.11,1.12

[Uwe G. <gi...@us...>]

Update of /cvsroot/opendemo/opendemo/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27154

Modified Files:
	wpu 
Log Message:
Adapt changes made for LMPC.


Index: wpu
===================================================================
RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wpu	29 Feb 2004 12:29:47 -0000	1.11
--- wpu	22 May 2004 13:57:52 -0000	1.12
***************
*** 79,84 ****
    "BANNER2" => "<!--ACCIPITERADINSERT /SITE=PQ/GENRE=ACTION/AREA=HOSTED/AAMSZ=IAB_FULL_BANNER-->",
    "SIG"     => "<HR>
! Last changed: \@DATE@, Count: <img
! src=\"/counter/count.exe?srgb=00ff00&prgb=101010&ft=0&tr=1&pad=0&df=pqdemospecs\">,
  <A HREF=\"mailto:\@MYEMAIL@\">\@MYNAME@</A>
  <P ALIGN=\"CENTER\">
--- 79,83 ----
    "BANNER2" => "<!--ACCIPITERADINSERT /SITE=PQ/GENRE=ACTION/AREA=HOSTED/AAMSZ=IAB_FULL_BANNER-->",
    "SIG"     => "<HR>
! Last changed: \@DATE@,
  <A HREF=\"mailto:\@MYEMAIL@\">\@MYNAME@</A>
  <P ALIGN=\"CENTER\">
***************
*** 112,121 ****
  mergehash(\%values, \%ENV);
  
- # merge the command line options #####################################
- my %optctl = ();
- my $result = GetOptions (\%optctl, "set=s%");
- die "$script: command line parse problem" unless $result;
- mergehash(\%values, $optctl{"set"});
- 
  # get config files ###################################################
  # general files
--- 111,114 ----
***************
*** 178,184 ****
  @configs = uniq @configs;
  
! #foreach my $e (@configs) {
  #  print "$e\n";
! #}
  
  # process and merge the entries
--- 171,177 ----
  @configs = uniq @configs;
  
! foreach my $e (@configs) {
  #  print "$e\n";
! }
  
  # process and merge the entries
***************
*** 187,193 ****
  }
  
  foreach (sort keys %values) {
  	$values{$_} = substvariables ($values{$_});
! #	printf "`%s´ = `%s´\n", $_, $values{$_};
  }
  
--- 180,192 ----
  }
  
+ # merge the command line options #####################################
+ my %optctl = ();
+ my $result = GetOptions (\%optctl, "set=s%");
+ die "$script: command line parse problem" unless $result;
+ mergehash(\%values, $optctl{"set"});
+ 
  foreach (sort keys %values) {
  	$values{$_} = substvariables ($values{$_});
! #	printf "'%s' = '%s'\n", $_, $values{$_};
  }
  
***************
*** 363,367 ****
  <P>";
  
!   my $DocumentationSceleton = "The \@DOCTYPE@ is available in several formats:
  <DL>
  <DT>HTML
--- 362,366 ----
  <P>";
  
!   my $DocumentationSceleton_old = "The \@DOCTYPE@ is available in several formats:
  <DL>
  <DT>HTML
***************
*** 380,383 ****
--- 379,393 ----
  ";
  
+   my $DocumentationSceleton = "The \@DOCTYPE@ is available as:
+ <DL>
+ <DT><A HREF=\"http://www.w3.org/TR/html401/\">Hypertext Markup Language version 4.01</A>
+ <DD><A HREF=\"\@PACKAGE@.html\"><TT>\@PACKAGE@.html</TT></A>
+ <DT><A HREF=\"http://partners.adobe.com/asn/tech/pdf/specifications.jsp\">Adobe Portable Document Format version 1.4</A>
+ <DD><A HREF=\"\@PACKAGE@.pdf\"><TT>\@PACKAGE@.pdf</TT></A>
+ <DT><A HREF=\"http://www.oasis-open.org/docbook/sgml/4.2/index.shtml\">DocBook SGML version 4.2</A>
+ <DD><A HREF=\"\@PACKAGE@.sgml\"><TT>\@PACKAGE@.sgml</TT></A>
+ </DL>
+ ";
+ 
    my $DownloadSceleton = "You can download everything directly from 
  <A HREF=\"\@FTPCDROMBASE@/\"><TT>ftp.cdrom.com</TT></A>
***************
*** 414,418 ****
  
    # prepare DOWNLOAD section -----------------------------------------
!   if (exists $values{"DOWNCOUNT"}) {
      $output="";
      for (my $count=1;$count<=$values{"DOWNCOUNT"} ; $count++) {
--- 424,428 ----
  
    # prepare DOWNLOAD section -----------------------------------------
!   if (exists $values{"DOWNCOUNT"} && $values{"DOWNCOUNT"}>0) {
      $output="";
      for (my $count=1;$count<=$values{"DOWNCOUNT"} ; $count++) {