Menu
▾
▴
woc-commit — CVS commit messages are posted to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(132) |
Jul
(50) |
Aug
(172) |
Sep
(87) |
Oct
|
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(39) |
Oct
(2) |
Nov
|
Dec
|
| 2004 |
Jan
(47) |
Feb
|
Mar
(11) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(9) |
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Egon W. <eg...@us...> - 2002-07-20 14:51:57
|
Update of /cvsroot/woc/woc/bin/cas In directory usw-pr-cvs1:/tmp/cvs-serv29030/cas Log Message: Directory /cvsroot/woc/woc/bin/cas added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 14:50:37
|
Update of /cvsroot/woc/woc/bin/download
In directory usw-pr-cvs1:/tmp/cvs-serv28633/download
Added Files:
Makefile.am Makefile.in download_pdb_from_NCI.pl.in
download_xyz_from_NCI.pl.in
Log Message:
Added scripts for autodownloading of 3D coords files
from the NCI database.
--- NEW FILE: Makefile.am ---
bin_SCRIPTS = \
download_pdb_from_NCI.pl \
download_xyz_from_NCI.pl
CLEANFILES = $(bin_SCRIPTS)
--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
AMTAR = @AMTAR@
AWK = @AWK@
DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PATHTOPERL = @PATHTOPERL@
PATHTOSH = @PATHTOSH@
PATHTOXSLTPROC = @PATHTOXSLTPROC@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
bin_SCRIPTS = \
download_pdb_from_NCI.pl \
download_xyz_from_NCI.pl
CLEANFILES = $(bin_SCRIPTS)
subdir = bin/download
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = download_pdb_from_NCI.pl download_xyz_from_NCI.pl
SCRIPTS = $(bin_SCRIPTS)
DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in download_pdb_from_NCI.pl.in \
download_xyz_from_NCI.pl.in
all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu bin/download/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
download_pdb_from_NCI.pl: $(top_builddir)/config.status download_pdb_from_NCI.pl.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
download_xyz_from_NCI.pl: $(top_builddir)/config.status download_xyz_from_NCI.pl.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f="`echo $$p|sed '$(transform)'`"; \
if test -f $$p; then \
echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
elif test -f $(srcdir)/$$p; then \
echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f="`echo $$p|sed '$(transform)'`"; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
uninstall-info-am:
tags: TAGS
TAGS:
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ../..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
$(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
cp -pR $$d/$$file $(distdir) \
|| exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
info: info-am
info-am:
install-data-am:
install-exec-am: install-binSCRIPTS
install-info: install-info-am
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
uninstall-am: uninstall-binSCRIPTS uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am info info-am install \
install-am install-binSCRIPTS install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-man install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic uninstall uninstall-am \
uninstall-binSCRIPTS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- NEW FILE: download_pdb_from_NCI.pl.in ---
#! @PATHTOPERL@ -w
use diagnostics;
use strict;
use LWP;
use LWP::Simple;
use XML::XPath;
my $root = "../../data/dadml/3d/pdb";
my $urlbase = "http://131.188.127.153/cgi-bin/services/ncidb/ncidb2.tcl";
# Check command line options
if (@ARGV == 0) {
print "Usage: $0 <xml-files>$/";
exit;
}
# Global variables
my $nr_downloaded_PDBs = 0;
my $nr_PDB_in_NCI = 0;
my $nr_PDB_already_done = 0;
my $nr_CAS_found = 0;
my $nr_files = scalar @ARGV;
# Loop over all files
my $cas = "";
foreach my $arg (@ARGV) {
print "Checking $arg...$/";
my $xp = XML::XPath->new(filename => $arg);
my $cas = $xp->findvalue('/ITEM/INDEX[@CLASS="CAS-NUMBER"]');
if ($cas ne "" && (!-e "$root/$cas.pdb")) {
$nr_CAS_found++;
my $url = "$urlbase?op1=cas&data1=$cas&op2=cas&data2=&op3=inclformula&data3=&op4=fse&data4=&dohighlight=1&andor=and&maxhits=100&timeout=90&output=pdb&sort=nsc";
print "URL: $url\n";
my $browser = LWP::UserAgent->new();
$browser->agent("WOC Downloader");
my $request = HTTP::Request->new(GET => $url);
print STDERR " ...trying to download PDB for $cas";
my $foo = $browser->request($request);
if ($foo->is_success) {
my $content = $foo->content || "";
if ($content ne "" && !($content =~ /HTML/i)) {
print " ... and saving$/";
open (PDBFILE, ">$root/$cas.pdb");
print PDBFILE $content;
$nr_downloaded_PDBs++;
} else {
print " ... no PDB file found$/";
$nr_PDB_in_NCI++;
}
} else {
print " ... unexpected error has occured\n";
}
} else {
if ($cas eq "") {
print " ... no CAS number$/";
} else {
print " ...$cas.pdb already present!$/";
$nr_PDB_already_done++;
}
}
}
# Print statistics
print " ----------------------------$/";
print "Files checked : $nr_files$/";
print " CAS number found : $nr_CAS_found$/";
print " PDB files downloaded : $nr_downloaded_PDBs$/";
print " PDB files not in NCI : $nr_PDB_in_NCI$/";
print " PDB already done : $nr_PDB_already_done$/";
--- NEW FILE: download_xyz_from_NCI.pl.in ---
#! @PATHTOPERL@ -w
use diagnostics;
use strict;
use LWP;
use LWP::Simple;
my $root = "../../data/dadml/3d/xyz";
my $urlbase = "http://131.188.127.153/cgi-bin/services/ncidb/ncidb2.tcl";
# Check command line options
if (@ARGV == 0) {
print "Usage: $0 <xml-files>$/";
exit;
}
# Global variables
my $no_downloaded_XYZs = 0;
my $no_XYZ_in_NCI = 0;
my $no_XYZ_already_done = 0;
my $no_CAS_found = 0;
my $no_files = scalar @ARGV;
# Loop over all files
my $cas = "";
foreach my $arg (@ARGV) {
print "Checking $arg...$/";
open (FILEHANDLE, "<$arg");
$cas = "";
while (<FILEHANDLE>) {
if (/CAS-NUMBER/i && /\>(.+?)\</) {
$cas = $1;
}
};
if ($cas ne "" && (!-e "$root/$cas.xyz")) {
$no_CAS_found++;
my $url = "$urlbase?op1=cas&data1=$cas&op2=cas&data2=&op3=inclformula&data3=&op4=fse&data4=&dohighlight=1&andor=and&maxhits=100&timeout=90&output=xyz&sort=nsc";
my $browser = LWP::UserAgent->new();
$browser->agent("WOC Downloader");
my $request = HTTP::Request->new(GET => $url);
print STDERR " ...downloading XYZ for $cas";
my $foo = $browser->request($request);
if ($foo->is_success) {
my $content = $foo->content || "";
if ($content ne "" && !($content =~ /HTML/i)) {
print " ... and saving$/";
open (XYZFILE, ">$root/$cas.xyz");
print XYZFILE $content;
$no_downloaded_XYZs++;
} else {
print " ... no XYZ file found$/";
$no_XYZ_in_NCI++;
}
}
} else {
if ($cas eq "") {
print " ... no CAS number$/";
} else {
print " ...$cas.xyz already downloaded!$/";
$no_XYZ_already_done++;
}
}
}
# Print statistics
print " ----------------------------$/";
print "Files checked : $no_files$/";
print " CAS number found : $no_CAS_found$/";
print " XYZ files downloaded : $no_downloaded_XYZs$/";
print " XYZ files not in NCI : $no_XYZ_in_NCI$/";
print " XYZ already done : $no_XYZ_already_done$/";
|
|
From: Egon W. <eg...@us...> - 2002-07-20 14:50:37
|
Update of /cvsroot/woc/woc/bin In directory usw-pr-cvs1:/tmp/cvs-serv28633 Modified Files: Makefile.am Log Message: Added scripts for autodownloading of 3D coords files from the NCI database. Index: Makefile.am =================================================================== RCS file: /cvsroot/woc/woc/bin/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.am 20 Jul 2002 09:34:26 -0000 1.1 --- Makefile.am 20 Jul 2002 14:50:34 -0000 1.2 *************** *** 1,4 **** PREFIX="@prefix@" ! SUBDIRS= index EXTRA_DIST= --- 1,4 ---- PREFIX="@prefix@" ! SUBDIRS= index download EXTRA_DIST= |
|
From: Egon W. <eg...@us...> - 2002-07-20 14:40:43
|
Update of /cvsroot/woc/woc/bin/download In directory usw-pr-cvs1:/tmp/cvs-serv26771/download Log Message: Directory /cvsroot/woc/woc/bin/download added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 14:25:37
|
Update of /cvsroot/woc/woc/bin/index
In directory usw-pr-cvs1:/tmp/cvs-serv23020/bin/index
Modified Files:
.cvsignore Makefile.am index.abbrev.xsl makechemtrans.sh
templindex.XX-XX.xsl woclist.sh.in
Added Files:
genlangxslts.pl.in index.smiles2cas.xsl update.sh.in
woclist.pl.in
Removed Files:
genlangxslts.pl update.pl woclist.pl
Log Message:
Made index scripts work.
--- NEW FILE: genlangxslts.pl.in ---
#! @PATHTOPERL@ -w
use strict;
use diagnostics;
my %langs = (
"NL" => {
"EN" => "Dutch",
"NL" => "Nederlands",
},
"EN" => {
"EN" => "English",
"NL" => "Engels",
},
"DE" => {
"EN" => "German",
"NL" => "Duits",
},
"IT" => {
"EN" => "Italian",
"NL" => "Italiaans",
},
"FR" => {
"EN" => "French",
"NL" => "Frans",
},
"ES" => {
"EN" => "Spanish",
"NL" => "Spaans",
},
"LA" => {
"EN" => "Latin",
"NL" => "Latijn",
},
"FY" => {
"EN" => "Frysian",
"NL" => "Fries",
},
);
foreach my $from (keys(%langs)) {
foreach my $to (keys(%langs)) {
print "$from -> $to$/";
open(INPUT, "<templindex.XX-XX.xsl");
open(OUTPUT, ">index.$from-$to.xsl");
while(<INPUT>) {
s/#FROM#/$from/;
s/#TO#/$to/;
print OUTPUT;
}
}
}
open(OUTPUT, ">makechemtrans.sh");
print OUTPUT "#! @PATHTOSH@\n";
print OUTPUT "# This script is autogenerated with genlangxslts.pl! Do not edit!\n\n";
print OUTPUT "all=\"";
foreach my $from (keys(%langs)) {
foreach my $to (keys(%langs)) {
if ($from ne $to) {
print OUTPUT "index.$from-$to \\\n";
}
}
}
print OUTPUT "\"\n\n";
print OUTPUT "update.sh \$all\n";
`chmod 755 makechemtrans.sh`
--- NEW FILE: index.smiles2cas.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Nederlands-Engels");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="NAME">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM">
<xsl:sort select="INDEX[@CLASS='SMILES']"/>
<xsl:for-each select="INDEX[@CLASS='SMILES']">
<xsl:if test=".">
<tr>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../@FILE}.shtml"><xsl:value-of select="."/></a></td>
<td class="main"><xsl:value-of select="../INDEX[@CLASS='CAS-NUMBER']"/></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: update.sh.in ---
#! @PATHTOSH@ -f
name="woclist"
baseuri="http://www-woc.sci.kun.nl/gui/index"
htmldir="../../web-docs/gui/index"
datadir="."
# The default makes all indices except for the pages
# translating words XX-XX. Those are done with the
# script makechemtrans.pl.
all="index.abbrev index.bruto index.nl index.enum index.vnnum \
index.smiles2cas index.cas2smiles"
if test "x$1" = "x"
then
echo "Usage: update.pl xml"
echo "Usage: update.pl [web] all"
echo "Usage: update.pl [web] <index-name> ..."
else
if test "x$1" = "xxml"
then
echo "Creating new $datadir/$name.xml..."
$datadir/$name.sh
exit
fi
if test "x$1" = "xweb"
then
echo "Content-type: text/html"
echo ""
shift
fi
if test "x$1" = "xall";
then
shift
update.sh $all
else
for index in $*
do
echo "Parsing $datadir/$name.xml against $datadir/$index.xsl..."
xsltproc $datadir/$index.xsl $datadir/$name.xml > $htmldir/$index.html
chmod 664 $htmldir/$index.html
chgrp wwwwoc $htmldir/$index.html
done
echo "Done!"
fi
fi
--- NEW FILE: woclist.pl.in ---
#! @PATHTOPERL@
use strict;
use diagnostics;
# Author: Geert Josten
# hulp-script gebruikt door wocml.sh
my $cmldir="../../data/dadml/physicalprop/cml";
my $infile;
my $outfile;
if (@ARGV >= 2) {
$infile = shift;
$outfile = shift;
} else {
$infile = "woclist.tmp2.xml";
$outfile = "woclist.xml";
}
open (INFILE, "$infile");
open (OUTFILE, ">$outfile");
#print eerste regel alvast
$_ = <INFILE>; print OUTFILE;
while (<INFILE>) {
my $file;
if (/ITEM.*?CODE=/i) {
s/CODE/FILE/i;
print OUTFILE;
} elsif (/INSERT.*PhysicalProperties.*>(.*)</i) {
my @inserts = `awk '/<molecule/,/<\\/molecule/{print " ",\$0}' $cmldir/$1`;
foreach my $insert (@inserts) {
if ($insert =~ /^(.*Stoichiometry.*>)(.*)(<.*)$/i) {
my $pre = $1;
my $bruto = $2;
my $brutoID = $2;
my $post = $3;
$bruto =~ s/(\d+)/<sub>$1<\/sub>/ig;
print OUTFILE $pre,$bruto,$post,$/;
$pre =~ s/Stoichiometry/StoichiometryID/i;
$brutoID =~ s/(\d+)/{$1}/ig;
while ($brutoID =~ /\{(\d+?)\}/) {
my $number = sprintf "%04i", $1;
$brutoID =~ s/\{\d+?\}/$number/;
}
print OUTFILE $pre,$brutoID,$post,$/;
} else {
print OUTFILE $insert;
}
}
} elsif (/\<\?xml.*\?\>/i) {
s/\<\?xml.*\?\>//i;
print OUTFILE;
} else {
print OUTFILE;
}
}
# zoals in Convert.java
sub NAMELikeToANCHORLike {
# heeft 1 parameter
my $param = shift @_;
$param =~ s/^\s*(.*?)\s*$/$1/ig;
$param =~ s/\ /\_/g;
$param =~ s/[,|.|<|>]//g;
$param =~ tr/[A-Z]/[a-z]/;
return $param;
}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/bin/index/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore 20 Jul 2002 09:34:26 -0000 1.2
--- .cvsignore 20 Jul 2002 14:25:32 -0000 1.3
***************
*** 1,6 ****
Makefile
Makefile.in
woclist.sh
woclist.xml
makechemtrans.sh
! genindex.*.xsl
--- 1,14 ----
Makefile
Makefile.in
+ update.sh
woclist.sh
+ woclist.pl
woclist.xml
makechemtrans.sh
! index.D*.xsl
! index.E*.xsl
! index.F*.xsl
! index.I*.xsl
! index.L*.xsl
! index.N*.xsl
! genlangxslts.pl
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/bin/index/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 20 Jul 2002 09:34:26 -0000 1.1
--- Makefile.am 20 Jul 2002 14:25:32 -0000 1.2
***************
*** 1,11 ****
! bin_SCRIPTS = woclist.sh
! all: woclist.xml
!
! woclist.xml:
! woclist.sh
!
! clean:
! rm genindex.*.xsl
! rm makechemtrans.sh
! rm woclist.xml
--- 1,7 ----
! bin_SCRIPTS = \
! woclist.sh \
! woclist.pl \
! genlangxslts.pl \
! update.sh
! CLEANFILES = $(bin_SCRIPTS)
\ No newline at end of file
Index: index.abbrev.xsl
===================================================================
RCS file: /cvsroot/woc/woc/bin/index/index.abbrev.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** index.abbrev.xsl 19 Jul 2002 12:19:57 -0000 1.1
--- index.abbrev.xsl 20 Jul 2002 14:25:32 -0000 1.2
***************
*** 1,4 ****
<?xml version="1.0"?>
! <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output mode="html"/>
--- 1,4 ----
<?xml version="1.0"?>
! <xsl:stylesheet xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output mode="html"/>
Index: makechemtrans.sh
===================================================================
RCS file: /cvsroot/woc/woc/bin/index/makechemtrans.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** makechemtrans.sh 19 Jul 2002 12:41:15 -0000 1.2
--- makechemtrans.sh 20 Jul 2002 14:25:32 -0000 1.3
***************
*** 1,62 ****
! #!/usr/local/bin/tcsh -f
# This script is autogenerated with genlangxslts.pl! Do not edit!
! setenv all "genindex.EN-FR \
! genindex.EN-ES \
! genindex.EN-DE \
! genindex.EN-NL \
! genindex.EN-IT \
! genindex.EN-LA \
! genindex.EN-FY \
! genindex.FR-EN \
! genindex.FR-ES \
! genindex.FR-DE \
! genindex.FR-NL \
! genindex.FR-IT \
! genindex.FR-LA \
! genindex.FR-FY \
! genindex.ES-EN \
! genindex.ES-FR \
! genindex.ES-DE \
! genindex.ES-NL \
! genindex.ES-IT \
! genindex.ES-LA \
! genindex.ES-FY \
! genindex.DE-EN \
! genindex.DE-FR \
! genindex.DE-ES \
! genindex.DE-NL \
! genindex.DE-IT \
! genindex.DE-LA \
! genindex.DE-FY \
! genindex.NL-EN \
! genindex.NL-FR \
! genindex.NL-ES \
! genindex.NL-DE \
! genindex.NL-IT \
! genindex.NL-LA \
! genindex.NL-FY \
! genindex.IT-EN \
! genindex.IT-FR \
! genindex.IT-ES \
! genindex.IT-DE \
! genindex.IT-NL \
! genindex.IT-LA \
! genindex.IT-FY \
! genindex.LA-EN \
! genindex.LA-FR \
! genindex.LA-ES \
! genindex.LA-DE \
! genindex.LA-NL \
! genindex.LA-IT \
! genindex.LA-FY \
! genindex.FY-EN \
! genindex.FY-FR \
! genindex.FY-ES \
! genindex.FY-DE \
! genindex.FY-NL \
! genindex.FY-IT \
! genindex.FY-LA \
"
! update.pl noxml $all
--- 1,62 ----
! #! /usr/bin/sh
# This script is autogenerated with genlangxslts.pl! Do not edit!
! all="index.EN-FR \
! index.EN-ES \
! index.EN-DE \
! index.EN-NL \
! index.EN-IT \
! index.EN-LA \
! index.EN-FY \
! index.FR-EN \
! index.FR-ES \
! index.FR-DE \
! index.FR-NL \
! index.FR-IT \
! index.FR-LA \
! index.FR-FY \
! index.ES-EN \
! index.ES-FR \
! index.ES-DE \
! index.ES-NL \
! index.ES-IT \
! index.ES-LA \
! index.ES-FY \
! index.DE-EN \
! index.DE-FR \
! index.DE-ES \
! index.DE-NL \
! index.DE-IT \
! index.DE-LA \
! index.DE-FY \
! index.NL-EN \
! index.NL-FR \
! index.NL-ES \
! index.NL-DE \
! index.NL-IT \
! index.NL-LA \
! index.NL-FY \
! index.IT-EN \
! index.IT-FR \
! index.IT-ES \
! index.IT-DE \
! index.IT-NL \
! index.IT-LA \
! index.IT-FY \
! index.LA-EN \
! index.LA-FR \
! index.LA-ES \
! index.LA-DE \
! index.LA-NL \
! index.LA-IT \
! index.LA-FY \
! index.FY-EN \
! index.FY-FR \
! index.FY-ES \
! index.FY-DE \
! index.FY-NL \
! index.FY-IT \
! index.FY-LA \
"
! update.sh $all
Index: templindex.XX-XX.xsl
===================================================================
RCS file: /cvsroot/woc/woc/bin/index/templindex.XX-XX.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** templindex.XX-XX.xsl 19 Jul 2002 12:19:57 -0000 1.1
--- templindex.XX-XX.xsl 20 Jul 2002 14:25:32 -0000 1.2
***************
*** 1,11 ****
<?xml version="1.0"?>
! <xsl:stylesheet xsl:version="1.0"
! xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/">
<html>
<head>
! <base href="http://www.sci.kun.nl/woc/"/>
! <link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
</head>
<body class="main">
--- 1,12 ----
<?xml version="1.0"?>
! <xsl:stylesheet xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
!
! <!-- This stylesheet is autogenerated with genlangxslts.pl! Do not edit! -->
<xsl:template match="/">
<html>
<head>
! <base href="http://www-woc.sci.kun.nl/"/>
! <link rel="stylesheet" href="http://www-woc.sci.kun.nl/gui/styles/woc.css" type="text/css"/>
</head>
<body class="main">
***************
*** 26,35 ****
<xsl:sort select="LANG[@ID='#FROM#']"/>
<xsl:for-each select="LANG[@ID='#FROM#']">
! <xsl:if test="../LANG[@ID='#TO#']">
! <tr>
! <td class="main"><xsl:value-of select="."/></td>
! <td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../../../@FILE}.shtml"><xsl:value-of select="../LANG[@ID='#TO#']"/></a></td>
! </tr>
! </xsl:if>
</xsl:for-each>
</xsl:for-each>
--- 27,36 ----
<xsl:sort select="LANG[@ID='#FROM#']"/>
<xsl:for-each select="LANG[@ID='#FROM#']">
! <xsl:if test="../LANG[@ID='#TO#']">
! <tr>
! <td class="main"><xsl:value-of select="."/></td>
! <td class="main"><a href="http://www-woc.sci.kun.nl/gui/items/{../../../@FILE}.shtml"><xsl:value-of select="../LANG[@ID='#TO#']"/></a></td>
! </tr>
! </xsl:if>
</xsl:for-each>
</xsl:for-each>
Index: woclist.sh.in
===================================================================
RCS file: /cvsroot/woc/woc/bin/index/woclist.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** woclist.sh.in 20 Jul 2002 09:34:26 -0000 1.1
--- woclist.sh.in 20 Jul 2002 14:25:32 -0000 1.2
***************
*** 11,18 ****
# cmldir is in perl-stukje gedefinieerd
! cat `find $WMLDIR -name "*.xml"` > $NAME$TEMP
! echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > ! $NAME$TEMP2
! echo '<\!DOCTYPE ITEM SYSTEM "../../lib/xml/dtd/'$NAME'.dtd">' >> $NAME$TEMP2
echo '<'$NAME' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $NAME$TEMP2
echo ' xmlns:import="http://www.sci.kun.nl/woc/import"' >> $NAME$TEMP2
--- 11,18 ----
# cmldir is in perl-stukje gedefinieerd
! cat `find $WMLDIR -name "*.xml" | grep -v templates` > $NAME$TEMP
! echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > $NAME$TEMP2
! echo '<!DOCTYPE ITEM SYSTEM "../../lib/xml/dtd/'$NAME'.dtd">' >> $NAME$TEMP2
echo '<'$NAME' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $NAME$TEMP2
echo ' xmlns:import="http://www.sci.kun.nl/woc/import"' >> $NAME$TEMP2
--- genlangxslts.pl DELETED ---
--- update.pl DELETED ---
--- woclist.pl DELETED ---
|
|
From: Egon W. <eg...@us...> - 2002-07-20 14:25:37
|
Update of /cvsroot/woc/woc/bin In directory usw-pr-cvs1:/tmp/cvs-serv23020/bin Added Files: .cvsignore Log Message: Made index scripts work. --- NEW FILE: .cvsignore --- Makefile Makefile.in |
|
From: Egon W. <eg...@us...> - 2002-07-20 14:25:37
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv23020
Modified Files:
configure.in
Log Message:
Made index scripts work.
Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** configure.in 20 Jul 2002 09:34:26 -0000 1.1
--- configure.in 20 Jul 2002 14:25:32 -0000 1.2
***************
*** 17,20 ****
--- 17,23 ----
bin/index/Makefile
bin/index/woclist.sh
+ bin/index/update.sh
+ bin/index/woclist.pl
+ bin/index/genlangxslts.pl
])
|
Update of /cvsroot/woc/woc/data/dadml/physicalprop/cml In directory usw-pr-cvs1:/tmp/cvs-serv1811 Added Files: 206-44-0.xml 208-96-8.xml 218-01-9.xml 2244-16-8.xml 22839-47-0.xml 2321-07-5.xml 2387-23-7.xml 24259-59-4.xml 25013-15-4.xml 25322-68-3.xml 259-79-0.xml 26140-60-3.xml 275-51-4.xml 277-10-1.xml 281-23-2.xml 287-92-3.xml 288-32-4.xml 289-95-2.xml 291-64-5.xml 299-42-3.xml 302-01-2.xml 305-84-0.xml 3178-22-1.xml 334-48-5.xml 334-88-3.xml 3458-28-4.xml 3615-56-3.xml 3724-65-0.xml Log Message: Adding more files. --- NEW FILE: 206-44-0.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="206-44-0" convention="DictOrgChem"> <!-- fluoranthene 98% --> <float title="BoilingPoint" units="degrees Celsius">384</float> <float title="MeltingPoint" units="degrees Celsius">107</float> <string title="Stoichiometry">C16H10</string> </molecule> --- NEW FILE: 208-96-8.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="208-96-8" convention="DictOrgChem"> <!-- acenaphthylene 99+% --> <float title="BoilingPoint" units="degrees Celsius">280</float> <float title="MeltingPoint" units="degrees Celsius">88</float> <string title="Stoichiometry">C12H8</string> </molecule> --- NEW FILE: 218-01-9.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="218-01-9" convention="DictOrgChem"> <!-- chrysene ca. 90-95% --> <float title="BoilingPoint" units="degrees Celsius">448</float> <float title="MeltingPoint" units="degrees Celsius">250</float> <string title="Stoichiometry">C18H12</string> </molecule> --- NEW FILE: 2244-16-8.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="2244-16-8" convention="DictOrgChem"> <!-- d-(+)-carvone 98%, natural --> <float title="BoilingPoint" units="degrees Celsius">98</float> <string title="Stoichiometry">C10H14O</string> <float title="Density" units="g/ml">0.965</float> </molecule> --- NEW FILE: 22839-47-0.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="22839-47-0" convention="DictOrgChem"> <float title="MeltingPoint" units="degrees Celsius">249</float> <string title="Stoichiometry">C14H18N2O5</string> <float title="MolecularWeight" units="g/mol">294.31</float> </molecule> --- NEW FILE: 2321-07-5.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="2321-07-5" convention="DictOrgChem"> <!-- fluorescein --> <float title="MeltingPoint" units="degrees Celsius">320</float> <string title="Stoichiometry">C20H12O5</string> </molecule> --- NEW FILE: 2387-23-7.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="2387-23-7" convention="DictOrgChem"> <!-- n,n'-dicyclohexylurea 98% --> <float title="MeltingPoint" units="degrees Celsius">232</float> <string title="Stoichiometry">C13H24N2O</string> </molecule> --- NEW FILE: 24259-59-4.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="24259-59-4" convention="DictOrgChem"> <string title="Stoichiometry">C5H10O5</string> </molecule> --- NEW FILE: 25013-15-4.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="25013-15-4" convention="DictOrgChem"> <!-- vinyltoluene, stabilized with 10 to 15 ppm p-tert-butylcatechol --> <float title="BoilingPoint" units="degrees Celsius">170</float> <string title="Stoichiometry">C9H10</string> <float title="Density" units="g/ml">0.89</float> </molecule> --- NEW FILE: 25322-68-3.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="25322-68-3" convention="DictOrgChem"> <!-- poly(ethylene oxide) ca. m.w.200.000 --> <float title="MeltingPoint" units="degrees Celsius">65</float> </molecule> --- NEW FILE: 259-79-0.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="259-79-0" convention="DictOrgChem"> <!-- biphenylene 99+% (gc) --> <float title="MeltingPoint" units="degrees Celsius">109</float> <string title="Stoichiometry">C12H8</string> </molecule> --- NEW FILE: 26140-60-3.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="26140-60-3" convention="DictOrgChem"> <string title="Stoichiometry">C18H14</string> <float title="MolecularWeight" units="g/mol"> 230.309</float> </molecule> --- NEW FILE: 275-51-4.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="275-51-4" convention="DictOrgChem"> <!-- azulene 99% --> <float title="BoilingPoint" units="degrees Celsius">242</float> <float title="MeltingPoint" units="degrees Celsius">99</float> <string title="Stoichiometry">C10H8</string> </molecule> --- NEW FILE: 277-10-1.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="277-10-1" convention="DictOrgChem"> <string title="Stoichiometry">C8H8</string> <float title="MolecularWeight" units="g/mol">104.15</float> </molecule> --- NEW FILE: 281-23-2.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="281-23-2" convention="DictOrgChem"> <float title="MeltingPoint" units="degrees Celsius">205</float> <string title="Stoichiometry">C10H16</string> </molecule> --- NEW FILE: 287-92-3.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="287-92-3" convention="DictOrgChem"> <float title="BoilingPoint" units="degrees Celsius">49.3</float> <float title="MeltingPoint" units="degrees Celsius">-93.8</float> <float title="Density" units="g/ml">0.745</float> <string title="Stoichiometry">C5H10</string> <float title="MolecularWeight" units="g/mol">70.134</float> </molecule> --- NEW FILE: 288-32-4.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="288-32-4" convention="DictOrgChem"> <!-- imidazole 99% --> <float title="BoilingPoint" units="degrees Celsius">255</float> <float title="MeltingPoint" units="degrees Celsius">88</float> <string title="Stoichiometry">C3H4N2</string> </molecule> --- NEW FILE: 289-95-2.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="289-95-2" convention="DictOrgChem"> <!-- pyrimidine 99% --> <float title="BoilingPoint" units="degrees Celsius">123</float> <float title="MeltingPoint" units="degrees Celsius">20</float> <string title="Stoichiometry">C4H4N2</string> <float title="Density" units="g/ml">1.016</float> </molecule> --- NEW FILE: 291-64-5.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="291-64-5" convention="DictOrgChem"> <!-- cycloheptane 99% --> <float title="BoilingPoint" units="degrees Celsius">118.400001525879</float> <float title="MeltingPoint" units="degrees Celsius">-12</float> <string title="Stoichiometry">C7H14</string> <float title="Density" units="g/ml">0.811</float> </molecule> --- NEW FILE: 299-42-3.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="299-42-3" convention="DictOrgChem"> <!-- (1r,2s)-(-)-ephedrine 98.5% --> <float title="MeltingPoint" units="degrees Celsius">37</float> <string title="Stoichiometry">C10H15NO</string> </molecule> --- NEW FILE: 302-01-2.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="302-01-2" convention="DictOrgChem"> <float title="BoilingPoint" units="degrees Celsius"> 386.7</float> <float title="MeltingPoint" units="degrees Celsius"> 274.5</float> <string title="Stoichiometry">H4N2</string> <float title="MolecularWeight" units="g/mol"> 32.045</float> </molecule> --- NEW FILE: 305-84-0.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="305-84-0" convention="DictOrgChem"> <!-- l-carnosine 98% --> <float title="MeltingPoint" units="degrees Celsius">253</float> <string title="Stoichiometry">C9H14N4O3</string> </molecule> --- NEW FILE: 3178-22-1.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="3178-22-1" convention="DictOrgChem"> <!-- tert-butylcyclohexane 99+% --> <float title="BoilingPoint" units="degrees Celsius">167</float> <float title="MeltingPoint" units="degrees Celsius">-41</float> <string title="Stoichiometry">C10H20</string> <float title="Density" units="g/ml">0.831</float> </molecule> --- NEW FILE: 334-48-5.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="334-48-5" convention="DictOrgChem"> <!-- decanoic acid (capric acid) 96% --> <float title="BoilingPoint" units="degrees Celsius">268</float> <float title="MeltingPoint" units="degrees Celsius">30</float> <string title="Stoichiometry">C10H20O2</string> <float title="Density" units="g/ml">0.893</float> </molecule> --- NEW FILE: 334-88-3.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="334-88-3" convention="DictOrgChem"> <float title="BoilingPoint" units="degrees Celsius">-23</float> <float title="MeltingPoint" units="degrees Celsius">-145</float> <string title="Stoichiometry">CH2N2</string> <float title="MolecularWeight" units="g/mol">42.040</float> </molecule> --- NEW FILE: 3458-28-4.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="3458-28-4" convention="DictOrgChem"> <!-- d-(+)-mannose 99+% --> <float title="MeltingPoint" units="degrees Celsius">128</float> <string title="Stoichiometry">C6H12O6</string> </molecule> --- NEW FILE: 3615-56-3.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="3615-56-3" convention="DictOrgChem"> <!-- d-(+)-sorbose 99% --> <float title="MeltingPoint" units="degrees Celsius">163</float> <string title="Stoichiometry">C8H12O6</string> </molecule> --- NEW FILE: 3724-65-0.xml --- <?xml-stylesheet type="text/xsl" href="http://www-woc.sci.kun.nl/data/dadml/fysisch/cml/cml.xsl" ?> <molecule id="3724-65-0" convention="DictOrgChem"> <!-- crotonic acid 98% --> <float title="BoilingPoint" units="degrees Celsius">180</float> <float title="MeltingPoint" units="degrees Celsius">71</float> <string title="Stoichiometry">C4H6O2</string> <float title="Density" units="g/ml">1.027</float> </molecule> |
|
From: Egon W. <eg...@us...> - 2002-07-20 12:43:51
|
Update of /cvsroot/woc/woc/data/dadml/physicalprop/cml In directory usw-pr-cvs1:/tmp/cvs-serv1197/cml Log Message: Directory /cvsroot/woc/woc/data/dadml/physicalprop/cml added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 12:38:55
|
Update of /cvsroot/woc/woc/data/dadml/physicalprop In directory usw-pr-cvs1:/tmp/cvs-serv32699/physicalprop Log Message: Directory /cvsroot/woc/woc/data/dadml/physicalprop added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 12:38:55
|
Update of /cvsroot/woc/woc/data/dadml/2d In directory usw-pr-cvs1:/tmp/cvs-serv32699/2d Log Message: Directory /cvsroot/woc/woc/data/dadml/2d added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 12:38:55
|
Update of /cvsroot/woc/woc/data/dadml/anim In directory usw-pr-cvs1:/tmp/cvs-serv32699/anim Log Message: Directory /cvsroot/woc/woc/data/dadml/anim added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 12:38:55
|
Update of /cvsroot/woc/woc/data/dadml/3d In directory usw-pr-cvs1:/tmp/cvs-serv32699/3d Log Message: Directory /cvsroot/woc/woc/data/dadml/3d added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 12:37:37
|
Update of /cvsroot/woc/woc/data/dadml In directory usw-pr-cvs1:/tmp/cvs-serv32252/dadml Log Message: Directory /cvsroot/woc/woc/data/dadml added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-20 09:34:31
|
Update of /cvsroot/woc/woc/bin In directory usw-pr-cvs1:/tmp/cvs-serv28345/bin Added Files: Makefile.am Log Message: Getting the system to work at home as well. Autotools will help system find tools it needs, like perl,sh etc. --- NEW FILE: Makefile.am --- PREFIX="@prefix@" SUBDIRS= index EXTRA_DIST= |
|
From: Egon W. <eg...@us...> - 2002-07-20 09:34:31
|
Update of /cvsroot/woc/woc/bin/index In directory usw-pr-cvs1:/tmp/cvs-serv28345/bin/index Modified Files: .cvsignore genlangxslts.pl Added Files: Makefile.am woclist.sh.in Removed Files: Makefile woclist.sh Log Message: Getting the system to work at home as well. Autotools will help system find tools it needs, like perl,sh etc. --- NEW FILE: Makefile.am --- bin_SCRIPTS = woclist.sh all: woclist.xml woclist.xml: woclist.sh clean: rm genindex.*.xsl rm makechemtrans.sh rm woclist.xml --- NEW FILE: woclist.sh.in --- #! @PATHTOSH@ -e # Author: Geert Josten NAME="woclist" EXT=".xml" TEMP=".tmp" TEMP2=".tmp2" WMLDIR="../../data/wml" # cmldir is in perl-stukje gedefinieerd cat `find $WMLDIR -name "*.xml"` > $NAME$TEMP echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > ! $NAME$TEMP2 echo '<\!DOCTYPE ITEM SYSTEM "../../lib/xml/dtd/'$NAME'.dtd">' >> $NAME$TEMP2 echo '<'$NAME' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $NAME$TEMP2 echo ' xmlns:import="http://www.sci.kun.nl/woc/import"' >> $NAME$TEMP2 echo ' xmlns:xlink="http://www.sci.kun.nl/woc/topicmap">' >> $NAME$TEMP2 awk "/\<ITEM/,/\<\/ITEM/{print}" $NAME$TEMP >> $NAME$TEMP2 echo '</'$NAME'>' >> $NAME$TEMP2 @PATHTOPERL@ $NAME.pl $NAME$TEMP2 $NAME$EXT rm $NAME$TEMP $NAME$TEMP2 chgrp wwwwoc $NAME$EXT chmod 664 $NAME$EXT Index: .cvsignore =================================================================== RCS file: /cvsroot/woc/woc/bin/index/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** .cvsignore 19 Jul 2002 12:19:56 -0000 1.1 --- .cvsignore 20 Jul 2002 09:34:26 -0000 1.2 *************** *** 1,2 **** --- 1,5 ---- + Makefile + Makefile.in + woclist.sh woclist.xml makechemtrans.sh Index: genlangxslts.pl =================================================================== RCS file: /cvsroot/woc/woc/bin/index/genlangxslts.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** genlangxslts.pl 19 Jul 2002 12:41:15 -0000 1.2 --- genlangxslts.pl 20 Jul 2002 09:34:26 -0000 1.3 *************** *** 1,3 **** ! #! /usr/local/bin/perl -w use strict; use diagnostics; --- 1,3 ---- ! #! perl -w use strict; use diagnostics; --- Makefile DELETED --- --- woclist.sh DELETED --- |
|
From: Egon W. <eg...@us...> - 2002-07-20 09:34:31
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv28345
Modified Files:
.cvsignore
Added Files:
AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS VERSION
bootstrap configure.in install-sh missing mkinstalldirs
Log Message:
Getting the system to work at home as well.
Autotools will help system find tools it needs, like
perl,sh etc.
--- NEW FILE: AUTHORS ---
The WOC team members:
Egon Willighagen (team leader)
Geert Josten
Micha Fleuren
Old members:
Bart
--- NEW FILE: COPYING ---
Copyright 1996-2002 The WOC team (see Authors)
All scripts/programs and every other file, including
all documentation and data files, is licenced with
the GNU Public License v2.
--- NEW FILE: ChangeLog ---
version 3.0
-----------
* makes use of autotools to find required tools
--- NEW FILE: INSTALL ---
--- NEW FILE: Makefile.am ---
PREFIX="@prefix@"
SUBDIRS= bin
EXTRA_DIST= \
VERSION \
README \
catalog
--- NEW FILE: NEWS ---
--- NEW FILE: VERSION ---
3.0
--- NEW FILE: bootstrap ---
#! /bin/sh -e
# bootstrap this software
aclocal && automake --verbose --gnu && autoconf
--- NEW FILE: configure.in ---
dnl
dnl $Id: configure.in,v 1.1 2002/07/20 09:34:26 egonw Exp $
dnl
AC_INIT()
AM_INIT_AUTOMAKE(woc, `cat VERSION`)
dnl checking for script tools
AC_PATH_PROGS(PATHTOPERL, perl, no)
AC_PATH_PROGS(PATHTOSH, sh bash, no)
dnl checking for XML tools
AC_PATH_PROGS(PATHTOXSLTPROC, xsltproc, no)
AC_OUTPUT([
Makefile
bin/Makefile
bin/index/Makefile
bin/index/woclist.sh
])
--- NEW FILE: install-sh ---
#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
#
# Copyright 1991 by the Massachusetts Institute of Technology
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of M.I.T. not be used in advertising or
# publicity pertaining to distribution of the software without specific,
# written prior permission. M.I.T. makes no representations about the
# suitability of this software for any purpose. It is provided "as is"
# without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs.
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""
while [ x"$1" != x ]; do
case $1 in
-c) instcmd="$cpprog"
shift
continue;;
-d) dir_arg=true
shift
continue;;
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
-s) stripcmd="$stripprog"
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
shift
continue;;
*) if [ x"$src" = x ]
then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done
if [ x"$src" = x ]
then
echo "install: no input file specified"
exit 1
else
true
fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
if [ -d $dst ]; then
instcmd=:
chmodcmd=""
else
instcmd=mkdir
fi
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
then
true
else
echo "install: $src does not exist"
exit 1
fi
if [ x"$dst" = x ]
then
echo "install: no destination specified"
exit 1
else
true
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ]
then
dst="$dst"/`basename $src`
else
true
fi
fi
## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
pathcomp="${pathcomp}${1}"
shift
if [ ! -d "${pathcomp}" ] ;
then
$mkdirprog "${pathcomp}"
else
true
fi
pathcomp="${pathcomp}/"
done
fi
if [ x"$dir_arg" != x ]
then
$doit $instcmd $dst &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
# If we're going to rename the final executable, determine the name now.
if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
true
fi
# Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
$doit $instcmd $src $dsttmp &&
trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
$doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
exit 0
--- NEW FILE: missing ---
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
# Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pi...@ir...>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
run=:
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
;;
esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case "$1" in
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing 0.2 - GNU automake"
;;
-*)
echo 1>&2 "$0: Unknown \`$1' option"
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`configure.in'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`configure.in'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`configure.in'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
esac
done
touch $touch_files
;;
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
while read f; do touch "$f"; done
;;
bison|yacc)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
makeinfo)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
fi
touch $file
;;
tar)
shift
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
fi
# we have already tried tar in the generic part
gnutar ${1+"$@"} && exit 0
gtar ${1+"$@"} && exit 0
firstarg="$1"
if shift; then
case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" ${1+"$@"} && exit 0
;;
esac
case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" ${1+"$@"} && exit 0
;;
esac
fi
echo 1>&2 "\
WARNING: I can't seem to be able to run \`tar' with the given arguments.
You may want to install GNU tar or Free paxutils, or check the
command line arguments."
exit 1
;;
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
;;
esac
exit 0
--- NEW FILE: mkinstalldirs ---
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <fri...@pr...>
# Created: 1993-05-16
# Public domain
# $Id: mkinstalldirs,v 1.1 2002/07/20 09:34:26 egonw Exp $
errstatus=0
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
fi
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus
# mkinstalldirs ends here
Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore 8 Jun 2002 19:47:56 -0000 1.1
--- .cvsignore 20 Jul 2002 09:34:26 -0000 1.2
***************
*** 1 ****
--- 1,6 ----
+ Makefile
+ Makefile.in
+ config.*
+ configure
+ aclocal.m4
web-docs
|
|
From: Egon W. <eg...@us...> - 2002-07-19 12:41:18
|
Update of /cvsroot/woc/woc/bin/index In directory usw-pr-cvs1:/tmp/cvs-serv15968 Modified Files: Makefile genlangxslts.pl makechemtrans.sh update.pl woclist.sh Log Message: Changes to get it to work in new dir system. Index: Makefile =================================================================== RCS file: /cvsroot/woc/woc/bin/index/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile 19 Jul 2002 12:19:57 -0000 1.1 --- Makefile 19 Jul 2002 12:41:15 -0000 1.2 *************** *** 1,3 **** --- 1,9 ---- + all: woclist.xml + + woclist.xml: + woclist.sh + clean: rm genindex.*.xsl rm makechemtrans.sh + rm woclist.xml Index: genlangxslts.pl =================================================================== RCS file: /cvsroot/woc/woc/bin/index/genlangxslts.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** genlangxslts.pl 19 Jul 2002 12:19:57 -0000 1.1 --- genlangxslts.pl 19 Jul 2002 12:41:15 -0000 1.2 *************** *** 56,60 **** open(OUTPUT, ">makechemtrans.sh"); ! print OUTPUT "#!/usr/local/bin/tcsh -f$/$/"; print OUTPUT "# This script is autogenerated with genlangxslts.pl! Do not edit!$/$/"; print OUTPUT "setenv all \""; --- 56,60 ---- open(OUTPUT, ">makechemtrans.sh"); ! print OUTPUT "#!/usr/local/bin/tcsh -f$/"; print OUTPUT "# This script is autogenerated with genlangxslts.pl! Do not edit!$/$/"; print OUTPUT "setenv all \""; *************** *** 68,71 **** print OUTPUT "\"$/$/"; print OUTPUT "update.pl noxml \$all$/"; ! ! --- 68,70 ---- print OUTPUT "\"$/$/"; print OUTPUT "update.pl noxml \$all$/"; ! `chmod 755 makechemtrans.sh` Index: makechemtrans.sh =================================================================== RCS file: /cvsroot/woc/woc/bin/index/makechemtrans.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** makechemtrans.sh 19 Jul 2002 12:19:57 -0000 1.1 --- makechemtrans.sh 19 Jul 2002 12:41:15 -0000 1.2 *************** *** 1,4 **** #!/usr/local/bin/tcsh -f - # This script is autogenerated with genlangxslts.pl! Do not edit! --- 1,3 ---- Index: update.pl =================================================================== RCS file: /cvsroot/woc/woc/bin/index/update.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** update.pl 19 Jul 2002 12:19:57 -0000 1.1 --- update.pl 19 Jul 2002 12:41:15 -0000 1.2 *************** *** 2,13 **** setenv name "woclist" ! setenv baseuri "http://www.sci.kun.nl/woc/gui/index" ! setenv htmldir "/vol/www/woc/web-docs/gui/index" ! setenv datadir "/vol/www/woc/bin/index" ! setenv jarsdir "/vol/www/woc/cgi-bin/jars" ! setenv all "index.abbrev index.bruto index.DE-NL index.DE-EN index.EN-DE index.EN-NL \ ! index.NL-DE index.NL-EN index.nl index.enum index.vnnum \ ! index.smiles2cas index.cas2smiles index.FR-NL index.IT-NL index.FR-EN \ ! index.IT-EN" if ($1 == '') then --- 2,14 ---- setenv name "woclist" ! setenv baseuri "http://www-woc.sci.kun.nl/gui/index" ! setenv htmldir "../../web-docs/gui/index" ! setenv datadir "." ! ! # The default makes all indices except for the pages ! # translating words XX-XX. Those are done with the ! # script makechemtrans.pl. ! setenv all "index.abbrev index.bruto index.nl index.enum index.vnnum \ ! index.smiles2cas index.cas2smiles " if ($1 == '') then Index: woclist.sh =================================================================== RCS file: /cvsroot/woc/woc/bin/index/woclist.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** woclist.sh 19 Jul 2002 12:19:57 -0000 1.1 --- woclist.sh 19 Jul 2002 12:41:15 -0000 1.2 *************** *** 5,9 **** setenv temp ".tmp" setenv temp2 ".tmp2" ! setenv wmldir "/vol/www/woc/data/wml" # cmldir is in perl-stukje gedefinieerd --- 5,9 ---- setenv temp ".tmp" setenv temp2 ".tmp2" ! setenv wmldir "../../data/wml" # cmldir is in perl-stukje gedefinieerd *************** *** 12,16 **** echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > ! $name$temp2 ! echo '<\!DOCTYPE ITEM SYSTEM "../../data/dtd/'$name'.dtd">' >> $name$temp2 echo '<'$name' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $name$temp2 echo ' xmlns:import="http://www.sci.kun.nl/woc/import"' >> $name$temp2 --- 12,16 ---- echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > ! $name$temp2 ! echo '<\!DOCTYPE ITEM SYSTEM "../../lib/xml/dtd/'$name'.dtd">' >> $name$temp2 echo '<'$name' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $name$temp2 echo ' xmlns:import="http://www.sci.kun.nl/woc/import"' >> $name$temp2 |
|
From: Egon W. <eg...@us...> - 2002-07-19 12:20:01
|
Update of /cvsroot/woc/woc/bin/index
In directory usw-pr-cvs1:/tmp/cvs-serv6791/index
Added Files:
.cvsignore Makefile genlangxslts.pl index.abbrev.xsl
index.bruto.xsl index.cas2smiles.xsl index.en.xsl
index.enum.xsl index.nl.xsl index.vnnum.xsl makechemtrans.sh
templindex.XX-XX.xsl update.pl woclist.pl woclist.sh
Log Message:
Added system to make index pages.
--- NEW FILE: .cvsignore ---
woclist.xml
makechemtrans.sh
genindex.*.xsl
--- NEW FILE: Makefile ---
clean:
rm genindex.*.xsl
rm makechemtrans.sh
--- NEW FILE: genlangxslts.pl ---
#! /usr/local/bin/perl -w
use strict;
use diagnostics;
my %langs = (
"NL" => {
"EN" => "Dutch",
"NL" => "Nederlands",
},
"EN" => {
"EN" => "English",
"NL" => "Engels",
},
"DE" => {
"EN" => "German",
"NL" => "Duits",
},
"IT" => {
"EN" => "Italian",
"NL" => "Italiaans",
},
"FR" => {
"EN" => "French",
"NL" => "Frans",
},
"ES" => {
"EN" => "Spanish",
"NL" => "Spaans",
},
"LA" => {
"EN" => "Latin",
"NL" => "Latijn",
},
"FY" => {
"EN" => "Frysian",
"NL" => "Fries",
},
);
foreach my $from (keys(%langs)) {
foreach my $to (keys(%langs)) {
print "$from -> $to$/";
open(INPUT, "<templindex.XX-XX.xsl");
open(OUTPUT, ">genindex.$from-$to.xsl");
while(<INPUT>) {
s/#FROM#/$from/;
s/#TO#/$to/;
print OUTPUT;
}
}
}
open(OUTPUT, ">makechemtrans.sh");
print OUTPUT "#!/usr/local/bin/tcsh -f$/$/";
print OUTPUT "# This script is autogenerated with genlangxslts.pl! Do not edit!$/$/";
print OUTPUT "setenv all \"";
foreach my $from (keys(%langs)) {
foreach my $to (keys(%langs)) {
if ($from ne $to) {
print OUTPUT "genindex.$from-$to \\$/";
}
}
}
print OUTPUT "\"$/$/";
print OUTPUT "update.pl noxml \$all$/";
--- NEW FILE: index.abbrev.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Afkortingen");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM/DICT/ABBREV">
<xsl:sort />
<tr>
<td class="main"><xsl:value-of select="."/></td>
<xsl:choose>
<xsl:when test="../NAME/LANG[@ID='NL']">
<td class="main">
<a href="http://www.sci.kun.nl/woc/gui/items/{../../@FILE}.shtml">
<xsl:value-of select="../NAME/LANG[@ID='NL']"/></a>
</td>
</xsl:when>
<xsl:otherwise>
<td class="main">
<a href="http://www.sci.kun.nl/woc/gui/items/{../../@FILE}.shtml">
<xsl:value-of select="../../@NAME"/></a>
</td>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:for-each>
</table>
</xsl:template>
<!-- Poging A, B, C, etc.. voor de delen te zetten
xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'A'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'B'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'C'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'D'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'E'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'F'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'G'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'H'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'I'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'J'"/>
</xsl:call-template>
<xsl:call-template name="letter-deel">
<xsl:with-param name="letter" select="'K'"/>
</xsl:call-template>
</table>
</xsl:template>
<xsl:template name="letter-deel">
<xsl:param name="letter" select="."/>
<H3><xsl:value-of select="$letter"/></H3>
<xsl:for-each select="ITEM/DICT/ABBREV[starts-with(string(),$letter)]">
<xsl:sort />
<tr>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../../@FILE}.shtml"><xsl:value-of select="."/></a></td>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../../@FILE}.shtml"><xsl:value-of select="../NAME/LANG[@ID='NL']"/></a></td>
</tr>
</xsl:for-each>
</xsl:template-->
</xsl:stylesheet>
--- NEW FILE: index.bruto.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- xsl:output mode="html"/ -->
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Bruto Formule lijst");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist"/>
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM/molecule/string[@title='StoichiometryID']">
<xsl:sort select="."/>
<tr>
<td class="main"><xsl:apply-templates select="../string[@title='Stoichiometry']"/></td>
<td class="main">
<a href="http://www.sci.kun.nl/woc/gui/items/{../../@FILE}.shtml">
<xsl:value-of select="../../@NAME" /></a></td>
</tr>
</xsl:for-each>
</table>
</xsl:template>
<xsl:template match="sub">
<sub><xsl:apply-templates /></sub>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: index.cas2smiles.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Nederlands-Engels");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="NAME">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM">
<xsl:sort select="INDEX[@CLASS='CAS-NUMBER']"/>
<xsl:for-each select="INDEX[@CLASS='CAS-NUMBER']">
<xsl:if test=".">
<tr>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../@FILE}.shtml"><xsl:value-of select="."/></a></td>
<td class="main"><xsl:value-of select="../INDEX[@CLASS='SMILES']"/></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: index.en.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Afkortingen");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="//LANG[@ID='EN']">
<xsl:sort select="."/>
<tr>
<td class="main">
<a href="http://www.sci.kun.nl/woc/gui/items/{../../../@FILE}.shtml"><xsl:value-of select="."/></a>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: index.enum.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xsl:version="1.0">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Nederlands-Engels");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="NAME">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM">
<xsl:sort select="INDEX[@CLASS='E-NUMBER']"/>
<xsl:for-each select="INDEX[@CLASS='E-NUMBER']">
<xsl:if test=".">
<tr>
<td class="main"><xsl:text>E</xsl:text><xsl:value-of select="."/></td>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../@FILE}.shtml"><xsl:value-of select="../@NAME"/></a></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: index.nl.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Afkortingen");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="//LANG[@ID='NL']">
<xsl:sort select="."/>
<tr>
<td class="main">
<a href="http://www.sci.kun.nl/woc/gui/items/{../../../@FILE}.shtml"><xsl:value-of select="."/></a>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: index.vnnum.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output mode="html"/>
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
<script src="gui/javascript/isframe.js"></script>
<script src="gui/javascript/browsertest.js"></script>
<script src="gui/javascript/location.js"></script>
<script><xsl:comment>
setLocation("Nederlands-Engels");
// </xsl:comment>
</script>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="NAME">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM">
<xsl:sort select="INDEX[@CLASS='UN-NUMBER']"/>
<xsl:for-each select="INDEX[@CLASS='UN-NUMBER']">
<xsl:if test=".">
<tr>
<td class="main">UN <xsl:value-of select="."/></td>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../@FILE}.shtml"><xsl:value-of select="../@NAME"/></a></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: makechemtrans.sh ---
#!/usr/local/bin/tcsh -f
# This script is autogenerated with genlangxslts.pl! Do not edit!
setenv all "genindex.EN-FR \
genindex.EN-ES \
genindex.EN-DE \
genindex.EN-NL \
genindex.EN-IT \
genindex.EN-LA \
genindex.EN-FY \
genindex.FR-EN \
genindex.FR-ES \
genindex.FR-DE \
genindex.FR-NL \
genindex.FR-IT \
genindex.FR-LA \
genindex.FR-FY \
genindex.ES-EN \
genindex.ES-FR \
genindex.ES-DE \
genindex.ES-NL \
genindex.ES-IT \
genindex.ES-LA \
genindex.ES-FY \
genindex.DE-EN \
genindex.DE-FR \
genindex.DE-ES \
genindex.DE-NL \
genindex.DE-IT \
genindex.DE-LA \
genindex.DE-FY \
genindex.NL-EN \
genindex.NL-FR \
genindex.NL-ES \
genindex.NL-DE \
genindex.NL-IT \
genindex.NL-LA \
genindex.NL-FY \
genindex.IT-EN \
genindex.IT-FR \
genindex.IT-ES \
genindex.IT-DE \
genindex.IT-NL \
genindex.IT-LA \
genindex.IT-FY \
genindex.LA-EN \
genindex.LA-FR \
genindex.LA-ES \
genindex.LA-DE \
genindex.LA-NL \
genindex.LA-IT \
genindex.LA-FY \
genindex.FY-EN \
genindex.FY-FR \
genindex.FY-ES \
genindex.FY-DE \
genindex.FY-NL \
genindex.FY-IT \
genindex.FY-LA \
"
update.pl noxml $all
--- NEW FILE: templindex.XX-XX.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xsl:version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/">
<html>
<head>
<base href="http://www.sci.kun.nl/woc/"/>
<link rel="stylesheet" href="http://www.sci.kun.nl/woc/gui/styles/woc.css" type="text/css"/>
</head>
<body class="main">
<hr/>
<xsl:apply-templates select="woclist" />
<hr/>
</body>
</html>
</xsl:template>
<xsl:template match="NAME">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="woclist">
<table border="0" celpadding="0" cellspacing="0" width="100%">
<xsl:for-each select="ITEM/DICT/NAME">
<xsl:sort select="LANG[@ID='#FROM#']"/>
<xsl:for-each select="LANG[@ID='#FROM#']">
<xsl:if test="../LANG[@ID='#TO#']">
<tr>
<td class="main"><xsl:value-of select="."/></td>
<td class="main"><a href="http://www.sci.kun.nl/woc/gui/items/{../../../@FILE}.shtml"><xsl:value-of select="../LANG[@ID='#TO#']"/></a></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</table>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE: update.pl ---
#!/usr/local/bin/tcsh -f
setenv name "woclist"
setenv baseuri "http://www.sci.kun.nl/woc/gui/index"
setenv htmldir "/vol/www/woc/web-docs/gui/index"
setenv datadir "/vol/www/woc/bin/index"
setenv jarsdir "/vol/www/woc/cgi-bin/jars"
setenv all "index.abbrev index.bruto index.DE-NL index.DE-EN index.EN-DE index.EN-NL \
index.NL-DE index.NL-EN index.nl index.enum index.vnnum \
index.smiles2cas index.cas2smiles index.FR-NL index.IT-NL index.FR-EN \
index.IT-EN"
if ($1 == '') then
echo "Usage: update.pl [web] all"
echo "Usage: update.pl [web] [noxml] <index-name> ..."
else
if ($1 == 'web') then
echo "Content-type: text/html"
echo ""
shift
endif
if ($1 == 'all') then
shift
update.pl $* $all
else
if ($1 == 'noxml') then
shift
else
echo "Creating new $datadir/$name.xml..."
$datadir/$name.sh
endif
foreach index ($*)
echo "Parsing $datadir/$name.xml against $datadir/$index.xsl..."
xsltproc $datadir/$index.xsl $datadir/$name.xml > ! $htmldir/$index.html
chmod 664 $htmldir/$index.html
chgrp wwwwoc $htmldir/$index.html
end
echo "Done!"
endif
endif
unsetenv name baseuri htmldir datadir jarsdir all
--- NEW FILE: woclist.pl ---
# hulp-script gebruikt door wocml.sh
my $cmldir="/vol/www/woc/web-docs/data/dadml/fysisch/cml";
my $infile;
my $outfile;
if (@ARGV >= 2) {
$infile = shift;
$outfile = shift;
} else {
$infile = "woclist.tmp2.xml";
$outfile = "woclist.xml";
}
open (INFILE, "$infile");
open (OUTFILE, ">$outfile");
#print eerste regel alvast
$_ = <INFILE>; print OUTFILE;
while (<INFILE>) {
my $file;
if (/ITEM.*?CODE=/i) {
s/CODE/FILE/i;
print OUTFILE;
} elsif (/INSERT.*PhysicalProperties.*>(.*)</i) {
my @inserts = `awk '/<molecule/,/<\\/molecule/{print " ",\$0}' $cmldir/$1`;
foreach my $insert (@inserts) {
if ($insert =~ /^(.*Stoichiometry.*>)(.*)(<.*)$/i) {
my $pre = $1;
my $bruto = $2;
my $brutoID = $2;
my $post = $3;
$bruto =~ s/(\d+)/<sub>$1<\/sub>/ig;
print OUTFILE $pre,$bruto,$post,$/;
$pre =~ s/Stoichiometry/StoichiometryID/i;
$brutoID =~ s/(\d+)/{$1}/ig;
while ($brutoID =~ /\{(\d+?)\}/) {
my $number = sprintf "%04i", $1;
$brutoID =~ s/\{\d+?\}/$number/;
}
print OUTFILE $pre,$brutoID,$post,$/;
} else {
print OUTFILE $insert;
}
}
} elsif (/\<\?xml.*\?\>/i) {
s/\<\?xml.*\?\>//i;
print OUTFILE;
} else {
print OUTFILE;
}
}
# zoals in Convert.java
sub NAMELikeToANCHORLike {
# heeft 1 parameter
my $param = shift @_;
$param =~ s/^\s*(.*?)\s*$/$1/ig;
$param =~ s/\ /\_/g;
$param =~ s/[,|.|<|>]//g;
$param =~ tr/[A-Z]/[a-z]/;
return $param;
}
--- NEW FILE: woclist.sh ---
#!/usr/bin/tcsh -f
setenv name "woclist"
setenv ext ".xml"
setenv temp ".tmp"
setenv temp2 ".tmp2"
setenv wmldir "/vol/www/woc/data/wml"
# cmldir is in perl-stukje gedefinieerd
cat $wmldir/*.xml > ! $name$temp
echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > ! $name$temp2
echo '<\!DOCTYPE ITEM SYSTEM "../../data/dtd/'$name'.dtd">' >> $name$temp2
echo '<'$name' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $name$temp2
echo ' xmlns:import="http://www.sci.kun.nl/woc/import"' >> $name$temp2
echo ' xmlns:xlink="http://www.sci.kun.nl/woc/topicmap">' >> $name$temp2
awk "/\<ITEM/,/\<\/ITEM/{print}" $name$temp >> $name$temp2
echo '</'$name'>' >> $name$temp2
perl $name.pl $name$temp2 $name$ext
rm $name$temp $name$temp2
chgrp wwwwoc $name$ext
chmod 664 $name$ext
|
|
From: Egon W. <eg...@us...> - 2002-07-19 11:52:13
|
Update of /cvsroot/woc/woc/bin/index In directory usw-pr-cvs1:/tmp/cvs-serv29512/index Log Message: Directory /cvsroot/woc/woc/bin/index added to the repository |
|
From: Egon W. <eg...@us...> - 2002-07-19 10:56:08
|
Update of /cvsroot/woc/woc/bin/topic
In directory usw-pr-cvs1:/tmp/cvs-serv7119/topic
Added Files:
.cvsignore make_associations_index.pl make_shtmlfiles_index.pl
make_xmlfiles_index.pl topic2html.pl update.sh
Log Message:
Added topic map progs.
--- NEW FILE: .cvsignore ---
*_index
--- NEW FILE: make_associations_index.pl ---
#!/usr/local/bin/perl -w
use strict;
use diagnostics;
if (!-e "associaties.xml") {
print "The file associaties.xml does not exist!$/";
exit(0);
}
open(SOURCE, "<associaties.xml");
my @source = <SOURCE>;
close(SOURCE);
open(TARGET, ">associations_index");
while (@source) {
while (@source && $source[0] !~ /<topic/i) {
shift @source;
}
my $at = "";
$at = $1 if (@source && $source[0] =~ /id="(.*?)"/i);
my $name = "";
while (@source && !($source[0] =~ /<\/topic/i || $source[0] =~ /<topic.*?\/>/i)) {
$name = $1 if ($source[0] =~ /<basename>(.*?)<\/basename>/i);
$name =~ s/<woctm:assocrl\senum="(.*?)"\/>/\$$1\$/g;
$name =~ s/<woctm:assocrl\senum="/\$/g;
shift @source;
}
print TARGET "$at $name\n" if ($at && $name);
shift @source;
}
close(TARGET);
--- NEW FILE: make_shtmlfiles_index.pl ---
#!/usr/local/bin/perl -w
use strict;
my $wmldir = "/vol/www/woc/web-docs/gui/items";
my @files = `ls -1 $wmldir/*.shtml`;#<$wmldir/*.shtml>;
my $filename = "";
my @file = ();
my $itemname = "";
open(TARGET, ">shtmlfiles_index");
foreach $filename (@files) {
chomp ($filename);
open(FILE, "<$filename");
@file = <FILE>;
while (@file && $file[0] !~ /<a class="item" name=/i) {
shift @file;
}
$itemname = "";
$itemname = $1 if (@file && $file[0] =~ />([^>]*?)<\/B><\/a>/i);
print TARGET "$filename $itemname\n" if ($itemname);
}
--- NEW FILE: make_xmlfiles_index.pl ---
#!/usr/local/bin/perl -w
use strict;
my $wmldir = "/vol/www/woc/data/wml";
my @files = <$wmldir/*.xml>;
my $filename = "";
my @file = ();
my $itemname = "";
open(TARGET, ">associations_index");
foreach $filename (@files) {
open(FILE, "<$filename");
@file = <FILE>;
while (@file && $file[0] !~ /<ITEM/i) {
shift @file;
}
$itemname = "";
$itemname = $1 if (@file && $file[0] =~ /NAME="(.*?)"/i);
print "$filename $itemname\n" if ($itemname);
}
--- NEW FILE: topic2html.pl ---
#!/usr/local/bin/perl -w
use strict;
## global vars ##
my $associations_indexfile = "associations_index";
my $xmlfiles_indexfile = "xmlfiles_index";
my $shtmlfiles_indexfile = "shtmlfiles_index";
my $wmldir = "/vol/www/woc/data/wml";
my $verbose = ""; # False
my $debug = ""; # False
### MAIN ###
print "Content-type: text/plain\n\n\n";
my $associations_index = {()};
my $xmlfiles_index = {()};
my $shtmlfiles_index = {()};
if (@ARGV) {
while ($ARGV[0] =~ /^\-/) {
if ($ARGV[0] =~ /^\-d/i) {
$debug = "Active";
shift @ARGV;
}
if ($ARGV[0] =~ /^\-v/i) {
$verbose = "Active";
shift @ARGV;
}
}
$associations_index = &get_associations_index ($associations_indexfile);
$xmlfiles_index = &get_xmlfiles_index ($xmlfiles_indexfile);
$shtmlfiles_index = &get_shtmlfiles_index ($shtmlfiles_indexfile);
foreach my $file (@ARGV) {
&process_file ("$wmldir/$file", $associations_index, $xmlfiles_index, $shtmlfiles_index);
}
} else {
die "Usage: $0 [-v[erbose]] [-d[ebug]] <xml-files>\n";
}
### END of MAIN ###
sub get_associations_index {
my %associations_index = ();
if (open (INDEXFILE, $_[0])) {
my @indexfile = <INDEXFILE>;
foreach my $line (@indexfile) {
my ($assoc, @line) = split (/\s+/, $line);
$associations_index{$assoc} = join (" ", @line);
}
} else {
warn "The associations indexfile $_[0] cannot be read!\n";
}
return \%associations_index;
}
sub get_xmlfiles_index {
my %xmlfiles_index = ();
if (open (INDEXFILE, $_[0])) {
my @indexfile = <INDEXFILE>;
foreach my $line (@indexfile) {
my ($xmlfile, @name) = split (/\s+/, $line);
$xmlfiles_index{join (" ", @name)} = $xmlfile;
}
} else {
warn "The xmlfiles indexfile $_[0] cannot be read!\n";
}
return \%xmlfiles_index;
}
sub get_shtmlfiles_index {
my %shtmlfiles_index = ();
if (open (INDEXFILE, $_[0])) {
my @indexfile = <INDEXFILE>;
foreach my $line (@indexfile) {
my ($shtmlfile, @name) = split (/\s+/, $line);
$shtmlfiles_index{join (" ", @name)} = $shtmlfile;
}
} else {
warn "The shtmlfiles indexfile $_[0] cannot be read!\n";
}
return \%shtmlfiles_index;
}
sub process_file {
my ($file, $associations_index, $xmlfiles_index, $shtmlfiles_index) = @_;
## get topicname and associations ##
my $topicname = "";
my $associations = [];
if (open (XMLFILE, $_[0])) {
my @xmlfile = <XMLFILE>;
while (@xmlfile && $xmlfile[0] !~ /<ITEM/i) {
shift @xmlfile;
print "current line=$xmlfile[0]" if $debug;
}
$topicname = $1 if (@xmlfile && $xmlfile[0] =~ /NAME="(.+?)"/i);
while (@xmlfile) {
while (@xmlfile && $xmlfile[0] !~ /<tm:assoc\s/i) {
shift @xmlfile;
print "current line=$xmlfile[0]" if $debug && @xmlfile;
}
my $assoc = "";
if (@xmlfile && $xmlfile[0] =~ /id="(.+?)"/i) {
$assoc = $1;
print "Found association=$1\n" if $verbose;
}
shift @xmlfile if @xmlfile;
print "current line=$xmlfile[0]" if $debug && @xmlfile;
## get all associated files! ##
my @assocrl = ();
while (@xmlfile && $xmlfile[0] !~ /<\/tm:assoc>/i) {
while (@xmlfile && $xmlfile[0] !~ /<\/tm:assoc>/i && $xmlfile[0] !~ /<tm:assocrl\s/i) {
shift @xmlfile;
print "current line=$xmlfile[0]" if $debug;
}
if (@xmlfile && $xmlfile[0] =~ /xlink:href="(.+?)"/i) {
push (@assocrl, $1);
print "Found assoclink=$1\n" if $verbose;
} else {
print "No assoclink??\n" if $verbose && @xmlfile;
}
if (@xmlfile && $xmlfile[0] !~ /<\/tm:assoc>/i){
shift @xmlfile;
print "current line=$xmlfile[0]" if $debug;
}
}
if ($assoc && @assocrl) {
push (@$associations, [$assoc, \@assocrl]);
print "Pussing assoc=$assoc @assocrl\n" if $verbose;
} else {
print "Was last association\n" if $verbose && !@xmlfile;
}
}
} else {
warn "The xmlfile $_[0] cannot be read!\n";
}
## turn associations into HTML ##
my @result = ();
foreach my $assoc (@$associations) {
my $association = ($$associations_index{$$assoc[0]} || "");
print "Assoc: $association$/" if $debug;
if ($association =~ /\$.*?\$/) {
my @related_topics = @{$$assoc[1]};
my @related_files = ();
foreach my $related_topic (@related_topics) {
if (exists $$shtmlfiles_index{$related_topic}) {
push (@related_files, $$shtmlfiles_index{$related_topic});
} else {
push (@related_files, "");
}
}
$association =~ s/\$0\$/<I>$topicname<\/I>/g;
if ($association =~ /\$\*\$/) {
print "Substitute \*...$/" if $verbose;
while (@related_files) {
my $related_file = shift @related_files;
my $related_topic = shift @related_topics;
my $delim = ",";
$delim = " en" if (scalar @related_files == 1);
$delim = "" if (scalar @related_files == 0);
if ($related_file) {
# add link #
$related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
$association =~ s/\$\*\$/ <A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file+$$assoc[0]\"><I>$related_topic<\/I><\/A>$delim\$\*\$/g;
} else {
# don't link #
$association =~ s/\$\*\$/ <I>$related_topic<\/I>\$\*\$/g;
}
}
print "New Assoc: $association$/" if $verbose;
}
$association =~ s/\$\*\$//g;
my $i = 1;
while ($association =~ /\$$i\$/) {
my $related_file = shift @related_files;
my $related_topic = shift @related_topics;
if ($related_file) {
# add link #
$related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
$association =~ s/\$$i\$/<A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic<\/I><\/A>/g;
} else {
# don't link #
$association =~ s/\$$i\$/<I>$related_topic<\/I>/g;
}
$association =~ s/\$$i\$/<I>$topicname<\I>/g;
$i++
}
push (@result, "$association<BR />\n");
} elsif ($association) {
my @related_topics = @{$$assoc[1]};
my @related_files = ();
foreach my $related_topic (@related_topics) {
if (exists $$shtmlfiles_index{$related_topic}) {
push (@related_files, $$shtmlfiles_index{$related_topic});
} else {
push (@related_files, "");
}
}
push (@result, "<I>$topicname</I> $association");
my $related_file = shift @related_files;
my $related_topic = shift @related_topics;
if ($related_file) {
# add link #
$related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
push (@result, " <A HREF=\"/cgi-bin-woc/topiclink/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
} else {
# don't link #
push (@result, " <I>$related_topic</I>");
}
while (@related_files) {
my $related_file = shift @related_files;
my $related_topic = shift @related_topics;
if (@related_files > 0) {
if ($related_file) {
# add link #
$related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
push (@result, ", <A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
} else {
# don't link #
push (@result, ", <I>$related_topic</I>");
}
} elsif (@related_files == 0) {
if ($related_file) {
# add link #
$related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
push (@result, " en <A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
} else {
# don't link #
push (@result, " en <I>$related_topic</I>");
}
}
}
push (@result, "<BR />\n");
}
}
foreach (@result) {
print;
}
}
--- NEW FILE: update.sh ---
./make_xmlfiles_index.pl > xmlfiles_index
./make_shtmlfiles_index.pl
./make_associations_index.pl
|
|
From: Egon W. <eg...@us...> - 2002-07-19 10:53:22
|
Update of /cvsroot/woc/woc/bin/topic In directory usw-pr-cvs1:/tmp/cvs-serv6205/topic Log Message: Directory /cvsroot/woc/woc/bin/topic added to the repository |
|
From: Egon W. <eg...@us...> - 2002-06-13 20:04:24
|
Update of /cvsroot/woc/woc/lib/xml/dtd
In directory usw-pr-cvs1:/tmp/cvs-serv1117/xml/dtd
Modified Files:
wocimports.dtd
Log Message:
Added namespace declaration to DTD.
Index: wocimports.dtd
===================================================================
RCS file: /cvsroot/woc/woc/lib/xml/dtd/wocimports.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** wocimports.dtd 12 Jun 2002 18:57:28 -0000 1.1
--- wocimports.dtd 13 Jun 2002 20:04:21 -0000 1.2
***************
*** 3,6 ****
<!ELEMENT import:specific EMPTY>
<!ATTLIST import:specific
! macro (%macros;) "picture"
select CDATA #REQUIRED>
--- 3,7 ----
<!ELEMENT import:specific EMPTY>
<!ATTLIST import:specific
! macro (%macros;) "picture"
! xmlns:import CDATA #FIXED "http://www-woc.sci.kun.nl/wocimports.dtd"
select CDATA #REQUIRED>
|
|
From: Egon W. <eg...@us...> - 2002-06-13 19:58:42
|
Update of /cvsroot/woc/woc/lib/xml/dtd In directory usw-pr-cvs1:/tmp/cvs-serv31116/lib/xml/dtd Modified Files: wocml.dtd Log Message: Fixed a typo. Index: wocml.dtd =================================================================== RCS file: /cvsroot/woc/woc/lib/xml/dtd/wocml.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** wocml.dtd 13 Jun 2002 14:52:26 -0000 1.4 --- wocml.dtd 13 Jun 2002 19:58:39 -0000 1.5 *************** *** 1,85 **** ! <!ENTITY % HTML SYSTEM "XHTML_1.0_WocCustomized"> ! %HTML; ! ! <!ENTITY % TOPICMAP SYSTEM "tm_custom.dtd"> ! %TOPICMAP; <!ENTITY % WOCIMPORTS SYSTEM "wocimports.dtd"> %WOCIMPORTS; ! ! <!ENTITY % langs "NL|EN|DE|FY|LA|ES|IT|FR"> ! ! <!ELEMENT ITEM (DICT|INDEX|WOC|SAFETY|GROUP|SEE|COMPARE|INSERT|molecule|REFERENCES|SOURCE)*> ! <!ELEMENT DICT (NAME|ABBREV|FORMULA|VERVOEGINGEN)*> ! <!ELEMENT NAME (LANG+)> ! <!ELEMENT ABBREV (#PCDATA)> ! <!ELEMENT FORMULA (#PCDATA)> ! <!ELEMENT VERVOEGINGEN (ENKELVOUD|FOUTE_SPELLING|MEERVOUD|AFGELEIDE)*> ! <!ELEMENT ENKELVOUD (#PCDATA)> ! <!ELEMENT MEERVOUD (#PCDATA)> ! <!ELEMENT AFGELEIDE (#PCDATA)> ! <!ELEMENT FOUTE_SPELLING (#PCDATA)> ! <!ELEMENT LANG (#PCDATA|sub|sup)*> ! <!ELEMENT INDEX (#PCDATA)> ! <!ELEMENT WOC (MEDIA|COMMENT|EXAMPLE|EXCLUDES|SYNTH|DISCOVERY|DEF|tm:topicmap)*> ! <!ELEMENT EXCLUDES (MEDIA)*> ! <!ELEMENT MEDIA (#PCDATA)> ! ! <!ENTITY % htmlcontent "p|table|import-specific|import-general"> ! ! <!ELEMENT COMMENT (%htmlcontent;)*> ! <!ELEMENT EXAMPLE (%htmlcontent;)*> ! <!ELEMENT SYNTH (%htmlcontent;)*> ! <!ELEMENT DEF (%htmlcontent;)*> ! <!ELEMENT DISCOVERY (DATE|LOCATION|PERSONS)*> ! <!ELEMENT DATE (#PCDATA)> ! <!ELEMENT LOCATION (#PCDATA|ANY)*> ! <!ELEMENT PERSONS (ANY)*> ! <!ELEMENT IMPORT (ANY)*> ! <!ELEMENT GROUP (#PCDATA)> ! <!ELEMENT SEE (#PCDATA)> ! <!ELEMENT COMPARE (#PCDATA)> ! <!ELEMENT INSERT (#PCDATA)> ! <!ELEMENT REFERENCES (URL+)> ! <!ELEMENT URL (#PCDATA)> ! <!ELEMENT SOURCE (#PCDATA)> ! <!ELEMENT SAFETY (RZIN|SZIN)*> ! <!ELEMENT RZIN (#PCDATA)*> ! <!ELEMENT SZIN (#PCDATA)*> ! ! <!ENTITY % refatts "REF CDATA #IMPLIED ! REFPAGES CDATA #IMPLIED"> ! ! <!ATTLIST ITEM NAME CDATA #REQUIRED ! CODE CDATA #IMPLIED ! VIEW CDATA #IMPLIED ! CLASS (TERM|CHEMICAL|MIXTURE|POLYMER|NOMENCLATURE|REACTION|ELEMENT|GROUP) "TERM" ! ID ID #REQUIRED ! FILE CDATA #IMPLIED> ! <!ATTLIST NAME CLASS CDATA #REQUIRED> ! <!ATTLIST FORMULA CLASS (GROUP-LEFT|GROUP-RIGHT|ION|GROUP-MIDDLE|STOICH|CLASS|STRUCTURAL) "STRUCTURAL" ! ORDER CDATA #IMPLIED ! CHARGE CDATA #IMPLIED> ! <!ATTLIST ABBREV ID (%langs;) "NL"> ! <!ATTLIST LANG ID (%langs;) "EN" ! EM CDATA #IMPLIED ! HYPHEN CDATA #IMPLIED ! CLASS (TRIVIAL|BRAND|IUPAC-MIX|IUPAC|IUPAC-TRIVIAL|SPOKEN) "TRIVIAL" ! LIDWOORD CDATA #IMPLIED ! %refatts;> ! <!ATTLIST INDEX CLASS CDATA #REQUIRED> ! <!ATTLIST MEDIA MIME CDATA #REQUIRED ! VIEW CDATA #IMPLIED ! TITLE CDATA #IMPLIED ! PATH CDATA #IMPLIED> ! <!ATTLIST INSERT MIME CDATA #REQUIRED ! CLASS CDATA #REQUIRED> ! <!ATTLIST URL TITLE CDATA #IMPLIED ! LANG (%langs;) "EN"> ! <!ATTLIST IMPORT ITEM CDATA #REQUIRED> ! ! <!ATTLIST COMMENT %refatts;> ! <!ATTLIST EXAMPLE %refatts;> ! <!ATTLIST SYNTH CLASS (TO) "TO"> --- 1,85 ---- ! <!ENTITY % HTML SYSTEM "XHTML_1.0_WocCustomized"> ! %HTML; ! ! <!ENTITY % TOPICMAP SYSTEM "tm_custom.dtd"> ! %TOPICMAP; <!ENTITY % WOCIMPORTS SYSTEM "wocimports.dtd"> %WOCIMPORTS; ! ! <!ENTITY % langs "NL|EN|DE|FY|LA|ES|IT|FR"> ! ! <!ELEMENT ITEM (DICT|INDEX|WOC|SAFETY|GROUP|SEE|COMPARE|INSERT|molecule|REFERENCES|SOURCE)*> ! <!ELEMENT DICT (NAME|ABBREV|FORMULA|VERVOEGINGEN)*> ! <!ELEMENT NAME (LANG+)> ! <!ELEMENT ABBREV (#PCDATA)> ! <!ELEMENT FORMULA (#PCDATA)> ! <!ELEMENT VERVOEGINGEN (ENKELVOUD|FOUTE_SPELLING|MEERVOUD|AFGELEIDE)*> ! <!ELEMENT ENKELVOUD (#PCDATA)> ! <!ELEMENT MEERVOUD (#PCDATA)> ! <!ELEMENT AFGELEIDE (#PCDATA)> ! <!ELEMENT FOUTE_SPELLING (#PCDATA)> ! <!ELEMENT LANG (#PCDATA|sub|sup)*> ! <!ELEMENT INDEX (#PCDATA)> ! <!ELEMENT WOC (MEDIA|COMMENT|EXAMPLE|EXCLUDES|SYNTH|DISCOVERY|DEF|tm:topicmap)*> ! <!ELEMENT EXCLUDES (MEDIA)*> ! <!ELEMENT MEDIA (#PCDATA)> ! ! <!ENTITY % htmlcontent "p|table|import:specific|import:general"> ! ! <!ELEMENT COMMENT (%htmlcontent;)*> ! <!ELEMENT EXAMPLE (%htmlcontent;)*> ! <!ELEMENT SYNTH (%htmlcontent;)*> ! <!ELEMENT DEF (%htmlcontent;)*> ! <!ELEMENT DISCOVERY (DATE|LOCATION|PERSONS)*> ! <!ELEMENT DATE (#PCDATA)> ! <!ELEMENT LOCATION (#PCDATA|ANY)*> ! <!ELEMENT PERSONS (ANY)*> ! <!ELEMENT IMPORT (ANY)*> ! <!ELEMENT GROUP (#PCDATA)> ! <!ELEMENT SEE (#PCDATA)> ! <!ELEMENT COMPARE (#PCDATA)> ! <!ELEMENT INSERT (#PCDATA)> ! <!ELEMENT REFERENCES (URL+)> ! <!ELEMENT URL (#PCDATA)> ! <!ELEMENT SOURCE (#PCDATA)> ! <!ELEMENT SAFETY (RZIN|SZIN)*> ! <!ELEMENT RZIN (#PCDATA)*> ! <!ELEMENT SZIN (#PCDATA)*> ! ! <!ENTITY % refatts "REF CDATA #IMPLIED ! REFPAGES CDATA #IMPLIED"> ! ! <!ATTLIST ITEM NAME CDATA #REQUIRED ! CODE CDATA #IMPLIED ! VIEW CDATA #IMPLIED ! CLASS (TERM|CHEMICAL|MIXTURE|POLYMER|NOMENCLATURE|REACTION|ELEMENT|GROUP) "TERM" ! ID ID #REQUIRED ! FILE CDATA #IMPLIED> ! <!ATTLIST NAME CLASS CDATA #REQUIRED> ! <!ATTLIST FORMULA CLASS (GROUP-LEFT|GROUP-RIGHT|ION|GROUP-MIDDLE|STOICH|CLASS|STRUCTURAL) "STRUCTURAL" ! ORDER CDATA #IMPLIED ! CHARGE CDATA #IMPLIED> ! <!ATTLIST ABBREV ID (%langs;) "NL"> ! <!ATTLIST LANG ID (%langs;) "EN" ! EM CDATA #IMPLIED ! HYPHEN CDATA #IMPLIED ! CLASS (TRIVIAL|BRAND|IUPAC-MIX|IUPAC|IUPAC-TRIVIAL|SPOKEN) "TRIVIAL" ! LIDWOORD CDATA #IMPLIED ! %refatts;> ! <!ATTLIST INDEX CLASS CDATA #REQUIRED> ! <!ATTLIST MEDIA MIME CDATA #REQUIRED ! VIEW CDATA #IMPLIED ! TITLE CDATA #IMPLIED ! PATH CDATA #IMPLIED> ! <!ATTLIST INSERT MIME CDATA #REQUIRED ! CLASS CDATA #REQUIRED> ! <!ATTLIST URL TITLE CDATA #IMPLIED ! LANG (%langs;) "EN"> ! <!ATTLIST IMPORT ITEM CDATA #REQUIRED> ! ! <!ATTLIST COMMENT %refatts;> ! <!ATTLIST EXAMPLE %refatts;> ! <!ATTLIST SYNTH CLASS (TO) "TO"> |
|
From: Egon W. <eg...@us...> - 2002-06-13 19:55:36
|
Update of /cvsroot/woc/woc/data/wml/s
In directory usw-pr-cvs1:/tmp/cvs-serv29680/s
Modified Files:
smeltpunt.xml
Log Message:
Fixed a number of validity errors.
Index: smeltpunt.xml
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/s/smeltpunt.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** smeltpunt.xml 13 Jun 2002 14:39:25 -0000 1.2
--- smeltpunt.xml 13 Jun 2002 19:55:32 -0000 1.3
***************
*** 23,32 ****
<EXAMPLE>
<p>
! Hoewel pentaan en 2,2-dimethylpropaan een gelijk molmasse hebben
! verschillen hun smeltpunt aanzienlijk. Van pentaan is het smeltpunt
! <import:specific macro="spt" select="pentaan@woc"/> <sup>o</sup>C.
! En dat van 2,2-dimethylpropaan (neopentaan) is
! <import:specific macro="spt" select="neopentaan@woc"/> <sup>o</sup>C.
! </p>
</EXAMPLE>
<tm:topicmap xmlns:tm="http://www.topic-maps.de/content/resources\tm.dtd"
--- 23,32 ----
<EXAMPLE>
<p>
! Hoewel pentaan en 2,2-dimethylpropaan een gelijk molmassa hebben
! verschillen hun smeltpunt aanzienlijk. Van pentaan is het smeltpunt:</p>
! <import:specific xmlns:import="http://www-woc.sci.kun.nl/wocimports.dtd" macro="spt" select="pentaan@woc"/>
! <p>
! En dat van 2,2-dimethylpropaan (neopentaan) is:</p>
! <import:specific xmlns:import="http://www-woc.sci.kun.nl/wocimports.dtd" macro="spt" select="neopentaan@woc"/>
</EXAMPLE>
<tm:topicmap xmlns:tm="http://www.topic-maps.de/content/resources\tm.dtd"
|
