diff -uNr garfield-6.33.orig/html/datimh_.c garfield-6.33/html/datimh_.c
--- garfield-6.33.orig/html/datimh_.c Thu Jan 1 09:00:00 1970
+++ garfield-6.33/html/datimh_.c Mon Dec 6 15:51:53 1999
@@ -0,0 +1,21 @@
+#include
+time_t time();
+
+void datimh_(char *datec, char *timec)
+{
+ const struct tm *timeptr;
+ time_t timer;
+ int yy, mm, dd, hr, mn, sc;
+
+ timer = time((void *)0);
+ timeptr = localtime(&timer);
+ yy = (timeptr->tm_year);
+ mm = (timeptr->tm_mon) + 1;
+ dd = (timeptr->tm_mday);
+ sprintf(datec,"%4.4d-%2.2d-%2.2d",yy,mm,dd);
+ hr = (timeptr->tm_hour);
+ mn = (timeptr->tm_min);
+ sc = (timeptr->tm_sec);
+ sprintf(timec,"%2.2d:%2.2d:%2.2d",hr,mn,sc);
+}
+
diff -uNr garfield-6.33.orig/html/labels/t2g garfield-6.33/html/labels/t2g
--- garfield-6.33.orig/html/labels/t2g Wed Jan 27 22:24:47 1999
+++ garfield-6.33/html/labels/t2g Tue Dec 7 06:03:04 1999
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# converts text to gif-button
#
@@ -65,8 +65,8 @@
$tb = 5;
$fn = '-adobe-helvetica-bold-r-normal--14-100-100-100-p-82-iso8859-1';
$fontheight = 14;
-$canvas = '/afs/cern.ch/user/a/awagner/www/ittest/t2g/canvas_14_cccccc.gif';
-$background = '/afs/cern.ch/user/a/awagner/www/ittest/t2g/canvas_cccccc_24_l.gif';
+$canvas = 'labels/canvas_14_cccccc.gif';
+$background = 'labels/canvas_cccccc_24_l.gif';
#$pencolor = '#003300' ;
$boxcolor= '#000100' ;
if ( $#ARGV == 2 ) { if ($ARGV[2] == 'red') { $pencolor = "#660000" }; };
@@ -77,9 +77,9 @@
#
# evaluating lenght of text
#
-system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -font '$fn' -pen '$pencolor' -draw \"text +15+$tb '$text'\" -crop 0x0 $canvas temp_0_0_a.gif;";
+system "convert -font '$fn' -fill '$pencolor' -draw \"text +15+$tb '$text'\" -crop 0x0 $canvas temp_0_0_a.gif;";
#system "xv temp_0_0_a.gif &";
-open(test,"/afs/cern.ch/user/a/awagner/public/bin/gifinfo temp_0_0_a.gif | grep ' width' | sed 's/\| *[wW]idth: *//' |");
+open(test,"identify -verbose temp_0_0_a.gif | grep ' geometry' | sed -e 's; *geometry: *;;' | sed -e 's;x.*;;' |");
read(test,$var,100000);
close(test);
#
@@ -90,14 +90,15 @@
$twt=6;
# $twrc=$twc[0]-5;
# print stdout "$ucll $twc[0]"; flush(stdout);
-system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -font '$fn' -pen '$pencolor' -draw \"text $twt+4 '$text'\" $background $file;";
+system "convert -font '$fn' -fill '$pencolor' -draw \"text $twt+4 '$text'\" $background $file;";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -crop $twc[0]x24 $file $file ; ";
+system "convert -crop $twc[0]x24 $file $file ; ";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -bordercolor '#000000' -border 2x2 $file $file ";
-system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -crop $twc[1]x28 $file $file ; ";
+system "convert -bordercolor '#000000' -border 2x2 $file $file ; ";
+if ($silent=~/no/) {print stdout "."; flush(stdout); };
+system "convert -crop $twc[1]x28-9-0 $file $file ; ";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
system "convert $file temp-0-0.xpm ";
@@ -108,8 +109,9 @@
system "rm -rf temp_0_0_a.gif* temp-0-0.xpm*";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-open(test,"/afs/cern.ch/user/a/awagner/public/bin/gifinfo $file | grep ' width' | sed 's/\| *[wW]idth: *//' |");
+open(test,"identify -verbose $file | grep ' geometry' | sed -e 's; *geometry: *;;' | sed -e 's;x.*;;' |");
read(test,$var,100000);
close(test);
#
print stdout "$file $var"
+
diff -uNr garfield-6.33.orig/html/labels/t2g_old garfield-6.33/html/labels/t2g_old
--- garfield-6.33.orig/html/labels/t2g_old Wed Jan 27 09:06:19 1999
+++ garfield-6.33/html/labels/t2g_old Mon Dec 6 16:06:59 1999
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# converts text to gif-button
#
diff -uNr garfield-8.10.orig/html/make_html garfield-8.10/html/make_html
--- garfield-8.10.orig/html/make_html Fri Jan 16 18:32:40 2004
+++ garfield-8.10/html/make_html Fri Jan 16 19:04:39 2004
@@ -1,25 +1,22 @@
# --------------------------------------------------------------------------- #
# Make file for HTML help file. #
# ----------------------------------------------------------------------------
-garfield.html: garfield.hlp .@sys/hlp_html headers top tail
- mv garfsearch.html garfsearch.xxxx
- -rm *.html *.href *.temp
- mv garfsearch.xxxx garfsearch.html
- hlp_html
+garfield.html: garfield.hlp ./hlp_html html_headers html_top html_tail
+ -rm -f *.html *.href *.temp
+ ./hlp_html
ln -s garfield.html Welcome.html
# ref.html: garfield.href
- cat headers >>garfield.href
+ cat html_headers >>garfield.href
sort -f -t \> -k 3 garfield.href > temp
- cat top temp tail >ref.html
- rm temp
+ cat html_top temp html_tail >ref.html
+ rm -f temp
garfield.href: garfield.html
-hlp_html: hlp_html.f
- ff77 hlp_html
- -rm hlp_html.o
+hlp_html: hlp_html.f datimh_.o
+ f77 hlp_html.f datimh_.o -o hlp_html /cern/pro/lib/libpacklib.a
garfsearch: garfsearch.f
- f77 garfsearch.f /asis/sun4x_56/cern/pro/lib/libpacklib.a -lw -lgen -lsocket -lnsl -lintl -o garfsearch
+ f77 garfsearch.f /pro/lib/libpacklib.a -L/usr/local/lib -lintl -o garfsearch
index: index.f
- f77 index.f /asis/sun4x_56/cern/pro/lib/libpacklib.a -lw -lgen -lsocket -lnsl -lintl -o index
+ f77 index.f /cern/pro/lib/libpacklib.a -L/usr/local/lib -lintl -o index
listkey: listkey.f
- f77 listkey.f /asis/sun4x_56/cern/pro/lib/libpacklib.a -lw -lgen -lsocket -lnsl -lintl -o listkey
+ f77 listkey.f /cern/pro/lib/libpacklib.a -L/usr/local/lib -lintl -o listkey
--- garfield-9.11/html/labels/t2g.orig 2006-10-10 14:55:48.000000000 +0900
+++ garfield-9.11/html/labels/t2g 2006-10-10 19:08:04.000000000 +0900
@@ -77,9 +77,10 @@
#
# evaluating lenght of text
#
-system "convert -font '$fn' -fill '$pencolor' -draw \"text +15+$tb '$text'\" -crop 0x0 $canvas temp_0_0_a.gif;";
+#system "convert -font '$fn' -fill '$pencolor' -draw \"text +15+$tb '$text'\" -crop 0x0 $canvas temp_0_0_a.gif;";
+system "convert -font '$fn' -draw \"text +15+$tb '$text'\" -trim $canvas temp_0_0_a.gif;";
#system "xv temp_0_0_a.gif &";
-open(test,"identify -verbose temp_0_0_a.gif | grep ' geometry' | sed -e 's; *geometry: *;;' | sed -e 's;x.*;;' |");
+open(test,"identify -verbose temp_0_0_a.gif | grep ' Geometry' | sed -e 's; *Geometry: *;;' | sed -e 's;x.*;;' |");
read(test,$var,100000);
close(test);
#
@@ -90,26 +91,29 @@
$twt=6;
# $twrc=$twc[0]-5;
# print stdout "$ucll $twc[0]"; flush(stdout);
-system "convert -font '$fn' -fill '$pencolor' -draw \"text $twt+4 '$text'\" $background $file;";
+#system "convert -font '$fn' -fill '$pencolor' -draw \"text $twt+4 '$text'\" $background $file;";
+system "convert -font '$fn' -fill '$pencolor' -draw \"text $twt+14 '$text'\" $background $file;";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-system "convert -crop $twc[0]x24 $file $file ; ";
+system "convert -crop $twc[0]x24 $file $file; ";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-system "convert -bordercolor '#000000' -border 2x2 $file $file ; ";
-if ($silent=~/no/) {print stdout "."; flush(stdout); };
-system "convert -crop $twc[1]x28-9-0 $file $file ; ";
+system "convert -bordercolor '#000000' -border 2x2 $file $file; ";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-system "convert $file temp-0-0.xpm ";
+system "convert -crop $twc[1]x28-9-0 $file $file; ";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-system "convert temp-0-0.xpm.0 $file;";
+#system "convert $file temp-0-0.xpm ";
+#if ($silent=~/no/) {print stdout "."; flush(stdout); };
+#
+#system "convert temp-0-0.xpm.0 $file;";
+#system "convert temp-0-0.xpm $file;";
if ($silent=~/no/) {system "xv $file &";};
-system "rm -rf temp_0_0_a.gif* temp-0-0.xpm*";
+system "rm -rf temp_0_0_a.gif* temp-0-0-*.xpm";
if ($silent=~/no/) {print stdout "."; flush(stdout); };
#
-open(test,"identify -verbose $file | grep ' geometry' | sed -e 's; *geometry: *;;' | sed -e 's;x.*;;' |");
+open(test,"identify -verbose $file | grep ' Geometry' | sed -e 's; *Geometry: *;;' | sed -e 's;x.*;;' |");
read(test,$var,100000);
close(test);
#